diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/conformance/internal/conformance_proto/conformance.pb.go golang-gogoprotobuf-1.3.1/conformance/internal/conformance_proto/conformance.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/conformance/internal/conformance_proto/conformance.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/conformance/internal/conformance_proto/conformance.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type WireFormat int32 @@ -157,10 +157,10 @@ } type ConformanceRequest_ProtobufPayload struct { - ProtobufPayload []byte `protobuf:"bytes,1,opt,name=protobuf_payload,json=protobufPayload,proto3,oneof"` + ProtobufPayload []byte `protobuf:"bytes,1,opt,name=protobuf_payload,json=protobufPayload,proto3,oneof" json:"protobuf_payload,omitempty"` } type ConformanceRequest_JsonPayload struct { - JsonPayload string `protobuf:"bytes,2,opt,name=json_payload,json=jsonPayload,proto3,oneof"` + JsonPayload string `protobuf:"bytes,2,opt,name=json_payload,json=jsonPayload,proto3,oneof" json:"json_payload,omitempty"` } func (*ConformanceRequest_ProtobufPayload) isConformanceRequest_Payload() {} @@ -194,72 +194,14 @@ return WireFormat_UNSPECIFIED } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*ConformanceRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _ConformanceRequest_OneofMarshaler, _ConformanceRequest_OneofUnmarshaler, _ConformanceRequest_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*ConformanceRequest) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*ConformanceRequest_ProtobufPayload)(nil), (*ConformanceRequest_JsonPayload)(nil), } } -func _ConformanceRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*ConformanceRequest) - // payload - switch x := m.Payload.(type) { - case *ConformanceRequest_ProtobufPayload: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.ProtobufPayload) - case *ConformanceRequest_JsonPayload: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.JsonPayload) - case nil: - default: - return fmt.Errorf("ConformanceRequest.Payload has unexpected type %T", x) - } - return nil -} - -func _ConformanceRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*ConformanceRequest) - switch tag { - case 1: // payload.protobuf_payload - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.Payload = &ConformanceRequest_ProtobufPayload{x} - return true, err - case 2: // payload.json_payload - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Payload = &ConformanceRequest_JsonPayload{x} - return true, err - default: - return false, nil - } -} - -func _ConformanceRequest_OneofSizer(msg proto.Message) (n int) { - m := msg.(*ConformanceRequest) - // payload - switch x := m.Payload.(type) { - case *ConformanceRequest_ProtobufPayload: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.ProtobufPayload))) - n += len(x.ProtobufPayload) - case *ConformanceRequest_JsonPayload: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.JsonPayload))) - n += len(x.JsonPayload) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // Represents a single test case's output. type ConformanceResponse struct { // Types that are valid to be assigned to Result: @@ -304,22 +246,22 @@ } type ConformanceResponse_ParseError struct { - ParseError string `protobuf:"bytes,1,opt,name=parse_error,json=parseError,proto3,oneof"` + ParseError string `protobuf:"bytes,1,opt,name=parse_error,json=parseError,proto3,oneof" json:"parse_error,omitempty"` } type ConformanceResponse_SerializeError struct { - SerializeError string `protobuf:"bytes,6,opt,name=serialize_error,json=serializeError,proto3,oneof"` + SerializeError string `protobuf:"bytes,6,opt,name=serialize_error,json=serializeError,proto3,oneof" json:"serialize_error,omitempty"` } type ConformanceResponse_RuntimeError struct { - RuntimeError string `protobuf:"bytes,2,opt,name=runtime_error,json=runtimeError,proto3,oneof"` + RuntimeError string `protobuf:"bytes,2,opt,name=runtime_error,json=runtimeError,proto3,oneof" json:"runtime_error,omitempty"` } type ConformanceResponse_ProtobufPayload struct { - ProtobufPayload []byte `protobuf:"bytes,3,opt,name=protobuf_payload,json=protobufPayload,proto3,oneof"` + ProtobufPayload []byte `protobuf:"bytes,3,opt,name=protobuf_payload,json=protobufPayload,proto3,oneof" json:"protobuf_payload,omitempty"` } type ConformanceResponse_JsonPayload struct { - JsonPayload string `protobuf:"bytes,4,opt,name=json_payload,json=jsonPayload,proto3,oneof"` + JsonPayload string `protobuf:"bytes,4,opt,name=json_payload,json=jsonPayload,proto3,oneof" json:"json_payload,omitempty"` } type ConformanceResponse_Skipped struct { - Skipped string `protobuf:"bytes,5,opt,name=skipped,proto3,oneof"` + Skipped string `protobuf:"bytes,5,opt,name=skipped,proto3,oneof" json:"skipped,omitempty"` } func (*ConformanceResponse_ParseError) isConformanceResponse_Result() {} @@ -378,9 +320,9 @@ return "" } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*ConformanceResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _ConformanceResponse_OneofMarshaler, _ConformanceResponse_OneofUnmarshaler, _ConformanceResponse_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*ConformanceResponse) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*ConformanceResponse_ParseError)(nil), (*ConformanceResponse_SerializeError)(nil), (*ConformanceResponse_RuntimeError)(nil), @@ -390,120 +332,6 @@ } } -func _ConformanceResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*ConformanceResponse) - // result - switch x := m.Result.(type) { - case *ConformanceResponse_ParseError: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.ParseError) - case *ConformanceResponse_SerializeError: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.SerializeError) - case *ConformanceResponse_RuntimeError: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.RuntimeError) - case *ConformanceResponse_ProtobufPayload: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.ProtobufPayload) - case *ConformanceResponse_JsonPayload: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.JsonPayload) - case *ConformanceResponse_Skipped: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Skipped) - case nil: - default: - return fmt.Errorf("ConformanceResponse.Result has unexpected type %T", x) - } - return nil -} - -func _ConformanceResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*ConformanceResponse) - switch tag { - case 1: // result.parse_error - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Result = &ConformanceResponse_ParseError{x} - return true, err - case 6: // result.serialize_error - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Result = &ConformanceResponse_SerializeError{x} - return true, err - case 2: // result.runtime_error - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Result = &ConformanceResponse_RuntimeError{x} - return true, err - case 3: // result.protobuf_payload - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.Result = &ConformanceResponse_ProtobufPayload{x} - return true, err - case 4: // result.json_payload - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Result = &ConformanceResponse_JsonPayload{x} - return true, err - case 5: // result.skipped - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Result = &ConformanceResponse_Skipped{x} - return true, err - default: - return false, nil - } -} - -func _ConformanceResponse_OneofSizer(msg proto.Message) (n int) { - m := msg.(*ConformanceResponse) - // result - switch x := m.Result.(type) { - case *ConformanceResponse_ParseError: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.ParseError))) - n += len(x.ParseError) - case *ConformanceResponse_SerializeError: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.SerializeError))) - n += len(x.SerializeError) - case *ConformanceResponse_RuntimeError: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.RuntimeError))) - n += len(x.RuntimeError) - case *ConformanceResponse_ProtobufPayload: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.ProtobufPayload))) - n += len(x.ProtobufPayload) - case *ConformanceResponse_JsonPayload: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.JsonPayload))) - n += len(x.JsonPayload) - case *ConformanceResponse_Skipped: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Skipped))) - n += len(x.Skipped) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - // This proto includes every type of field in both singular and repeated // forms. type TestAllTypes struct { @@ -656,16 +484,16 @@ } type TestAllTypes_OneofUint32 struct { - OneofUint32 uint32 `protobuf:"varint,111,opt,name=oneof_uint32,json=oneofUint32,proto3,oneof"` + OneofUint32 uint32 `protobuf:"varint,111,opt,name=oneof_uint32,json=oneofUint32,proto3,oneof" json:"oneof_uint32,omitempty"` } type TestAllTypes_OneofNestedMessage struct { - OneofNestedMessage *TestAllTypes_NestedMessage `protobuf:"bytes,112,opt,name=oneof_nested_message,json=oneofNestedMessage,proto3,oneof"` + OneofNestedMessage *TestAllTypes_NestedMessage `protobuf:"bytes,112,opt,name=oneof_nested_message,json=oneofNestedMessage,proto3,oneof" json:"oneof_nested_message,omitempty"` } type TestAllTypes_OneofString struct { - OneofString string `protobuf:"bytes,113,opt,name=oneof_string,json=oneofString,proto3,oneof"` + OneofString string `protobuf:"bytes,113,opt,name=oneof_string,json=oneofString,proto3,oneof" json:"oneof_string,omitempty"` } type TestAllTypes_OneofBytes struct { - OneofBytes []byte `protobuf:"bytes,114,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof"` + OneofBytes []byte `protobuf:"bytes,114,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof" json:"oneof_bytes,omitempty"` } func (*TestAllTypes_OneofUint32) isTestAllTypes_OneofField() {} @@ -1436,9 +1264,9 @@ return 0 } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*TestAllTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _TestAllTypes_OneofMarshaler, _TestAllTypes_OneofUnmarshaler, _TestAllTypes_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TestAllTypes) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*TestAllTypes_OneofUint32)(nil), (*TestAllTypes_OneofNestedMessage)(nil), (*TestAllTypes_OneofString)(nil), @@ -1446,95 +1274,6 @@ } } -func _TestAllTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*TestAllTypes) - // oneof_field - switch x := m.OneofField.(type) { - case *TestAllTypes_OneofUint32: - _ = b.EncodeVarint(111<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.OneofUint32)) - case *TestAllTypes_OneofNestedMessage: - _ = b.EncodeVarint(112<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.OneofNestedMessage); err != nil { - return err - } - case *TestAllTypes_OneofString: - _ = b.EncodeVarint(113<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.OneofString) - case *TestAllTypes_OneofBytes: - _ = b.EncodeVarint(114<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.OneofBytes) - case nil: - default: - return fmt.Errorf("TestAllTypes.OneofField has unexpected type %T", x) - } - return nil -} - -func _TestAllTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*TestAllTypes) - switch tag { - case 111: // oneof_field.oneof_uint32 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.OneofField = &TestAllTypes_OneofUint32{uint32(x)} - return true, err - case 112: // oneof_field.oneof_nested_message - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(TestAllTypes_NestedMessage) - err := b.DecodeMessage(msg) - m.OneofField = &TestAllTypes_OneofNestedMessage{msg} - return true, err - case 113: // oneof_field.oneof_string - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.OneofField = &TestAllTypes_OneofString{x} - return true, err - case 114: // oneof_field.oneof_bytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.OneofField = &TestAllTypes_OneofBytes{x} - return true, err - default: - return false, nil - } -} - -func _TestAllTypes_OneofSizer(msg proto.Message) (n int) { - m := msg.(*TestAllTypes) - // oneof_field - switch x := m.OneofField.(type) { - case *TestAllTypes_OneofUint32: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.OneofUint32)) - case *TestAllTypes_OneofNestedMessage: - s := proto.Size(x.OneofNestedMessage) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *TestAllTypes_OneofString: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.OneofString))) - n += len(x.OneofString) - case *TestAllTypes_OneofBytes: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.OneofBytes))) - n += len(x.OneofBytes) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type TestAllTypes_NestedMessage struct { A int32 `protobuf:"varint,1,opt,name=a,proto3" json:"a,omitempty"` Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive,proto3" json:"corecursive,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/changelog golang-gogoprotobuf-1.3.1/debian/changelog --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/changelog 2019-07-01 18:35:16.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/changelog 2020-05-18 05:10:14.000000000 +0000 @@ -1,3 +1,54 @@ +golang-gogoprotobuf (1.3.1-2) unstable; urgency=medium + + * Team upload. + * Revert "Removed transitional package "golang-gogoprotobuf-dev"" + This reverts commit aa4027f5881cb890a7c167651eeb4922ec18c946. + Add transitional package back. There are still some packages depend this. + Remove the transitional package only after other packages have migrated to + the new dependencies. Otherwise the testing migration will be stuck. + + -- Shengjing Zhu Mon, 18 May 2020 13:10:14 +0800 + +golang-gogoprotobuf (1.3.1-1) unstable; urgency=medium + + * Team upload. + * New upstream version 1.3.1 + Upload 1.3.x to unstable. + pb.go files generated with v1.2.1 should still work with the new version. + * Bump debhelper-compat to 13 + * Bump Standards-Version to 4.5.0 + * Add Rules-Requires-Root + + -- Shengjing Zhu Sun, 17 May 2020 23:40:29 +0800 + +golang-gogoprotobuf (1.3.0-1) experimental; urgency=medium + + [ Debian Janitor ] + * Bump debhelper from old 11 to 12. + * Set upstream metadata fields: Name. + * Set upstream metadata fields: Repository. + * Remove obsolete fields Name from debian/upstream/metadata. + + [ Arnaud Rebillout ] + * Update maintainer address to team+pkg-go@tracker.d.o + * wrap-and-sort -ta + + [ Martín Ferrari ] + * Name update. + * Add libprotobuf-dev to -dev package dependencies. Closes: #900136. + + [ Dmitry Smirnov ] + * New upstream release + * Removed transitional package "golang-gogoprotobuf-dev" (Closes: #939229). + Thanks, Holger Levsen. + * rules: optimised exclusions + * rules: no longer ignore test failures on "armhf". + * Renamed "debian/TODO.Debian" --> "debian/TODO". + * Standards-Version: 4.4.1 + * Added myself to Uploaders + + -- Dmitry Smirnov Sun, 05 Jan 2020 20:28:12 +1100 + golang-gogoprotobuf (1.2.1+git20190611.dadb6258-1) unstable; urgency=medium [ Alexandre Viau ] diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/compat golang-gogoprotobuf-1.3.1/debian/compat --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/compat 2019-07-01 18:35:16.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/control golang-gogoprotobuf-1.3.1/debian/control --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/control 2019-07-01 18:35:16.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/control 2020-05-18 05:10:14.000000000 +0000 @@ -1,19 +1,21 @@ Source: golang-gogoprotobuf -Maintainer: pkg-go +Maintainer: Debian Go Packaging Team Uploaders: Jelmer Vernooij , - Martín Ferrari , + Martina Ferrari , Tim Potter , + Dmitry Smirnov , Section: devel Testsuite: autopkgtest-pkg-go Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 13), dh-golang (>= 1.9), golang-any, protobuf-compiler, -Standards-Version: 4.1.3 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-gogoprotobuf Vcs-Git: https://salsa.debian.org/go-team/packages/golang-gogoprotobuf.git Homepage: https://github.com/gogo/protobuf +Rules-Requires-Root: no XS-Go-Import-Path: github.com/gogo/protobuf Package: golang-gogoprotobuf-dev @@ -28,7 +30,8 @@ Package: golang-github-gogo-protobuf-dev Architecture: all -Depends: ${misc:Depends}, +Depends: libprotobuf-dev, + ${misc:Depends}, Recommends: gogoprotobuf, Breaks: golang-gogoprotobuf-dev (<< 0.2-1), Replaces: golang-gogoprotobuf-dev (<< 0.2-1), @@ -48,7 +51,7 @@ ${shlibs:Depends}, Breaks: golang-gogoprotobuf-dev (<< 0.2-1), Replaces: golang-gogoprotobuf-dev (<< 0.2-1), -Built-Using: ${misc:Built-Using} +Built-Using: ${misc:Built-Using}, Description: alternative protocol buffer support for Golang - utilities An alternative protocol buffer support for the Go programming language, forked from golang-goprotobuf. It is backwards compatible with diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/copyright golang-gogoprotobuf-1.3.1/debian/copyright --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/copyright 2019-07-01 18:35:16.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/copyright 2020-05-18 05:10:14.000000000 +0000 @@ -18,13 +18,6 @@ gogoproto/helper.go io/* plugin/* - proto/decode_gogo.go - proto/extensions_gogo.go - proto/lib_gogo.go - proto/pointer_unsafe_gogo.go - proto/properties_gogo.go - proto/skip_gogo.go - proto/text_gogo.go protoc-gen-combo/* protoc-gen-gofast/* protoc-gen-gogo/descriptor/helper.go @@ -34,159 +27,34 @@ protoc-gen-gogoslick/* protoc-gen-gostring/* protoc-min-version/* + proto/*_gogo.go + proto/wrappers.go sortkeys/* - test/Makefile - test/asymetric-issue125/Makefile - test/asymetric-issue125/asym.proto - test/asymetric-issue125/asym_test.go - test/asymetric-issue125/pop.go - test/bug_test.go - test/casttype/Makefile - test/casttype/casttype.proto - test/casttype/combos/both/casttype.proto - test/casttype/combos/marshaler/casttype.proto - test/casttype/combos/neither/casttype.proto - test/casttype/combos/unmarshaler/casttype.proto - test/casttype/mytypes.go - test/castvalue/Makefile - test/castvalue/castvalue.proto - test/castvalue/combos/both/castvalue.proto - test/castvalue/combos/both/mytypes.go - test/castvalue/combos/marshaler/castvalue.proto - test/castvalue/combos/marshaler/mytypes.go - test/castvalue/combos/unmarshaler/castvalue.proto - test/castvalue/combos/unmarshaler/mytypes.go - test/castvalue/mytypes.go - test/combos/both/bug_test.go - test/combos/both/thetest.proto - test/combos/both/uuid.go - test/combos/marshaler/bug_test.go - test/combos/marshaler/thetest.proto - test/combos/marshaler/uuid.go - test/combos/unmarshaler/bug_test.go - test/combos/unmarshaler/thetest.proto - test/combos/unmarshaler/uuid.go - test/custom-dash-type/* - test/custom/* - test/custombytesnonstruct/Makefile - test/custombytesnonstruct/custombytesnonstruct_test.go - test/custombytesnonstruct/customtype.go - test/custombytesnonstruct/proto.proto - test/dashfilename/* - test/defaultconflict/* - test/embedconflict/* - test/empty-issue70/Makefile - test/empty-issue70/empty.proto - test/empty-issue70/empty_test.go - test/enumcustomname/Makefile - test/enumcustomname/enumcustomname.proto - test/enumprefix/Makefile - test/enumprefix/enumprefix.proto - test/enumstringer/Makefile - test/enumstringer/enumstringer.proto - test/enumstringer/string.go - test/example/Makefile - test/example/example.proto - test/example/example_test.go - test/extension_test.go - test/filedotname/Makefile - test/filedotname/file.dot.proto - test/fuzztests/Makefile - test/fuzztests/fuzz.proto - test/fuzztests/fuzz_test.go - test/group/Makefile - test/group/group.proto - test/importdedup/Makefile - test/importdedup/importdedup_test.go - test/importdedup/proto.proto - test/importdedup/subpkg/customtype.go - test/importdedup/subpkg/subproto.proto - test/indeximport-issue72/Makefile - test/indeximport-issue72/index/index.proto - test/indeximport-issue72/indeximport.proto - test/issue34/Makefile - test/issue34/issue34_test.go - test/issue34/proto.proto - test/issue42order/Makefile - test/issue42order/issue42.proto - test/issue42order/order_test.go - test/issue8/Makefile - test/issue8/proto.proto - test/mapsproto2/Makefile - test/mapsproto2/combos/both/mapsproto2_test.go - test/mapsproto2/combos/marshaler/mapsproto2_test.go - test/mapsproto2/combos/neither/mapsproto2_test.go - test/mapsproto2/combos/unmarshaler/mapsproto2_test.go - test/mapsproto2/mapsproto2_test.go.in - test/mixbench/mixbench.go - test/moredefaults/Makefile - test/moredefaults/md.proto - test/moredefaults/md_test.go - test/nopackage/Makefile - test/nopackage/nopackage.proto - test/nopackage/nopackage_test.go - test/oneof/Makefile - test/oneof/combos/both/one.proto - test/oneof/combos/marshaler/one.proto - test/oneof/combos/neither/one.proto - test/oneof/combos/unmarshaler/one.proto - test/oneof/one.proto - test/oneof3/Makefile - test/oneof3/combos/both/one.proto - test/oneof3/combos/marshaler/one.proto - test/oneof3/combos/neither/one.proto - test/oneof3/combos/unmarshaler/one.proto - test/oneof3/one.proto - test/oneofembed/Makefile - test/oneofembed/oneofembed.proto - test/packed/Makefile - test/packed/packed.proto - test/packed/packed_test.go - test/protosize/Makefile - test/protosize/protosize.proto - test/protosize/protosize_test.go - test/required/Makefile - test/required/requiredexample.proto - test/required/requiredexamplepb_test.go - test/sizeunderscore/Makefile - test/sizeunderscore/sizeunderscore.proto - test/tags/Makefile - test/tags/tags.proto - test/tags/tags_test.go - test/theproto3/Makefile - test/theproto3/combos/both/proto3_test.go - test/theproto3/combos/marshaler/proto3_test.go - test/theproto3/combos/neither/proto3_test.go - test/theproto3/combos/unmarshaler/proto3_test.go - test/theproto3/proto3_test.go.in - test/thetest.proto - test/unmarshalmerge/Makefile - test/unmarshalmerge/unmarshalmerge.proto - test/unmarshalmerge/unmarshalmerge_test.go - test/unrecognized/Makefile - test/unrecognized/oldnew_test.go - test/unrecognized/unrecognized.proto - test/unrecognizedgroup/Makefile - test/unrecognizedgroup/oldnew_test.go - test/unrecognizedgroup/unrecognizedgroup.proto - test/uuid.go - test/uuid_test.go - vanity/command/* - vanity/enum.go - vanity/field.go - vanity/file.go - vanity/foreach.go - vanity/msg.go - vanity/test/Makefile - vanity/test/gogovanity.proto - vanity/test/proto3.proto - vanity/test/vanity.proto - vanity/test/vanity_test.go + test/* + vanity/* version/* Copyright: 2013,2015-2016 the GoGo Authors License: BSD-2-Clause +Files: + test/issue411/issue411.proto + test/mapsproto2/combos/both/mapsproto2.proto + test/mapsproto2/combos/marshaler/mapsproto2.proto + test/mapsproto2/combos/neither/mapsproto2.proto + test/mapsproto2/combos/unmarshaler/mapsproto2.proto + test/mapsproto2/header.proto + test/mapsproto2/mapsproto2.proto + test/theproto3/combos/both/theproto3.proto + test/theproto3/combos/marshaler/theproto3.proto + test/theproto3/combos/neither/theproto3.proto + test/theproto3/combos/unmarshaler/theproto3.proto + test/theproto3/header.proto + test/theproto3/theproto3.proto +Copyright: 2014-2015 The Go Authors + 2013 The GoGo Authors +License: BSD-3-Clause + Files: debian/* Copyright: 2014 Jelmer Vernooij 2015 Alexandre Viau diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/patches/test--skip-TestGolden.patch golang-gogoprotobuf-1.3.1/debian/patches/test--skip-TestGolden.patch --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/patches/test--skip-TestGolden.patch 2019-07-01 18:35:16.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/patches/test--skip-TestGolden.patch 2020-05-18 05:10:14.000000000 +0000 @@ -5,7 +5,7 @@ --- a/protoc-gen-gogo/golden_test.go +++ b/protoc-gen-gogo/golden_test.go -@@ -29,8 +29,9 @@ +@@ -28,8 +28,9 @@ } } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/rules golang-gogoprotobuf-1.3.1/debian/rules --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/rules 2019-07-01 18:35:16.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/rules 2020-05-18 05:10:14.000000000 +0000 @@ -1,23 +1,9 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 -export DH_GOLANG_EXCLUDES = +# unused binaries +export DH_GOLANG_EXCLUDES = conformance gogoreplace test/mixbench export DH_GOLANG_GO_GENERATE := 1 +export PATH := $(CURDIR)/_build/bin:$(PATH) %: dh $@ --buildsystem=golang --with=golang --builddirectory=_build - -# Need to exclude packages without .go files. -override_dh_auto_build: DH_GOLANG_EXCLUDES += test/jsonpb-gogo -override_dh_auto_build: - dh_auto_build - -override_dh_auto_test: -ifneq (,$(filter $(DEB_HOST_ARCH),armhf)) -## Ignore test failures: -## https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=824717 -## https://github.com/gogo/protobuf/issues/164 - -PATH="$(CURDIR)/_build/bin:$$PATH" dh_auto_test -else - PATH="$(CURDIR)/_build/bin:$$PATH" dh_auto_test -endif diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/TODO golang-gogoprotobuf-1.3.1/debian/TODO --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/TODO 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/TODO 2020-05-18 05:10:14.000000000 +0000 @@ -0,0 +1 @@ +Re-build .pb.go files from .proto sources. diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/TODO.Debian golang-gogoprotobuf-1.3.1/debian/TODO.Debian --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/TODO.Debian 2019-07-01 18:35:16.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/TODO.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Re-build .pb.go files from .proto sources. diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/upstream/metadata golang-gogoprotobuf-1.3.1/debian/upstream/metadata --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/debian/upstream/metadata 2020-05-18 05:10:14.000000000 +0000 @@ -0,0 +1 @@ +Repository: https://github.com/gogo/protobuf diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/.github/workflows/ci-workflow.yml golang-gogoprotobuf-1.3.1/.github/workflows/ci-workflow.yml --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/.github/workflows/ci-workflow.yml 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/.github/workflows/ci-workflow.yml 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,46 @@ +name: Continuous Integration +on: + push: + branches: + - ghworkflow + pull_request: + branches: + - master + +jobs: + build_and_test: + name: go ${{ matrix.go_version }} - pb-${{ matrix.protobuf_version }} + runs-on: ubuntu-latest + strategy: + matrix: + go_version: [1.12.x, 1.11.x] + protobuf_version: [3.9.1, 3.0.2, 2.6.1] + fail-fast: false + steps: + - name: Checkout branch + uses: actions/checkout@v1 + with: + path: gopath/src/github.com/gogo/protobuf + fetch-depth: 5 + + - name: Setup go + uses: actions/setup-go@v1 + with: + go-version: ${{ matrix.go_version }} + + - name: Setup protoc + env: + PROTOBUF_VERSION: ${{ matrix.protobuf_version }} + run: ./install-protobuf.sh + + - name: Protoc version + run: PATH=$HOME/bin:$PATH protoc --version + - name: env + run: env && go env && pwd + + - name: Build server all + run: GOPATH=/home/runner/work/protobuf/gopath GOBIN=$GOPATH/bin PATH=$HOME/bin:$GOBIN:$PATH make buildserverall + + - name: Diff check + if: matrix.protobuf_version == '3.9.1' && matrix.go_version == '1.12.x' + run: (! git status --porcelain | read || (git status; git diff; exit 1)) \ No newline at end of file diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/gogoproto/gogo.pb.go golang-gogoprotobuf-1.3.1/gogoproto/gogo.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/gogoproto/gogo.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/gogoproto/gogo.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package var E_GoprotoEnumPrefix = &proto.ExtensionDesc{ ExtendedType: (*descriptor.EnumOptions)(nil), diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/go.mod golang-gogoprotobuf-1.3.1/go.mod --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/go.mod 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/go.mod 2020-05-17 12:22:58.000000000 +0000 @@ -1,3 +1,6 @@ module github.com/gogo/protobuf -require github.com/kisielk/errcheck v1.1.0 // indirect +require ( + github.com/kisielk/errcheck v1.2.0 // indirect + github.com/kisielk/gotool v1.0.0 // indirect +) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/go.sum golang-gogoprotobuf-1.3.1/go.sum --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/go.sum 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/go.sum 2020-05-17 12:22:58.000000000 +0000 @@ -1,6 +1,10 @@ github.com/kisielk/errcheck v1.1.0 h1:ZqfnKyx9KGpRcW04j5nnPDgRgoXUeLh2YFBeFzphcA0= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0 h1:reN85Pxc5larApoH1keMBiu2GWtPqXQ1nc9gx+jOU+E= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635 h1:2eB4G6bDQDeP69ZXbOKC00S2Kf6TIiRS+DzfKsKeQU0= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563 h1:NIou6eNFigscvKJmsbyez16S2cIS6idossORlFtSt2E= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/install-protobuf.sh golang-gogoprotobuf-1.3.1/install-protobuf.sh --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/install-protobuf.sh 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/install-protobuf.sh 2020-05-17 12:22:58.000000000 +0000 @@ -7,7 +7,7 @@ exit 1 } -cd /home/travis +cd ${HOME} case "$PROTOBUF_VERSION" in 2*) @@ -15,7 +15,7 @@ wget https://github.com/google/protobuf/releases/download/v$PROTOBUF_VERSION/$basename.tar.gz tar xzf $basename.tar.gz cd protobuf-$PROTOBUF_VERSION - ./configure --prefix=/home/travis && make -j2 && make install + ./configure --prefix=${HOME} && make -j2 && make install ;; 3*) basename=protoc-$PROTOBUF_VERSION-linux-x86_64 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/io/uint32.go golang-gogoprotobuf-1.3.1/io/uint32.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/io/uint32.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/io/uint32.go 2020-05-17 12:22:58.000000000 +0000 @@ -120,7 +120,7 @@ if length < 0 || length > this.maxSize { return io.ErrShortBuffer } - if length >= len(this.buf) { + if length > len(this.buf) { this.buf = make([]byte, length) } _, err := io.ReadFull(this.r, this.buf[:length]) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/io/uint32_test.go golang-gogoprotobuf-1.3.1/io/uint32_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/io/uint32_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/io/uint32_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -4,6 +4,7 @@ "encoding/binary" "io/ioutil" "math/rand" + "reflect" "testing" "time" @@ -36,3 +37,37 @@ } } } + +// Writing the same size messaged twice should not cause another +// reader buffer allocation +func TestUint32SameSizeNoAlloc(t *testing.T) { + buf := newBuffer() + writer := io.NewUint32DelimitedWriter(buf, binary.LittleEndian) + reader := io.NewUint32DelimitedReader(buf, binary.LittleEndian, 1024*1024) + + err := writer.WriteMsg(&test.NinOptNative{Field15: []byte("numbercatinvention")}) + if err != nil { + t.Fatal(err) + } + err = writer.WriteMsg(&test.NinOptNative{Field15: []byte("fastenselectionsky")}) + if err != nil { + t.Fatal(err) + } + if err := writer.Close(); err != nil { + t.Fatal(err) + } + + msg := &test.NinOptNative{} + if err := reader.ReadMsg(msg); err != nil { + t.Fatal(err) + } + firstRead := reflect.ValueOf(reader).Elem().FieldByName("buf").Pointer() + if err := reader.ReadMsg(msg); err != nil { + t.Fatal(err) + } + secondRead := reflect.ValueOf(reader).Elem().FieldByName("buf").Pointer() + + if firstRead != secondRead { + t.Fatalf("reader buf byte slice pointer did not stay the same after second same size read (%d != %d).", firstRead, secondRead) + } +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/jsonpb/jsonpb.go golang-gogoprotobuf-1.3.1/jsonpb/jsonpb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/jsonpb/jsonpb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/jsonpb/jsonpb.go 2020-05-17 12:22:58.000000000 +0000 @@ -56,6 +56,7 @@ ) const secondInNanos = int64(time.Second / time.Nanosecond) +const maxSecondsInDuration = 315576000000 // Marshaler is a configurable object for converting between // protocol buffer objects and a JSON representation for them. @@ -163,6 +164,11 @@ XXX_WellKnownType() string } +var ( + wktType = reflect.TypeOf((*isWkt)(nil)).Elem() + messageType = reflect.TypeOf((*proto.Message)(nil)).Elem() +) + // marshalObject writes a struct to the Writer. func (m *Marshaler) marshalObject(out *errWriter, v proto.Message, indent, typeURL string) error { if jsm, ok := v.(JSONPBMarshaler); ok { @@ -210,19 +216,26 @@ // Any is a bit more involved. return m.marshalAny(out, v, indent) case "Duration": - // "Generated output always contains 0, 3, 6, or 9 fractional digits, - // depending on required precision." s, ns := s.Field(0).Int(), s.Field(1).Int() + if s < -maxSecondsInDuration || s > maxSecondsInDuration { + return fmt.Errorf("seconds out of range %v", s) + } if ns <= -secondInNanos || ns >= secondInNanos { return fmt.Errorf("ns out of range (%v, %v)", -secondInNanos, secondInNanos) } if (s > 0 && ns < 0) || (s < 0 && ns > 0) { return errors.New("signs of seconds and nanos do not match") } - if s < 0 { + // Generated output always contains 0, 3, 6, or 9 fractional digits, + // depending on required precision, followed by the suffix "s". + f := "%d.%09d" + if ns < 0 { ns = -ns + if s == 0 { + f = "-%d.%09d" + } } - x := fmt.Sprintf("%d.%09d", s, ns) + x := fmt.Sprintf(f, s, ns) x = strings.TrimSuffix(x, "000") x = strings.TrimSuffix(x, "000") x = strings.TrimSuffix(x, ".000") @@ -543,7 +556,8 @@ // Handle well-known types. // Most are handled up in marshalObject (because 99% are messages). - if wkt, ok := v.Interface().(isWkt); ok { + if v.Type().Implements(wktType) { + wkt := v.Interface().(isWkt) switch wkt.XXX_WellKnownType() { case "NullValue": out.write("null") @@ -1414,8 +1428,8 @@ } func checkRequiredFieldsInValue(v reflect.Value) error { - if pm, ok := v.Interface().(proto.Message); ok { - return checkRequiredFields(pm) + if v.Type().Implements(messageType) { + return checkRequiredFields(v.Interface().(proto.Message)) } return nil } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/jsonpb/jsonpb_test.go golang-gogoprotobuf-1.3.1/jsonpb/jsonpb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/jsonpb/jsonpb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/jsonpb/jsonpb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -363,7 +363,7 @@ An: &types.Any{ TypeUrl: "type.googleapis.com/google.protobuf.Duration", Value: []byte{ - // &durpb.Duration{Seconds: 1, Nanos: 212000000 } + // &types.Duration{Seconds: 1, Nanos: 212000000 } 1 << 3, 1, // seconds 2 << 3, 0x80, 0xba, 0x8b, 0x65, // nanos }, @@ -472,10 +472,18 @@ {"Any with message and indent", marshalerAllOptions, anySimple, anySimplePrettyJSON}, {"Any with WKT", marshaler, anyWellKnown, anyWellKnownJSON}, {"Any with WKT and indent", marshalerAllOptions, anyWellKnown, anyWellKnownPrettyJSON}, - {"Duration", marshaler, &pb.KnownTypes{Dur: &types.Duration{Seconds: 3}}, `{"dur":"3s"}`}, - {"Duration", marshaler, &pb.KnownTypes{Dur: &types.Duration{Seconds: 3, Nanos: 1e6}}, `{"dur":"3.001s"}`}, - {"Duration beyond float64 precision", marshaler, &pb.KnownTypes{Dur: &types.Duration{Seconds: 100000000, Nanos: 1}}, `{"dur":"100000000.000000001s"}`}, - {"negative Duration", marshaler, &pb.KnownTypes{Dur: &types.Duration{Seconds: -123, Nanos: -456}}, `{"dur":"-123.000000456s"}`}, + {"Duration empty", marshaler, &types.Duration{}, `"0s"`}, + {"Duration with secs", marshaler, &types.Duration{Seconds: 3}, `"3s"`}, + {"Duration with -secs", marshaler, &types.Duration{Seconds: -3}, `"-3s"`}, + {"Duration with nanos", marshaler, &types.Duration{Nanos: 1e6}, `"0.001s"`}, + {"Duration with -nanos", marshaler, &types.Duration{Nanos: -1e6}, `"-0.001s"`}, + {"Duration with large secs", marshaler, &types.Duration{Seconds: 1e10, Nanos: 1}, `"10000000000.000000001s"`}, + {"Duration with 6-digit nanos", marshaler, &types.Duration{Nanos: 1e4}, `"0.000010s"`}, + {"Duration with 3-digit nanos", marshaler, &types.Duration{Nanos: 1e6}, `"0.001s"`}, + {"Duration with -secs -nanos", marshaler, &types.Duration{Seconds: -123, Nanos: -450}, `"-123.000000450s"`}, + {"Duration max value", marshaler, &types.Duration{Seconds: 315576000000, Nanos: 999999999}, `"315576000000.999999999s"`}, + {"Duration small negative", marshaler, &types.Duration{Nanos: -1}, `"-0.000000001s"`}, + {"Duration min value", marshaler, &types.Duration{Seconds: -315576000000, Nanos: -999999999}, `"-315576000000.999999999s"`}, {"Struct", marshaler, &pb.KnownTypes{St: &types.Struct{ Fields: map[string]*types.Value{ "one": {Kind: &types.Value_StringValue{StringValue: "loneliest number"}}, @@ -546,15 +554,17 @@ pb proto.Message fail bool }{ - {&pb.KnownTypes{Dur: &types.Duration{Seconds: 1, Nanos: 0}}, false}, - {&pb.KnownTypes{Dur: &types.Duration{Seconds: -1, Nanos: 0}}, false}, - {&pb.KnownTypes{Dur: &types.Duration{Seconds: 1, Nanos: -1}}, true}, - {&pb.KnownTypes{Dur: &types.Duration{Seconds: -1, Nanos: 1}}, true}, - {&pb.KnownTypes{Dur: &types.Duration{Seconds: 1, Nanos: 1000000000}}, true}, - {&pb.KnownTypes{Dur: &types.Duration{Seconds: -1, Nanos: -1000000000}}, true}, - {&pb.KnownTypes{Ts: &types.Timestamp{Seconds: 1, Nanos: 1}}, false}, - {&pb.KnownTypes{Ts: &types.Timestamp{Seconds: 1, Nanos: -1}}, true}, - {&pb.KnownTypes{Ts: &types.Timestamp{Seconds: 1, Nanos: 1000000000}}, true}, + {&types.Duration{Seconds: 1, Nanos: 0}, false}, + {&types.Duration{Seconds: -1, Nanos: 0}, false}, + {&types.Duration{Seconds: 1, Nanos: -1}, true}, + {&types.Duration{Seconds: -1, Nanos: 1}, true}, + {&types.Duration{Seconds: 315576000001}, true}, + {&types.Duration{Seconds: -315576000001}, true}, + {&types.Duration{Seconds: 1, Nanos: 1000000000}, true}, + {&types.Duration{Seconds: -1, Nanos: -1000000000}, true}, + {&types.Timestamp{Seconds: 1, Nanos: 1}, false}, + {&types.Timestamp{Seconds: 1, Nanos: -1}, true}, + {&types.Timestamp{Seconds: 1, Nanos: 1000000000}, true}, } for _, tt := range tests { _, err := marshaler.MarshalToString(tt.pb) @@ -604,8 +614,7 @@ t.Errorf("an unexpected error occurred when marshalling Any to JSON: %v", err) } // same as expected above, but pretty-printed w/ indentation - expected = - `{ + expected = `{ "@type": "type.googleapis.com/` + dynamicMessageName + `", "baz": [ 0, diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/jsonpb/jsonpb_test_proto/more_test_objects.pb.go golang-gogoprotobuf-1.3.1/jsonpb/jsonpb_test_proto/more_test_objects.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/jsonpb/jsonpb_test_proto/more_test_objects.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/jsonpb/jsonpb_test_proto/more_test_objects.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Numeral int32 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/jsonpb/jsonpb_test_proto/test_objects.pb.go golang-gogoprotobuf-1.3.1/jsonpb/jsonpb_test_proto/test_objects.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/jsonpb/jsonpb_test_proto/test_objects.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/jsonpb/jsonpb_test_proto/test_objects.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Widget_Color int32 @@ -620,19 +620,19 @@ } type MsgWithOneof_Title struct { - Title string `protobuf:"bytes,1,opt,name=title,oneof"` + Title string `protobuf:"bytes,1,opt,name=title,oneof" json:"title,omitempty"` } type MsgWithOneof_Salary struct { - Salary int64 `protobuf:"varint,2,opt,name=salary,oneof"` + Salary int64 `protobuf:"varint,2,opt,name=salary,oneof" json:"salary,omitempty"` } type MsgWithOneof_Country struct { - Country string `protobuf:"bytes,3,opt,name=Country,oneof"` + Country string `protobuf:"bytes,3,opt,name=Country,oneof" json:"Country,omitempty"` } type MsgWithOneof_HomeAddress struct { - HomeAddress string `protobuf:"bytes,4,opt,name=home_address,json=homeAddress,oneof"` + HomeAddress string `protobuf:"bytes,4,opt,name=home_address,json=homeAddress,oneof" json:"home_address,omitempty"` } type MsgWithOneof_MsgWithRequired struct { - MsgWithRequired *MsgWithRequired `protobuf:"bytes,5,opt,name=msg_with_required,json=msgWithRequired,oneof"` + MsgWithRequired *MsgWithRequired `protobuf:"bytes,5,opt,name=msg_with_required,json=msgWithRequired,oneof" json:"msg_with_required,omitempty"` } func (*MsgWithOneof_Title) isMsgWithOneof_Union() {} @@ -683,9 +683,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*MsgWithOneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _MsgWithOneof_OneofMarshaler, _MsgWithOneof_OneofUnmarshaler, _MsgWithOneof_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*MsgWithOneof) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*MsgWithOneof_Title)(nil), (*MsgWithOneof_Salary)(nil), (*MsgWithOneof_Country)(nil), @@ -694,109 +694,6 @@ } } -func _MsgWithOneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*MsgWithOneof) - // union - switch x := m.Union.(type) { - case *MsgWithOneof_Title: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Title) - case *MsgWithOneof_Salary: - _ = b.EncodeVarint(2<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Salary)) - case *MsgWithOneof_Country: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Country) - case *MsgWithOneof_HomeAddress: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.HomeAddress) - case *MsgWithOneof_MsgWithRequired: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.MsgWithRequired); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("MsgWithOneof.Union has unexpected type %T", x) - } - return nil -} - -func _MsgWithOneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*MsgWithOneof) - switch tag { - case 1: // union.title - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Union = &MsgWithOneof_Title{x} - return true, err - case 2: // union.salary - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &MsgWithOneof_Salary{int64(x)} - return true, err - case 3: // union.Country - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Union = &MsgWithOneof_Country{x} - return true, err - case 4: // union.home_address - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Union = &MsgWithOneof_HomeAddress{x} - return true, err - case 5: // union.msg_with_required - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(MsgWithRequired) - err := b.DecodeMessage(msg) - m.Union = &MsgWithOneof_MsgWithRequired{msg} - return true, err - default: - return false, nil - } -} - -func _MsgWithOneof_OneofSizer(msg proto.Message) (n int) { - m := msg.(*MsgWithOneof) - // union - switch x := m.Union.(type) { - case *MsgWithOneof_Title: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Title))) - n += len(x.Title) - case *MsgWithOneof_Salary: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Salary)) - case *MsgWithOneof_Country: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Country))) - n += len(x.Country) - case *MsgWithOneof_HomeAddress: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.HomeAddress))) - n += len(x.HomeAddress) - case *MsgWithOneof_MsgWithRequired: - s := proto.Size(x.MsgWithRequired) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type Real struct { Value *float64 `protobuf:"fixed64,1,opt,name=value" json:"value,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/Makefile golang-gogoprotobuf-1.3.1/Makefile --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/Makefile 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/Makefile 2020-05-17 12:22:58.000000000 +0000 @@ -136,6 +136,10 @@ make -C test/issue498 regenerate make -C test/issue503 regenerate make -C test/issue530 regenerate + make -C test/issue617 regenerate + make -C test/issue620 regenerate + make -C test/protobuffer regenerate + make -C test/issue630 regenerate make gofmt diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/plugin/compare/compare.go golang-gogoprotobuf-1.3.1/plugin/compare/compare.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/plugin/compare/compare.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/plugin/compare/compare.go 2020-05-17 12:22:58.000000000 +0000 @@ -425,11 +425,65 @@ p.In() p.P(`return -1`) p.Out() - p.P(`} else if c := this.`, fieldname, `.Compare(that1.`, fieldname, `); c != 0 {`) + p.P(`} else {`) + p.In() + + // Generate two type switches in order to compare the + // types of the oneofs. If they are of the same type + // call Compare, otherwise return 1 or -1. + p.P(`thisType := -1`) + p.P(`switch this.`, fieldname, `.(type) {`) + for i, subfield := range message.Field { + if *subfield.OneofIndex == *field.OneofIndex { + ccTypeName := p.OneOfTypeName(message, subfield) + p.P(`case *`, ccTypeName, `:`) + p.In() + p.P(`thisType = `, i) + p.Out() + } + } + p.P(`default:`) + p.In() + p.P(`panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.`, fieldname, `))`) + p.Out() + p.P(`}`) + + p.P(`that1Type := -1`) + p.P(`switch that1.`, fieldname, `.(type) {`) + for i, subfield := range message.Field { + if *subfield.OneofIndex == *field.OneofIndex { + ccTypeName := p.OneOfTypeName(message, subfield) + p.P(`case *`, ccTypeName, `:`) + p.In() + p.P(`that1Type = `, i) + p.Out() + } + } + p.P(`default:`) + p.In() + p.P(`panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.`, fieldname, `))`) + p.Out() + p.P(`}`) + + p.P(`if thisType == that1Type {`) + p.In() + p.P(`if c := this.`, fieldname, `.Compare(that1.`, fieldname, `); c != 0 {`) p.In() p.P(`return c`) p.Out() p.P(`}`) + p.Out() + p.P(`} else if thisType < that1Type {`) + p.In() + p.P(`return -1`) + p.Out() + p.P(`} else if thisType > that1Type {`) + p.In() + p.P(`return 1`) + p.Out() + p.P(`}`) + p.Out() + p.P(`}`) } else { p.generateField(file, message, field) } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/plugin/gostring/gostring.go golang-gogoprotobuf-1.3.1/plugin/gostring/gostring.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/plugin/gostring/gostring.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/plugin/gostring/gostring.go 2020-05-17 12:22:58.000000000 +0000 @@ -238,10 +238,10 @@ } else { goTyp, _ := p.GoType(message, field) goTyp = strings.Replace(goTyp, "[]", "", 1) - p.P("vs := make([]*", goTyp, ", len(this.", fieldname, "))") + p.P("vs := make([]", goTyp, ", len(this.", fieldname, "))") p.P("for i := range vs {") p.In() - p.P("vs[i] = &this.", fieldname, "[i]") + p.P("vs[i] = this.", fieldname, "[i]") p.Out() p.P("}") p.P(`s = append(s, "`, fieldname, `: " + `, fmtPkg.Use(), `.Sprintf("%#v", vs) + ",\n")`) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/plugin/marshalto/marshalto.go golang-gogoprotobuf-1.3.1/plugin/marshalto/marshalto.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/plugin/marshalto/marshalto.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/plugin/marshalto/marshalto.go 2020-05-17 12:22:58.000000000 +0000 @@ -76,49 +76,59 @@ given to the marshalto plugin, will generate the following code: func (m *B) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil } func (m *B) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintExample(dAtA, i, uint64(m.A.Size())) - n2, err := m.A.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n2 - if len(m.G) > 0 { - for _, msg := range m.G { - dAtA[i] = 0x12 - i++ - i = encodeVarintExample(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) + } + + func (m *B) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.G) > 0 { + for iNdEx := len(m.G) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.G[iNdEx].Size() + i -= size + if _, err := m.G[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintExample(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + { + size, err := m.A.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintExample(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } As shown above Marshal calculates the size of the not yet marshalled message and allocates the appropriate buffer. -This is followed by calling the MarshalTo method which requires a preallocated buffer. +This is followed by calling the MarshalToSizedBuffer method which requires a preallocated buffer, and marshals backwards. The MarshalTo method allows a user to rather preallocated a reusable buffer. The Size method is generated using the size plugin and the gogoproto.sizer, gogoproto.sizer_all extensions. @@ -194,31 +204,19 @@ } func (p *marshalto) callFixed64(varName ...string) { + p.P(`i -= 8`) p.P(p.binaryPkg.Use(), `.LittleEndian.PutUint64(dAtA[i:], uint64(`, strings.Join(varName, ""), `))`) - p.P(`i += 8`) } func (p *marshalto) callFixed32(varName ...string) { + p.P(`i -= 4`) p.P(p.binaryPkg.Use(), `.LittleEndian.PutUint32(dAtA[i:], uint32(`, strings.Join(varName, ""), `))`) - p.P(`i += 4`) } func (p *marshalto) callVarint(varName ...string) { p.P(`i = encodeVarint`, p.localName, `(dAtA, i, uint64(`, strings.Join(varName, ""), `))`) } -func (p *marshalto) encodeVarint(varName string) { - p.P(`for `, varName, ` >= 1<<7 {`) - p.In() - p.P(`dAtA[i] = uint8(uint64(`, varName, `)&0x7f|0x80)`) - p.P(varName, ` >>= 7`) - p.P(`i++`) - p.Out() - p.P(`}`) - p.P(`dAtA[i] = uint8(`, varName, `)`) - p.P(`i++`) -} - func (p *marshalto) encodeKey(fieldNumber int32, wireType int) { x := uint32(fieldNumber)<<3 | uint32(wireType) i := 0 @@ -228,9 +226,9 @@ x >>= 7 } keybuf = append(keybuf, uint8(x)) - for _, b := range keybuf { - p.P(`dAtA[i] = `, fmt.Sprintf("%#v", b)) - p.P(`i++`) + for i = len(keybuf) - 1; i >= 0; i-- { + p.P(`i--`) + p.P(`dAtA[i] = `, fmt.Sprintf("%#v", keybuf[i])) } } @@ -283,6 +281,7 @@ descriptor.FieldDescriptorProto_TYPE_SFIXED32: p.callFixed32(varName) case descriptor.FieldDescriptorProto_TYPE_BOOL: + p.P(`i--`) p.P(`if `, varName, ` {`) p.In() p.P(`dAtA[i] = 1`) @@ -292,73 +291,28 @@ p.P(`dAtA[i] = 0`) p.Out() p.P(`}`) - p.P(`i++`) case descriptor.FieldDescriptorProto_TYPE_STRING, descriptor.FieldDescriptorProto_TYPE_BYTES: if gogoproto.IsCustomType(field) && kvField.IsBytes() { - p.callVarint(varName, `.Size()`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, varName, `.MarshalTo(dAtA[i:])`) - p.P(`if err`, numGen.Current(), ` != nil {`) - p.In() - p.P(`return 0, err`, numGen.Current()) - p.Out() - p.P(`}`) - p.P(`i+=n`, numGen.Current()) + p.forward(varName, true, protoSizer) } else { + p.P(`i -= len(`, varName, `)`) + p.P(`copy(dAtA[i:], `, varName, `)`) p.callVarint(`len(`, varName, `)`) - p.P(`i+=copy(dAtA[i:], `, varName, `)`) } case descriptor.FieldDescriptorProto_TYPE_SINT32: p.callVarint(`(uint32(`, varName, `) << 1) ^ uint32((`, varName, ` >> 31))`) case descriptor.FieldDescriptorProto_TYPE_SINT64: p.callVarint(`(uint64(`, varName, `) << 1) ^ uint64((`, varName, ` >> 63))`) case descriptor.FieldDescriptorProto_TYPE_MESSAGE: - if gogoproto.IsStdTime(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdTime(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdTimeMarshalTo(*`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdDuration(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdDuration(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdDurationMarshalTo(*`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdDouble(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdDouble(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdDoubleMarshalTo(*`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdFloat(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdFloat(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdFloatMarshalTo(*`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdInt64(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdInt64(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdInt64MarshalTo(*`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdUInt64(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdUInt64(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdUInt64MarshalTo(*`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdInt32(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdInt32(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdInt32MarshalTo(*`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdUInt32(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdUInt32(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdUInt32MarshalTo(*`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdBool(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdBool(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdBoolMarshalTo(*`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdString(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdString(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdStringMarshalTo(*`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdBytes(kvField) { - p.callVarint(p.typesPkg.Use(), `.SizeOfStdBytes(*`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdBytesMarshalTo(*`, varName, `, dAtA[i:])`) - } else if protoSizer { - p.callVarint(varName, `.ProtoSize()`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, varName, `.MarshalTo(dAtA[i:])`) - } else { - p.callVarint(varName, `.Size()`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, varName, `.MarshalTo(dAtA[i:])`) + if !p.marshalAllSizeOf(kvField, `(*`+varName+`)`, numGen.Next()) { + if gogoproto.IsCustomType(field) { + p.forward(varName, true, protoSizer) + } else { + p.backward(varName, true) + } } - p.P(`if err`, numGen.Current(), ` != nil {`) - p.In() - p.P(`return 0, err`, numGen.Current()) - p.Out() - p.P(`}`) - p.P(`i+=n`, numGen.Current()) + } } @@ -410,67 +364,63 @@ switch *field.Type { case descriptor.FieldDescriptorProto_TYPE_DOUBLE: if packed { - p.encodeKey(fieldNumber, wireType) - p.callVarint(`len(m.`, fieldname, `) * 8`) - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() - p.P(`f`, numGen.Next(), ` := `, p.mathPkg.Use(), `.Float64bits(float64(num))`) + val := p.reverseListRange(`m.`, fieldname) + p.P(`f`, numGen.Next(), ` := `, p.mathPkg.Use(), `.Float64bits(float64(`, val, `))`) p.callFixed64("f" + numGen.Current()) p.Out() p.P(`}`) - } else if repeated { - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() + p.callVarint(`len(m.`, fieldname, `) * 8`) p.encodeKey(fieldNumber, wireType) - p.P(`f`, numGen.Next(), ` := `, p.mathPkg.Use(), `.Float64bits(float64(num))`) + } else if repeated { + val := p.reverseListRange(`m.`, fieldname) + p.P(`f`, numGen.Next(), ` := `, p.mathPkg.Use(), `.Float64bits(float64(`, val, `))`) p.callFixed64("f" + numGen.Current()) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if proto3 { p.P(`if m.`, fieldname, ` != 0 {`) p.In() - p.encodeKey(fieldNumber, wireType) p.callFixed64(p.mathPkg.Use(), `.Float64bits(float64(m.`+fieldname, `))`) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if !nullable { - p.encodeKey(fieldNumber, wireType) p.callFixed64(p.mathPkg.Use(), `.Float64bits(float64(m.`+fieldname, `))`) - } else { p.encodeKey(fieldNumber, wireType) + } else { p.callFixed64(p.mathPkg.Use(), `.Float64bits(float64(*m.`+fieldname, `))`) + p.encodeKey(fieldNumber, wireType) } case descriptor.FieldDescriptorProto_TYPE_FLOAT: if packed { - p.encodeKey(fieldNumber, wireType) - p.callVarint(`len(m.`, fieldname, `) * 4`) - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() - p.P(`f`, numGen.Next(), ` := `, p.mathPkg.Use(), `.Float32bits(float32(num))`) + val := p.reverseListRange(`m.`, fieldname) + p.P(`f`, numGen.Next(), ` := `, p.mathPkg.Use(), `.Float32bits(float32(`, val, `))`) p.callFixed32("f" + numGen.Current()) p.Out() p.P(`}`) - } else if repeated { - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() + p.callVarint(`len(m.`, fieldname, `) * 4`) p.encodeKey(fieldNumber, wireType) - p.P(`f`, numGen.Next(), ` := `, p.mathPkg.Use(), `.Float32bits(float32(num))`) + } else if repeated { + val := p.reverseListRange(`m.`, fieldname) + p.P(`f`, numGen.Next(), ` := `, p.mathPkg.Use(), `.Float32bits(float32(`, val, `))`) p.callFixed32("f" + numGen.Current()) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if proto3 { p.P(`if m.`, fieldname, ` != 0 {`) p.In() - p.encodeKey(fieldNumber, wireType) p.callFixed32(p.mathPkg.Use(), `.Float32bits(float32(m.`+fieldname, `))`) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if !nullable { - p.encodeKey(fieldNumber, wireType) p.callFixed32(p.mathPkg.Use(), `.Float32bits(float32(m.`+fieldname, `))`) - } else { p.encodeKey(fieldNumber, wireType) + } else { p.callFixed32(p.mathPkg.Use(), `.Float32bits(float32(*m.`+fieldname, `))`) + p.encodeKey(fieldNumber, wireType) } case descriptor.FieldDescriptorProto_TYPE_INT64, descriptor.FieldDescriptorProto_TYPE_UINT64, @@ -501,99 +451,93 @@ p.P(jvar, `++`) p.Out() p.P(`}`) - p.encodeKey(fieldNumber, wireType) + p.P(`i -= `, jvar) + p.P(`copy(dAtA[i:], dAtA`, numGen.Current(), `[:`, jvar, `])`) p.callVarint(jvar) - p.P(`i += copy(dAtA[i:], dAtA`, numGen.Current(), `[:`, jvar, `])`) + p.encodeKey(fieldNumber, wireType) } else if repeated { - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() + val := p.reverseListRange(`m.`, fieldname) + p.callVarint(val) p.encodeKey(fieldNumber, wireType) - p.callVarint("num") p.Out() p.P(`}`) } else if proto3 { p.P(`if m.`, fieldname, ` != 0 {`) p.In() - p.encodeKey(fieldNumber, wireType) p.callVarint(`m.`, fieldname) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if !nullable { - p.encodeKey(fieldNumber, wireType) p.callVarint(`m.`, fieldname) - } else { p.encodeKey(fieldNumber, wireType) + } else { p.callVarint(`*m.`, fieldname) + p.encodeKey(fieldNumber, wireType) } case descriptor.FieldDescriptorProto_TYPE_FIXED64, descriptor.FieldDescriptorProto_TYPE_SFIXED64: if packed { - p.encodeKey(fieldNumber, wireType) - p.callVarint(`len(m.`, fieldname, `) * 8`) - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() - p.callFixed64("num") + val := p.reverseListRange(`m.`, fieldname) + p.callFixed64(val) p.Out() p.P(`}`) + p.callVarint(`len(m.`, fieldname, `) * 8`) + p.encodeKey(fieldNumber, wireType) } else if repeated { - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() + val := p.reverseListRange(`m.`, fieldname) + p.callFixed64(val) p.encodeKey(fieldNumber, wireType) - p.callFixed64("num") p.Out() p.P(`}`) } else if proto3 { p.P(`if m.`, fieldname, ` != 0 {`) p.In() - p.encodeKey(fieldNumber, wireType) p.callFixed64("m." + fieldname) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if !nullable { - p.encodeKey(fieldNumber, wireType) p.callFixed64("m." + fieldname) - } else { p.encodeKey(fieldNumber, wireType) + } else { p.callFixed64("*m." + fieldname) + p.encodeKey(fieldNumber, wireType) } case descriptor.FieldDescriptorProto_TYPE_FIXED32, descriptor.FieldDescriptorProto_TYPE_SFIXED32: if packed { - p.encodeKey(fieldNumber, wireType) - p.callVarint(`len(m.`, fieldname, `) * 4`) - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() - p.callFixed32("num") + val := p.reverseListRange(`m.`, fieldname) + p.callFixed32(val) p.Out() p.P(`}`) + p.callVarint(`len(m.`, fieldname, `) * 4`) + p.encodeKey(fieldNumber, wireType) } else if repeated { - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() + val := p.reverseListRange(`m.`, fieldname) + p.callFixed32(val) p.encodeKey(fieldNumber, wireType) - p.callFixed32("num") p.Out() p.P(`}`) } else if proto3 { p.P(`if m.`, fieldname, ` != 0 {`) p.In() - p.encodeKey(fieldNumber, wireType) p.callFixed32("m." + fieldname) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if !nullable { - p.encodeKey(fieldNumber, wireType) p.callFixed32("m." + fieldname) - } else { p.encodeKey(fieldNumber, wireType) + } else { p.callFixed32("*m." + fieldname) + p.encodeKey(fieldNumber, wireType) } case descriptor.FieldDescriptorProto_TYPE_BOOL: if packed { - p.encodeKey(fieldNumber, wireType) - p.callVarint(`len(m.`, fieldname, `)`) - p.P(`for _, b := range m.`, fieldname, ` {`) - p.In() - p.P(`if b {`) + val := p.reverseListRange(`m.`, fieldname) + p.P(`i--`) + p.P(`if `, val, ` {`) p.In() p.P(`dAtA[i] = 1`) p.Out() @@ -602,14 +546,14 @@ p.P(`dAtA[i] = 0`) p.Out() p.P(`}`) - p.P(`i++`) p.Out() p.P(`}`) - } else if repeated { - p.P(`for _, b := range m.`, fieldname, ` {`) - p.In() + p.callVarint(`len(m.`, fieldname, `)`) p.encodeKey(fieldNumber, wireType) - p.P(`if b {`) + } else if repeated { + val := p.reverseListRange(`m.`, fieldname) + p.P(`i--`) + p.P(`if `, val, ` {`) p.In() p.P(`dAtA[i] = 1`) p.Out() @@ -618,13 +562,13 @@ p.P(`dAtA[i] = 0`) p.Out() p.P(`}`) - p.P(`i++`) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if proto3 { p.P(`if m.`, fieldname, ` {`) p.In() - p.encodeKey(fieldNumber, wireType) + p.P(`i--`) p.P(`if m.`, fieldname, ` {`) p.In() p.P(`dAtA[i] = 1`) @@ -634,11 +578,11 @@ p.P(`dAtA[i] = 0`) p.Out() p.P(`}`) - p.P(`i++`) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if !nullable { - p.encodeKey(fieldNumber, wireType) + p.P(`i--`) p.P(`if m.`, fieldname, ` {`) p.In() p.P(`dAtA[i] = 1`) @@ -648,9 +592,9 @@ p.P(`dAtA[i] = 0`) p.Out() p.P(`}`) - p.P(`i++`) - } else { p.encodeKey(fieldNumber, wireType) + } else { + p.P(`i--`) p.P(`if *m.`, fieldname, ` {`) p.In() p.P(`dAtA[i] = 1`) @@ -660,34 +604,36 @@ p.P(`dAtA[i] = 0`) p.Out() p.P(`}`) - p.P(`i++`) + p.encodeKey(fieldNumber, wireType) } case descriptor.FieldDescriptorProto_TYPE_STRING: if repeated { - p.P(`for _, s := range m.`, fieldname, ` {`) - p.In() + val := p.reverseListRange(`m.`, fieldname) + p.P(`i -= len(`, val, `)`) + p.P(`copy(dAtA[i:], `, val, `)`) + p.callVarint(`len(`, val, `)`) p.encodeKey(fieldNumber, wireType) - p.P(`l = len(s)`) - p.encodeVarint("l") - p.P(`i+=copy(dAtA[i:], s)`) p.Out() p.P(`}`) } else if proto3 { p.P(`if len(m.`, fieldname, `) > 0 {`) p.In() - p.encodeKey(fieldNumber, wireType) + p.P(`i -= len(m.`, fieldname, `)`) + p.P(`copy(dAtA[i:], m.`, fieldname, `)`) p.callVarint(`len(m.`, fieldname, `)`) - p.P(`i+=copy(dAtA[i:], m.`, fieldname, `)`) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if !nullable { - p.encodeKey(fieldNumber, wireType) + p.P(`i -= len(m.`, fieldname, `)`) + p.P(`copy(dAtA[i:], m.`, fieldname, `)`) p.callVarint(`len(m.`, fieldname, `)`) - p.P(`i+=copy(dAtA[i:], m.`, fieldname, `)`) - } else { p.encodeKey(fieldNumber, wireType) + } else { + p.P(`i -= len(*m.`, fieldname, `)`) + p.P(`copy(dAtA[i:], *m.`, fieldname, `)`) p.callVarint(`len(*m.`, fieldname, `)`) - p.P(`i+=copy(dAtA[i:], *m.`, fieldname, `)`) + p.encodeKey(fieldNumber, wireType) } case descriptor.FieldDescriptorProto_TYPE_GROUP: panic(fmt.Errorf("marshaler does not support group %v", fieldname)) @@ -703,112 +649,32 @@ valuegoTyp, valuewire := p.GoType(nil, m.ValueField) valuegoAliasTyp, _ := p.GoType(nil, m.ValueAliasField) nullable, valuegoTyp, valuegoAliasTyp = generator.GoMapValueTypes(field, m.ValueField, valuegoTyp, valuegoAliasTyp) - keyKeySize := keySize(1, wireToType(keywire)) - valueKeySize := keySize(2, wireToType(valuewire)) + var val string if gogoproto.IsStableMarshaler(file.FileDescriptorProto, message.DescriptorProto) { keysName := `keysFor` + fieldname p.P(keysName, ` := make([]`, keygoTyp, `, 0, len(m.`, fieldname, `))`) - p.P(`for k, _ := range m.`, fieldname, ` {`) + p.P(`for k := range m.`, fieldname, ` {`) p.In() p.P(keysName, ` = append(`, keysName, `, `, keygoTyp, `(k))`) p.Out() p.P(`}`) p.P(p.sortKeysPkg.Use(), `.`, keyCapTyp, `s(`, keysName, `)`) - p.P(`for _, k := range `, keysName, ` {`) + val = p.reverseListRange(keysName) } else { - p.P(`for k, _ := range m.`, fieldname, ` {`) - } - p.In() - p.encodeKey(fieldNumber, wireType) - sum := []string{strconv.Itoa(keyKeySize)} - switch m.KeyField.GetType() { - case descriptor.FieldDescriptorProto_TYPE_DOUBLE, - descriptor.FieldDescriptorProto_TYPE_FIXED64, - descriptor.FieldDescriptorProto_TYPE_SFIXED64: - sum = append(sum, `8`) - case descriptor.FieldDescriptorProto_TYPE_FLOAT, - descriptor.FieldDescriptorProto_TYPE_FIXED32, - descriptor.FieldDescriptorProto_TYPE_SFIXED32: - sum = append(sum, `4`) - case descriptor.FieldDescriptorProto_TYPE_INT64, - descriptor.FieldDescriptorProto_TYPE_UINT64, - descriptor.FieldDescriptorProto_TYPE_UINT32, - descriptor.FieldDescriptorProto_TYPE_ENUM, - descriptor.FieldDescriptorProto_TYPE_INT32: - sum = append(sum, `sov`+p.localName+`(uint64(k))`) - case descriptor.FieldDescriptorProto_TYPE_BOOL: - sum = append(sum, `1`) - case descriptor.FieldDescriptorProto_TYPE_STRING, - descriptor.FieldDescriptorProto_TYPE_BYTES: - sum = append(sum, `len(k)+sov`+p.localName+`(uint64(len(k)))`) - case descriptor.FieldDescriptorProto_TYPE_SINT32, - descriptor.FieldDescriptorProto_TYPE_SINT64: - sum = append(sum, `soz`+p.localName+`(uint64(k))`) + p.P(`for k := range m.`, fieldname, ` {`) + val = "k" + p.In() } if gogoproto.IsStableMarshaler(file.FileDescriptorProto, message.DescriptorProto) { - p.P(`v := m.`, fieldname, `[`, keygoAliasTyp, `(k)]`) + p.P(`v := m.`, fieldname, `[`, keygoAliasTyp, `(`, val, `)]`) } else { - p.P(`v := m.`, fieldname, `[k]`) + p.P(`v := m.`, fieldname, `[`, val, `]`) } + p.P(`baseI := i`) accessor := `v` - switch m.ValueField.GetType() { - case descriptor.FieldDescriptorProto_TYPE_DOUBLE, - descriptor.FieldDescriptorProto_TYPE_FIXED64, - descriptor.FieldDescriptorProto_TYPE_SFIXED64: - sum = append(sum, strconv.Itoa(valueKeySize)) - sum = append(sum, strconv.Itoa(8)) - case descriptor.FieldDescriptorProto_TYPE_FLOAT, - descriptor.FieldDescriptorProto_TYPE_FIXED32, - descriptor.FieldDescriptorProto_TYPE_SFIXED32: - sum = append(sum, strconv.Itoa(valueKeySize)) - sum = append(sum, strconv.Itoa(4)) - case descriptor.FieldDescriptorProto_TYPE_INT64, - descriptor.FieldDescriptorProto_TYPE_UINT64, - descriptor.FieldDescriptorProto_TYPE_UINT32, - descriptor.FieldDescriptorProto_TYPE_ENUM, - descriptor.FieldDescriptorProto_TYPE_INT32: - sum = append(sum, strconv.Itoa(valueKeySize)) - sum = append(sum, `sov`+p.localName+`(uint64(v))`) - case descriptor.FieldDescriptorProto_TYPE_BOOL: - sum = append(sum, strconv.Itoa(valueKeySize)) - sum = append(sum, `1`) - case descriptor.FieldDescriptorProto_TYPE_STRING: - sum = append(sum, strconv.Itoa(valueKeySize)) - sum = append(sum, `len(v)+sov`+p.localName+`(uint64(len(v)))`) - case descriptor.FieldDescriptorProto_TYPE_BYTES: - if gogoproto.IsCustomType(field) { - p.P(`cSize := 0`) - if gogoproto.IsNullable(field) { - p.P(`if `, accessor, ` != nil {`) - p.In() - } - p.P(`cSize = `, accessor, `.Size()`) - p.P(`cSize += `, strconv.Itoa(valueKeySize), ` + sov`+p.localName+`(uint64(cSize))`) - if gogoproto.IsNullable(field) { - p.Out() - p.P(`}`) - } - sum = append(sum, `cSize`) - } else { - p.P(`byteSize := 0`) - if proto3 { - p.P(`if len(v) > 0 {`) - } else { - p.P(`if v != nil {`) - } - p.In() - p.P(`byteSize = `, strconv.Itoa(valueKeySize), ` + len(v)+sov`+p.localName+`(uint64(len(v)))`) - p.Out() - p.P(`}`) - sum = append(sum, `byteSize`) - } - case descriptor.FieldDescriptorProto_TYPE_SINT32, - descriptor.FieldDescriptorProto_TYPE_SINT64: - sum = append(sum, strconv.Itoa(valueKeySize)) - sum = append(sum, `soz`+p.localName+`(uint64(v))`) - case descriptor.FieldDescriptorProto_TYPE_MESSAGE: - if valuegoTyp != valuegoAliasTyp && - !gogoproto.IsStdType(m.ValueAliasField) { + + if m.ValueField.GetType() == descriptor.FieldDescriptorProto_TYPE_MESSAGE { + if valuegoTyp != valuegoAliasTyp && !gogoproto.IsStdType(m.ValueAliasField) { if nullable { // cast back to the type that has the generated methods on it accessor = `((` + valuegoTyp + `)(` + accessor + `))` @@ -818,45 +684,8 @@ } else if !nullable { accessor = `(&v)` } - p.P(`msgSize := 0`) - p.P(`if `, accessor, ` != nil {`) - p.In() - if gogoproto.IsStdTime(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdTime(*`, accessor, `)`) - } else if gogoproto.IsStdDuration(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdDuration(*`, accessor, `)`) - } else if gogoproto.IsStdDouble(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdDouble(*`, accessor, `)`) - } else if gogoproto.IsStdFloat(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdFloat(*`, accessor, `)`) - } else if gogoproto.IsStdInt64(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdInt64(*`, accessor, `)`) - } else if gogoproto.IsStdUInt64(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdUInt64(*`, accessor, `)`) - } else if gogoproto.IsStdInt32(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdInt32(*`, accessor, `)`) - } else if gogoproto.IsStdUInt32(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdUInt32(*`, accessor, `)`) - } else if gogoproto.IsStdBool(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdBool(*`, accessor, `)`) - } else if gogoproto.IsStdString(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdString(*`, accessor, `)`) - } else if gogoproto.IsStdBytes(m.ValueAliasField) { - p.P(`msgSize = `, p.typesPkg.Use(), `.SizeOfStdBytes(*`, accessor, `)`) - } else if protoSizer { - p.P(`msgSize = `, accessor, `.ProtoSize()`) - } else { - p.P(`msgSize = `, accessor, `.Size()`) - } - p.P(`msgSize += `, strconv.Itoa(valueKeySize), ` + sov`+p.localName+`(uint64(msgSize))`) - p.Out() - p.P(`}`) - sum = append(sum, `msgSize`) } - p.P(`mapSize := `, strings.Join(sum, " + ")) - p.callVarint("mapSize") - p.encodeKey(1, wireToType(keywire)) - p.mapField(numGen, field, m.KeyField, "k", protoSizer) + nullableMsg := nullable && (m.ValueField.GetType() == descriptor.FieldDescriptorProto_TYPE_MESSAGE || gogoproto.IsCustomType(field) && m.ValueField.IsBytes()) plainBytes := m.ValueField.IsBytes() && !gogoproto.IsCustomType(field) @@ -871,239 +700,86 @@ } p.In() } - p.encodeKey(2, wireToType(valuewire)) p.mapField(numGen, field, m.ValueAliasField, accessor, protoSizer) + p.encodeKey(2, wireToType(valuewire)) if nullableMsg || plainBytes { p.Out() p.P(`}`) } + + p.mapField(numGen, field, m.KeyField, val, protoSizer) + p.encodeKey(1, wireToType(keywire)) + + p.callVarint(`baseI - i`) + + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if repeated { - p.P(`for _, msg := range m.`, fieldname, ` {`) - p.In() - p.encodeKey(fieldNumber, wireType) - varName := "msg" - if gogoproto.IsStdTime(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdTime(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdTimeMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdDuration(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdDuration(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdDurationMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdDouble(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdDouble(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdDoubleMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdFloat(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdFloat(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdFloatMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdInt64(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdInt64(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdInt64MarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdUInt64(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdUInt64(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdUInt64MarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdInt32(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdInt32(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdInt32MarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdUInt32(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdUInt32(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdUInt32MarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdBool(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdBool(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdBoolMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdString(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdString(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdStringMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdBytes(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName + val := p.reverseListRange(`m.`, fieldname) + sizeOfVarName := val + if gogoproto.IsNullable(field) { + sizeOfVarName = `*` + val + } + if !p.marshalAllSizeOf(field, sizeOfVarName, ``) { + if gogoproto.IsCustomType(field) { + p.forward(val, true, protoSizer) + } else { + p.backward(val, true) } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdBytes(`, varName, `)`) - p.P(`n, err := `, p.typesPkg.Use(), `.StdBytesMarshalTo(`, varName, `, dAtA[i:])`) - } else if protoSizer { - p.callVarint(varName, ".ProtoSize()") - p.P(`n, err := `, varName, `.MarshalTo(dAtA[i:])`) - } else { - p.callVarint(varName, ".Size()") - p.P(`n, err := `, varName, `.MarshalTo(dAtA[i:])`) } - p.P(`if err != nil {`) - p.In() - p.P(`return 0, err`) - p.Out() - p.P(`}`) - p.P(`i+=n`) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else { - p.encodeKey(fieldNumber, wireType) - varName := `m.` + fieldname - if gogoproto.IsStdTime(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdTime(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdTimeMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdDuration(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdDuration(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdDurationMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdDouble(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdDouble(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdDoubleMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdFloat(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdFloat(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdFloatMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdInt64(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdInt64(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdInt64MarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdUInt64(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdUInt64(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdUInt64MarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdInt32(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdInt32(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdInt32MarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdUInt32(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdUInt32(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdUInt32MarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdBool(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdBool(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdBoolMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdString(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName - } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdString(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdStringMarshalTo(`, varName, `, dAtA[i:])`) - } else if gogoproto.IsStdBytes(field) { - if gogoproto.IsNullable(field) { - varName = "*" + varName + sizeOfVarName := `m.` + fieldname + if gogoproto.IsNullable(field) { + sizeOfVarName = `*` + sizeOfVarName + } + if !p.marshalAllSizeOf(field, sizeOfVarName, numGen.Next()) { + if gogoproto.IsCustomType(field) { + p.forward(`m.`+fieldname, true, protoSizer) + } else { + p.backward(`m.`+fieldname, true) } - p.callVarint(p.typesPkg.Use(), `.SizeOfStdBytes(`, varName, `)`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, p.typesPkg.Use(), `.StdBytesMarshalTo(`, varName, `, dAtA[i:])`) - } else if protoSizer { - p.callVarint(varName, `.ProtoSize()`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, varName, `.MarshalTo(dAtA[i:])`) - } else { - p.callVarint(varName, `.Size()`) - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := `, varName, `.MarshalTo(dAtA[i:])`) } - p.P(`if err`, numGen.Current(), ` != nil {`) - p.In() - p.P(`return 0, err`, numGen.Current()) - p.Out() - p.P(`}`) - p.P(`i+=n`, numGen.Current()) + p.encodeKey(fieldNumber, wireType) } case descriptor.FieldDescriptorProto_TYPE_BYTES: if !gogoproto.IsCustomType(field) { if repeated { - p.P(`for _, b := range m.`, fieldname, ` {`) - p.In() + val := p.reverseListRange(`m.`, fieldname) + p.P(`i -= len(`, val, `)`) + p.P(`copy(dAtA[i:], `, val, `)`) + p.callVarint(`len(`, val, `)`) p.encodeKey(fieldNumber, wireType) - p.callVarint("len(b)") - p.P(`i+=copy(dAtA[i:], b)`) p.Out() p.P(`}`) } else if proto3 { p.P(`if len(m.`, fieldname, `) > 0 {`) p.In() - p.encodeKey(fieldNumber, wireType) + p.P(`i -= len(m.`, fieldname, `)`) + p.P(`copy(dAtA[i:], m.`, fieldname, `)`) p.callVarint(`len(m.`, fieldname, `)`) - p.P(`i+=copy(dAtA[i:], m.`, fieldname, `)`) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else { - p.encodeKey(fieldNumber, wireType) + p.P(`i -= len(m.`, fieldname, `)`) + p.P(`copy(dAtA[i:], m.`, fieldname, `)`) p.callVarint(`len(m.`, fieldname, `)`) - p.P(`i+=copy(dAtA[i:], m.`, fieldname, `)`) + p.encodeKey(fieldNumber, wireType) } } else { if repeated { - p.P(`for _, msg := range m.`, fieldname, ` {`) - p.In() + val := p.reverseListRange(`m.`, fieldname) + p.forward(val, true, protoSizer) p.encodeKey(fieldNumber, wireType) - if protoSizer { - p.callVarint(`msg.ProtoSize()`) - } else { - p.callVarint(`msg.Size()`) - } - p.P(`n, err := msg.MarshalTo(dAtA[i:])`) - p.P(`if err != nil {`) - p.In() - p.P(`return 0, err`) - p.Out() - p.P(`}`) - p.P(`i+=n`) p.Out() p.P(`}`) } else { + p.forward(`m.`+fieldname, true, protoSizer) p.encodeKey(fieldNumber, wireType) - if protoSizer { - p.callVarint(`m.`, fieldname, `.ProtoSize()`) - } else { - p.callVarint(`m.`, fieldname, `.Size()`) - } - p.P(`n`, numGen.Next(), `, err`, numGen.Current(), ` := m.`, fieldname, `.MarshalTo(dAtA[i:])`) - p.P(`if err`, numGen.Current(), ` != nil {`) - p.In() - p.P(`return 0, err`, numGen.Current()) - p.Out() - p.P(`}`) - p.P(`i+=n`, numGen.Current()) } } case descriptor.FieldDescriptorProto_TYPE_SINT32: @@ -1127,30 +803,30 @@ p.P(jvar, `++`) p.Out() p.P(`}`) - p.encodeKey(fieldNumber, wireType) + p.P(`i -= `, jvar) + p.P(`copy(dAtA[i:], `, datavar, `[:`, jvar, `])`) p.callVarint(jvar) - p.P(`i+=copy(dAtA[i:], `, datavar, `[:`, jvar, `])`) + p.encodeKey(fieldNumber, wireType) } else if repeated { - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() + val := p.reverseListRange(`m.`, fieldname) + p.P(`x`, numGen.Next(), ` := (uint32(`, val, `) << 1) ^ uint32((`, val, ` >> 31))`) + p.callVarint(`x`, numGen.Current()) p.encodeKey(fieldNumber, wireType) - p.P(`x`, numGen.Next(), ` := (uint32(num) << 1) ^ uint32((num >> 31))`) - p.encodeVarint("x" + numGen.Current()) p.Out() p.P(`}`) } else if proto3 { p.P(`if m.`, fieldname, ` != 0 {`) p.In() - p.encodeKey(fieldNumber, wireType) p.callVarint(`(uint32(m.`, fieldname, `) << 1) ^ uint32((m.`, fieldname, ` >> 31))`) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if !nullable { - p.encodeKey(fieldNumber, wireType) p.callVarint(`(uint32(m.`, fieldname, `) << 1) ^ uint32((m.`, fieldname, ` >> 31))`) - } else { p.encodeKey(fieldNumber, wireType) + } else { p.callVarint(`(uint32(*m.`, fieldname, `) << 1) ^ uint32((*m.`, fieldname, ` >> 31))`) + p.encodeKey(fieldNumber, wireType) } case descriptor.FieldDescriptorProto_TYPE_SINT64: if packed { @@ -1173,30 +849,30 @@ p.P(jvar, `++`) p.Out() p.P(`}`) - p.encodeKey(fieldNumber, wireType) + p.P(`i -= `, jvar) + p.P(`copy(dAtA[i:], `, datavar, `[:`, jvar, `])`) p.callVarint(jvar) - p.P(`i+=copy(dAtA[i:], `, datavar, `[:`, jvar, `])`) + p.encodeKey(fieldNumber, wireType) } else if repeated { - p.P(`for _, num := range m.`, fieldname, ` {`) - p.In() + val := p.reverseListRange(`m.`, fieldname) + p.P(`x`, numGen.Next(), ` := (uint64(`, val, `) << 1) ^ uint64((`, val, ` >> 63))`) + p.callVarint("x" + numGen.Current()) p.encodeKey(fieldNumber, wireType) - p.P(`x`, numGen.Next(), ` := (uint64(num) << 1) ^ uint64((num >> 63))`) - p.encodeVarint("x" + numGen.Current()) p.Out() p.P(`}`) } else if proto3 { p.P(`if m.`, fieldname, ` != 0 {`) p.In() - p.encodeKey(fieldNumber, wireType) p.callVarint(`(uint64(m.`, fieldname, `) << 1) ^ uint64((m.`, fieldname, ` >> 63))`) + p.encodeKey(fieldNumber, wireType) p.Out() p.P(`}`) } else if !nullable { - p.encodeKey(fieldNumber, wireType) p.callVarint(`(uint64(m.`, fieldname, `) << 1) ^ uint64((m.`, fieldname, ` >> 63))`) - } else { p.encodeKey(fieldNumber, wireType) + } else { p.callVarint(`(uint64(*m.`, fieldname, `) << 1) ^ uint64((*m.`, fieldname, ` >> 63))`) + p.encodeKey(fieldNumber, wireType) } default: panic("not implemented") @@ -1243,7 +919,7 @@ p.P(`size := m.Size()`) } p.P(`dAtA = make([]byte, size)`) - p.P(`n, err := m.MarshalTo(dAtA)`) + p.P(`n, err := m.MarshalToSizedBuffer(dAtA[:size])`) p.P(`if err != nil {`) p.In() p.P(`return nil, err`) @@ -1255,14 +931,54 @@ p.P(``) p.P(`func (m *`, ccTypeName, `) MarshalTo(dAtA []byte) (int, error) {`) p.In() - p.P(`var i int`) + if gogoproto.IsProtoSizer(file.FileDescriptorProto, message.DescriptorProto) { + p.P(`size := m.ProtoSize()`) + } else { + p.P(`size := m.Size()`) + } + p.P(`return m.MarshalToSizedBuffer(dAtA[:size])`) + p.Out() + p.P(`}`) + p.P(``) + p.P(`func (m *`, ccTypeName, `) MarshalToSizedBuffer(dAtA []byte) (int, error) {`) + p.In() + p.P(`i := len(dAtA)`) p.P(`_ = i`) p.P(`var l int`) p.P(`_ = l`) + if gogoproto.HasUnrecognized(file.FileDescriptorProto, message.DescriptorProto) { + p.P(`if m.XXX_unrecognized != nil {`) + p.In() + p.P(`i -= len(m.XXX_unrecognized)`) + p.P(`copy(dAtA[i:], m.XXX_unrecognized)`) + p.Out() + p.P(`}`) + } + if message.DescriptorProto.HasExtension() { + if gogoproto.HasExtensionsMap(file.FileDescriptorProto, message.DescriptorProto) { + p.P(`if n, err := `, p.protoPkg.Use(), `.EncodeInternalExtensionBackwards(m, dAtA[:i]); err != nil {`) + p.In() + p.P(`return 0, err`) + p.Out() + p.P(`} else {`) + p.In() + p.P(`i -= n`) + p.Out() + p.P(`}`) + } else { + p.P(`if m.XXX_extensions != nil {`) + p.In() + p.P(`i -= len(m.XXX_extensions)`) + p.P(`copy(dAtA[i:], m.XXX_extensions)`) + p.Out() + p.P(`}`) + } + } fields := orderFields(message.GetField()) sort.Sort(fields) oneofs := make(map[string]struct{}) - for _, field := range message.Field { + for i := len(message.Field) - 1; i >= 0; i-- { + field := message.Field[i] oneof := field.OneofIndex != nil if !oneof { proto3 := gogoproto.IsProto3(file.FileDescriptorProto) @@ -1273,44 +989,13 @@ oneofs[fieldname] = struct{}{} p.P(`if m.`, fieldname, ` != nil {`) p.In() - p.P(`nn`, numGen.Next(), `, err`, numGen.Current(), ` := m.`, fieldname, `.MarshalTo(dAtA[i:])`) - p.P(`if err`, numGen.Current(), ` != nil {`) - p.In() - p.P(`return 0, err`, numGen.Current()) - p.Out() - p.P(`}`) - p.P(`i+=nn`, numGen.Current()) + p.forward(`m.`+fieldname, false, gogoproto.IsProtoSizer(file.FileDescriptorProto, message.DescriptorProto)) p.Out() p.P(`}`) } } } - if message.DescriptorProto.HasExtension() { - if gogoproto.HasExtensionsMap(file.FileDescriptorProto, message.DescriptorProto) { - p.P(`n, err := `, p.protoPkg.Use(), `.EncodeInternalExtension(m, dAtA[i:])`) - p.P(`if err != nil {`) - p.In() - p.P(`return 0, err`) - p.Out() - p.P(`}`) - p.P(`i+=n`) - } else { - p.P(`if m.XXX_extensions != nil {`) - p.In() - p.P(`i+=copy(dAtA[i:], m.XXX_extensions)`) - p.Out() - p.P(`}`) - } - } - if gogoproto.HasUnrecognized(file.FileDescriptorProto, message.DescriptorProto) { - p.P(`if m.XXX_unrecognized != nil {`) - p.In() - p.P(`i+=copy(dAtA[i:], m.XXX_unrecognized)`) - p.Out() - p.P(`}`) - } - - p.P(`return i, nil`) + p.P(`return len(dAtA) - i, nil`) p.Out() p.P(`}`) p.P() @@ -1325,10 +1010,21 @@ ccTypeName := p.OneOfTypeName(message, field) p.P(`func (m *`, ccTypeName, `) MarshalTo(dAtA []byte) (int, error) {`) p.In() - p.P(`i := 0`) + if gogoproto.IsProtoSizer(file.FileDescriptorProto, message.DescriptorProto) { + p.P(`size := m.ProtoSize()`) + } else { + p.P(`size := m.Size()`) + } + p.P(`return m.MarshalToSizedBuffer(dAtA[:size])`) + p.Out() + p.P(`}`) + p.P(``) + p.P(`func (m *`, ccTypeName, `) MarshalToSizedBuffer(dAtA []byte) (int, error) {`) + p.In() + p.P(`i := len(dAtA)`) vanity.TurnOffNullableForNativeTypes(field) p.generateField(false, numGen, file, message, field) - p.P(`return i, nil`) + p.P(`return len(dAtA) - i, nil`) p.Out() p.P(`}`) } @@ -1337,6 +1033,8 @@ if p.atleastOne { p.P(`func encodeVarint`, p.localName, `(dAtA []byte, offset int, v uint64) int {`) p.In() + p.P(`offset -= sov`, p.localName, `(v)`) + p.P(`base := offset`) p.P(`for v >= 1<<7 {`) p.In() p.P(`dAtA[offset] = uint8(v&0x7f|0x80)`) @@ -1345,13 +1043,98 @@ p.Out() p.P(`}`) p.P(`dAtA[offset] = uint8(v)`) - p.P(`return offset+1`) + p.P(`return base`) p.Out() p.P(`}`) } } +func (p *marshalto) reverseListRange(expression ...string) string { + exp := strings.Join(expression, "") + p.P(`for iNdEx := len(`, exp, `) - 1; iNdEx >= 0; iNdEx-- {`) + p.In() + return exp + `[iNdEx]` +} + +func (p *marshalto) marshalAllSizeOf(field *descriptor.FieldDescriptorProto, varName, num string) bool { + if gogoproto.IsStdTime(field) { + p.marshalSizeOf(`StdTimeMarshalTo`, `SizeOfStdTime`, varName, num) + } else if gogoproto.IsStdDuration(field) { + p.marshalSizeOf(`StdDurationMarshalTo`, `SizeOfStdDuration`, varName, num) + } else if gogoproto.IsStdDouble(field) { + p.marshalSizeOf(`StdDoubleMarshalTo`, `SizeOfStdDouble`, varName, num) + } else if gogoproto.IsStdFloat(field) { + p.marshalSizeOf(`StdFloatMarshalTo`, `SizeOfStdFloat`, varName, num) + } else if gogoproto.IsStdInt64(field) { + p.marshalSizeOf(`StdInt64MarshalTo`, `SizeOfStdInt64`, varName, num) + } else if gogoproto.IsStdUInt64(field) { + p.marshalSizeOf(`StdUInt64MarshalTo`, `SizeOfStdUInt64`, varName, num) + } else if gogoproto.IsStdInt32(field) { + p.marshalSizeOf(`StdInt32MarshalTo`, `SizeOfStdInt32`, varName, num) + } else if gogoproto.IsStdUInt32(field) { + p.marshalSizeOf(`StdUInt32MarshalTo`, `SizeOfStdUInt32`, varName, num) + } else if gogoproto.IsStdBool(field) { + p.marshalSizeOf(`StdBoolMarshalTo`, `SizeOfStdBool`, varName, num) + } else if gogoproto.IsStdString(field) { + p.marshalSizeOf(`StdStringMarshalTo`, `SizeOfStdString`, varName, num) + } else if gogoproto.IsStdBytes(field) { + p.marshalSizeOf(`StdBytesMarshalTo`, `SizeOfStdBytes`, varName, num) + } else { + return false + } + return true +} + +func (p *marshalto) marshalSizeOf(marshal, size, varName, num string) { + p.P(`n`, num, `, err`, num, ` := `, p.typesPkg.Use(), `.`, marshal, `(`, varName, `, dAtA[i-`, p.typesPkg.Use(), `.`, size, `(`, varName, `):])`) + p.P(`if err`, num, ` != nil {`) + p.In() + p.P(`return 0, err`, num) + p.Out() + p.P(`}`) + p.P(`i -= n`, num) + p.callVarint(`n`, num) +} + +func (p *marshalto) backward(varName string, varInt bool) { + p.P(`{`) + p.In() + p.P(`size, err := `, varName, `.MarshalToSizedBuffer(dAtA[:i])`) + p.P(`if err != nil {`) + p.In() + p.P(`return 0, err`) + p.Out() + p.P(`}`) + p.P(`i -= size`) + if varInt { + p.callVarint(`size`) + } + p.Out() + p.P(`}`) +} + +func (p *marshalto) forward(varName string, varInt, protoSizer bool) { + p.P(`{`) + p.In() + if protoSizer { + p.P(`size := `, varName, `.ProtoSize()`) + } else { + p.P(`size := `, varName, `.Size()`) + } + p.P(`i -= size`) + p.P(`if _, err := `, varName, `.MarshalTo(dAtA[i:]); err != nil {`) + p.In() + p.P(`return 0, err`) + p.Out() + p.P(`}`) + p.Out() + if varInt { + p.callVarint(`size`) + } + p.P(`}`) +} + func init() { generator.RegisterPlugin(NewMarshal()) } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/plugin/populate/populate.go golang-gogoprotobuf-1.3.1/plugin/populate/populate.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/plugin/populate/populate.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/plugin/populate/populate.go 2020-05-17 12:22:58.000000000 +0000 @@ -584,9 +584,9 @@ p.GenerateField(file, message, field) } else { if loopLevels[fieldIndex] > 0 { - p.P(`if r.Intn(10) == 0 {`) + p.P(`if r.Intn(5) == 0 {`) } else { - p.P(`if r.Intn(10) != 0 {`) + p.P(`if r.Intn(5) != 0 {`) } p.In() p.GenerateField(file, message, field) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/plugin/unmarshal/unmarshal.go golang-gogoprotobuf-1.3.1/plugin/unmarshal/unmarshal.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/plugin/unmarshal/unmarshal.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/plugin/unmarshal/unmarshal.go 2020-05-17 12:22:58.000000000 +0000 @@ -1578,6 +1578,7 @@ p.P(`func skip` + p.localName + `(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1609,10 +1610,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1633,57 +1632,32 @@ return 0, ErrInvalidLength` + p.localName + ` } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLength` + p.localName + ` - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflow` + p.localName + ` - } - if iNdEx >= l { - return 0, ` + p.ioPkg.Use() + `.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skip` + p.localName + `(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLength` + p.localName + ` - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroup` + p.localName + ` + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, ` + fmtPkg.Use() + `.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLength` + p.localName + ` + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, ` + p.ioPkg.Use() + `.ErrUnexpectedEOF } var ( ErrInvalidLength` + p.localName + ` = ` + fmtPkg.Use() + `.Errorf("proto: negative length found during unmarshaling") ErrIntOverflow` + p.localName + ` = ` + fmtPkg.Use() + `.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroup` + p.localName + ` = ` + fmtPkg.Use() + `.Errorf("proto: unexpected end of group") ) `) } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/all_test.go golang-gogoprotobuf-1.3.1/proto/all_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/all_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/all_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -45,9 +45,11 @@ "testing" "time" + "github.com/gogo/protobuf/jsonpb" . "github.com/gogo/protobuf/proto" pb3 "github.com/gogo/protobuf/proto/proto3_proto" . "github.com/gogo/protobuf/proto/test_proto" + descriptorpb "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" ) var globalO *Buffer @@ -2509,3 +2511,33 @@ p2.Unmarshal(pbd) } } + +// TestRace tests whether there are races among the different marshalers. +func TestRace(t *testing.T) { + m := &descriptorpb.FileDescriptorProto{ + Options: &descriptorpb.FileOptions{ + GoPackage: String("path/to/my/package"), + }, + } + + wg := &sync.WaitGroup{} + defer wg.Wait() + + wg.Add(1) + go func() { + defer wg.Done() + Marshal(m) + }() + + wg.Add(1) + go func() { + defer wg.Done() + (&jsonpb.Marshaler{}).MarshalToString(m) + }() + + wg.Add(1) + go func() { + defer wg.Done() + _ = m.String() + }() +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/encode.go golang-gogoprotobuf-1.3.1/proto/encode.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/encode.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/encode.go 2020-05-17 12:22:58.000000000 +0000 @@ -189,6 +189,8 @@ // prefixed by a varint-encoded length. func (p *Buffer) EncodeMessage(pb Message) error { siz := Size(pb) + sizVar := SizeVarint(uint64(siz)) + p.grow(siz + sizVar) p.EncodeVarint(uint64(siz)) return p.Marshal(pb) } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/extensions_gogo.go golang-gogoprotobuf-1.3.1/proto/extensions_gogo.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/extensions_gogo.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/extensions_gogo.go 2020-05-17 12:22:58.000000000 +0000 @@ -154,6 +154,10 @@ return EncodeExtensionMap(m.extensionsWrite(), data) } +func EncodeInternalExtensionBackwards(m extendableProto, data []byte) (n int, err error) { + return EncodeExtensionMapBackwards(m.extensionsWrite(), data) +} + func EncodeExtensionMap(m map[int32]Extension, data []byte) (n int, err error) { o := 0 for _, e := range m { @@ -167,6 +171,23 @@ o += n } return o, nil +} + +func EncodeExtensionMapBackwards(m map[int32]Extension, data []byte) (n int, err error) { + o := 0 + end := len(data) + for _, e := range m { + if err := e.Encode(); err != nil { + return 0, err + } + n := copy(data[end-len(e.enc):], e.enc) + if n != len(e.enc) { + return 0, io.ErrShortBuffer + } + end -= n + o += n + } + return o, nil } func GetRawExtension(m map[int32]Extension, id int32) ([]byte, error) { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/lib.go golang-gogoprotobuf-1.3.1/proto/lib.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/lib.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/lib.go 2020-05-17 12:22:58.000000000 +0000 @@ -948,13 +948,19 @@ return false } -// ProtoPackageIsVersion2 is referenced from generated protocol buffer files -// to assert that that code is compatible with this version of the proto package. -const GoGoProtoPackageIsVersion2 = true +const ( + // ProtoPackageIsVersion3 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + GoGoProtoPackageIsVersion3 = true -// ProtoPackageIsVersion1 is referenced from generated protocol buffer files -// to assert that that code is compatible with this version of the proto package. -const GoGoProtoPackageIsVersion1 = true + // ProtoPackageIsVersion2 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + GoGoProtoPackageIsVersion2 = true + + // ProtoPackageIsVersion1 is referenced from generated protocol buffer files + // to assert that that code is compatible with this version of the proto package. + GoGoProtoPackageIsVersion1 = true +) // InternalMessageInfo is a type used internally by generated .pb.go files. // This type is not intended to be used by non-generated code. diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/properties.go golang-gogoprotobuf-1.3.1/proto/properties.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/properties.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/properties.go 2020-05-17 12:22:58.000000000 +0000 @@ -43,7 +43,6 @@ import ( "fmt" "log" - "os" "reflect" "sort" "strconv" @@ -205,7 +204,7 @@ // "bytes,49,opt,name=foo,def=hello!" fields := strings.Split(s, ",") // breaks def=, but handled below. if len(fields) < 2 { - fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s) + log.Printf("proto: tag has too few fields: %q", s) return } @@ -225,7 +224,7 @@ p.WireType = WireBytes // no numeric converter for non-numeric types default: - fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s) + log.Printf("proto: tag has unknown wire type: %q", s) return } @@ -400,6 +399,15 @@ return sprop } +type ( + oneofFuncsIface interface { + XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{}) + } + oneofWrappersIface interface { + XXX_OneofWrappers() []interface{} + } +) + // getPropertiesLocked requires that propertiesMu is held. func getPropertiesLocked(t reflect.Type) *StructProperties { if prop, ok := propertiesMap[t]; ok { @@ -441,37 +449,40 @@ // Re-order prop.order. sort.Sort(prop) - type oneofMessage interface { - XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{}) - } - if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); isOneofMessage && ok { + if isOneofMessage { var oots []interface{} - _, _, _, oots = om.XXX_OneofFuncs() - - // Interpret oneof metadata. - prop.OneofTypes = make(map[string]*OneofProperties) - for _, oot := range oots { - oop := &OneofProperties{ - Type: reflect.ValueOf(oot).Type(), // *T - Prop: new(Properties), - } - sft := oop.Type.Elem().Field(0) - oop.Prop.Name = sft.Name - oop.Prop.Parse(sft.Tag.Get("protobuf")) - // There will be exactly one interface field that - // this new value is assignable to. - for i := 0; i < t.NumField(); i++ { - f := t.Field(i) - if f.Type.Kind() != reflect.Interface { - continue + switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) { + case oneofFuncsIface: + _, _, _, oots = m.XXX_OneofFuncs() + case oneofWrappersIface: + oots = m.XXX_OneofWrappers() + } + if len(oots) > 0 { + // Interpret oneof metadata. + prop.OneofTypes = make(map[string]*OneofProperties) + for _, oot := range oots { + oop := &OneofProperties{ + Type: reflect.ValueOf(oot).Type(), // *T + Prop: new(Properties), } - if !oop.Type.AssignableTo(f.Type) { - continue + sft := oop.Type.Elem().Field(0) + oop.Prop.Name = sft.Name + oop.Prop.Parse(sft.Tag.Get("protobuf")) + // There will be exactly one interface field that + // this new value is assignable to. + for i := 0; i < t.NumField(); i++ { + f := t.Field(i) + if f.Type.Kind() != reflect.Interface { + continue + } + if !oop.Type.AssignableTo(f.Type) { + continue + } + oop.Field = i + break } - oop.Field = i - break + prop.OneofTypes[oop.Prop.OrigName] = oop } - prop.OneofTypes[oop.Prop.OrigName] = oop } } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/proto3_proto/proto3.pb.go golang-gogoprotobuf-1.3.1/proto/proto3_proto/proto3.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/proto3_proto/proto3.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/proto3_proto/proto3.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Message_Humour int32 @@ -437,7 +437,7 @@ } type TestUTF8_Field struct { - Field string `protobuf:"bytes,3,opt,name=field,proto3,oneof"` + Field string `protobuf:"bytes,3,opt,name=field,proto3,oneof" json:"field,omitempty"` } func (*TestUTF8_Field) isTestUTF8_Oneof() {} @@ -484,57 +484,13 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*TestUTF8) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _TestUTF8_OneofMarshaler, _TestUTF8_OneofUnmarshaler, _TestUTF8_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TestUTF8) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*TestUTF8_Field)(nil), } } -func _TestUTF8_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*TestUTF8) - // oneof - switch x := m.Oneof.(type) { - case *TestUTF8_Field: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field) - case nil: - default: - return fmt.Errorf("TestUTF8.Oneof has unexpected type %T", x) - } - return nil -} - -func _TestUTF8_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*TestUTF8) - switch tag { - case 3: // oneof.field - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Oneof = &TestUTF8_Field{x} - return true, err - default: - return false, nil - } -} - -func _TestUTF8_OneofSizer(msg proto.Message) (n int) { - m := msg.(*TestUTF8) - // oneof - switch x := m.Oneof.(type) { - case *TestUTF8_Field: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field))) - n += len(x.Field) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterEnum("proto3_proto.Message_Humour", Message_Humour_name, Message_Humour_value) proto.RegisterType((*Message)(nil), "proto3_proto.Message") diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/table_marshal.go golang-gogoprotobuf-1.3.1/proto/table_marshal.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/table_marshal.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/table_marshal.go 2020-05-17 12:22:58.000000000 +0000 @@ -389,8 +389,13 @@ // get oneof implementers var oneofImplementers []interface{} // gogo: isOneofMessage is needed for embedded oneof messages, without a marshaler and unmarshaler - if m, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok && isOneofMessage { - _, _, _, oneofImplementers = m.XXX_OneofFuncs() + if isOneofMessage { + switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) { + case oneofFuncsIface: + _, _, _, oneofImplementers = m.XXX_OneofFuncs() + case oneofWrappersIface: + oneofImplementers = m.XXX_OneofWrappers() + } } // normal fields @@ -519,10 +524,6 @@ } } -type oneofMessage interface { - XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{}) -} - // wiretype returns the wire encoding of the type. func wiretype(encoding string) uint64 { switch encoding { @@ -2968,7 +2969,9 @@ if m, ok := pb.(newMarshaler); ok { siz := m.XXX_Size() p.grow(siz) // make sure buf has enough capacity - p.buf, err = m.XXX_Marshal(p.buf, p.deterministic) + pp := p.buf[len(p.buf) : len(p.buf) : len(p.buf)+siz] + pp, err = m.XXX_Marshal(pp, p.deterministic) + p.buf = append(p.buf, pp...) return err } if m, ok := pb.(Marshaler); ok { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/table_merge.go golang-gogoprotobuf-1.3.1/proto/table_merge.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/table_merge.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/table_merge.go 2020-05-17 12:22:58.000000000 +0000 @@ -530,6 +530,25 @@ } case reflect.Struct: switch { + case isSlice && !isPointer: // E.g. []pb.T + mergeInfo := getMergeInfo(tf) + zero := reflect.Zero(tf) + mfi.merge = func(dst, src pointer) { + // TODO: Make this faster? + dstsp := dst.asPointerTo(f.Type) + dsts := dstsp.Elem() + srcs := src.asPointerTo(f.Type).Elem() + for i := 0; i < srcs.Len(); i++ { + dsts = reflect.Append(dsts, zero) + srcElement := srcs.Index(i).Addr() + dstElement := dsts.Index(dsts.Len() - 1).Addr() + mergeInfo.merge(valToPointer(dstElement), valToPointer(srcElement)) + } + if dsts.IsNil() { + dsts = reflect.MakeSlice(f.Type, 0, 0) + } + dstsp.Elem().Set(dsts) + } case !isPointer: mergeInfo := getMergeInfo(tf) mfi.merge = func(dst, src pointer) { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/table_unmarshal.go golang-gogoprotobuf-1.3.1/proto/table_unmarshal.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/table_unmarshal.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/table_unmarshal.go 2020-05-17 12:22:58.000000000 +0000 @@ -371,15 +371,18 @@ } // Find any types associated with oneof fields. - // TODO: XXX_OneofFuncs returns more info than we need. Get rid of some of it? - fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("XXX_OneofFuncs") // gogo: len(oneofFields) > 0 is needed for embedded oneof messages, without a marshaler and unmarshaler - if fn.IsValid() && len(oneofFields) > 0 { - res := fn.Call(nil)[3] // last return value from XXX_OneofFuncs: []interface{} - for i := res.Len() - 1; i >= 0; i-- { - v := res.Index(i) // interface{} - tptr := reflect.ValueOf(v.Interface()).Type() // *Msg_X - typ := tptr.Elem() // Msg_X + if len(oneofFields) > 0 { + var oneofImplementers []interface{} + switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) { + case oneofFuncsIface: + _, _, _, oneofImplementers = m.XXX_OneofFuncs() + case oneofWrappersIface: + oneofImplementers = m.XXX_OneofWrappers() + } + for _, v := range oneofImplementers { + tptr := reflect.TypeOf(v) // *Msg_X + typ := tptr.Elem() // Msg_X f := typ.Field(0) // oneof implementers have one field baseUnmarshal := fieldUnmarshaler(&f) @@ -407,11 +410,12 @@ u.setTag(fieldNum, of.field, unmarshal, 0, name) } } + } } // Get extension ranges, if any. - fn = reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray") + fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray") if fn.IsValid() { if !u.extensions.IsValid() && !u.oldExtensions.IsValid() && !u.bytesExtensions.IsValid() { panic("a message with extensions, but no extensions field in " + t.Name()) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/test_proto/test.pb.go golang-gogoprotobuf-1.3.1/proto/test_proto/test.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/test_proto/test.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/test_proto/test.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type FOO int32 @@ -3111,58 +3111,58 @@ } type Oneof_F_Bool struct { - F_Bool bool `protobuf:"varint,1,opt,name=F_Bool,json=FBool,oneof"` + F_Bool bool `protobuf:"varint,1,opt,name=F_Bool,json=FBool,oneof" json:"F_Bool,omitempty"` } type Oneof_F_Int32 struct { - F_Int32 int32 `protobuf:"varint,2,opt,name=F_Int32,json=FInt32,oneof"` + F_Int32 int32 `protobuf:"varint,2,opt,name=F_Int32,json=FInt32,oneof" json:"F_Int32,omitempty"` } type Oneof_F_Int64 struct { - F_Int64 int64 `protobuf:"varint,3,opt,name=F_Int64,json=FInt64,oneof"` + F_Int64 int64 `protobuf:"varint,3,opt,name=F_Int64,json=FInt64,oneof" json:"F_Int64,omitempty"` } type Oneof_F_Fixed32 struct { - F_Fixed32 uint32 `protobuf:"fixed32,4,opt,name=F_Fixed32,json=FFixed32,oneof"` + F_Fixed32 uint32 `protobuf:"fixed32,4,opt,name=F_Fixed32,json=FFixed32,oneof" json:"F_Fixed32,omitempty"` } type Oneof_F_Fixed64 struct { - F_Fixed64 uint64 `protobuf:"fixed64,5,opt,name=F_Fixed64,json=FFixed64,oneof"` + F_Fixed64 uint64 `protobuf:"fixed64,5,opt,name=F_Fixed64,json=FFixed64,oneof" json:"F_Fixed64,omitempty"` } type Oneof_F_Uint32 struct { - F_Uint32 uint32 `protobuf:"varint,6,opt,name=F_Uint32,json=FUint32,oneof"` + F_Uint32 uint32 `protobuf:"varint,6,opt,name=F_Uint32,json=FUint32,oneof" json:"F_Uint32,omitempty"` } type Oneof_F_Uint64 struct { - F_Uint64 uint64 `protobuf:"varint,7,opt,name=F_Uint64,json=FUint64,oneof"` + F_Uint64 uint64 `protobuf:"varint,7,opt,name=F_Uint64,json=FUint64,oneof" json:"F_Uint64,omitempty"` } type Oneof_F_Float struct { - F_Float float32 `protobuf:"fixed32,8,opt,name=F_Float,json=FFloat,oneof"` + F_Float float32 `protobuf:"fixed32,8,opt,name=F_Float,json=FFloat,oneof" json:"F_Float,omitempty"` } type Oneof_F_Double struct { - F_Double float64 `protobuf:"fixed64,9,opt,name=F_Double,json=FDouble,oneof"` + F_Double float64 `protobuf:"fixed64,9,opt,name=F_Double,json=FDouble,oneof" json:"F_Double,omitempty"` } type Oneof_F_String struct { - F_String string `protobuf:"bytes,10,opt,name=F_String,json=FString,oneof"` + F_String string `protobuf:"bytes,10,opt,name=F_String,json=FString,oneof" json:"F_String,omitempty"` } type Oneof_F_Bytes struct { - F_Bytes []byte `protobuf:"bytes,11,opt,name=F_Bytes,json=FBytes,oneof"` + F_Bytes []byte `protobuf:"bytes,11,opt,name=F_Bytes,json=FBytes,oneof" json:"F_Bytes,omitempty"` } type Oneof_F_Sint32 struct { - F_Sint32 int32 `protobuf:"zigzag32,12,opt,name=F_Sint32,json=FSint32,oneof"` + F_Sint32 int32 `protobuf:"zigzag32,12,opt,name=F_Sint32,json=FSint32,oneof" json:"F_Sint32,omitempty"` } type Oneof_F_Sint64 struct { - F_Sint64 int64 `protobuf:"zigzag64,13,opt,name=F_Sint64,json=FSint64,oneof"` + F_Sint64 int64 `protobuf:"zigzag64,13,opt,name=F_Sint64,json=FSint64,oneof" json:"F_Sint64,omitempty"` } type Oneof_F_Enum struct { - F_Enum MyMessage_Color `protobuf:"varint,14,opt,name=F_Enum,json=FEnum,enum=test_proto.MyMessage_Color,oneof"` + F_Enum MyMessage_Color `protobuf:"varint,14,opt,name=F_Enum,json=FEnum,enum=test_proto.MyMessage_Color,oneof" json:"F_Enum,omitempty"` } type Oneof_F_Message struct { - F_Message *GoTestField `protobuf:"bytes,15,opt,name=F_Message,json=FMessage,oneof"` + F_Message *GoTestField `protobuf:"bytes,15,opt,name=F_Message,json=FMessage,oneof" json:"F_Message,omitempty"` } type Oneof_FGroup struct { - FGroup *Oneof_F_Group `protobuf:"group,16,opt,name=F_Group,json=fGroup,oneof"` + FGroup *Oneof_F_Group `protobuf:"group,16,opt,name=F_Group,json=fGroup,oneof" json:"f_group,omitempty"` } type Oneof_F_Largest_Tag struct { - F_Largest_Tag int32 `protobuf:"varint,536870911,opt,name=F_Largest_Tag,json=FLargestTag,oneof"` + F_Largest_Tag int32 `protobuf:"varint,536870911,opt,name=F_Largest_Tag,json=FLargestTag,oneof" json:"F_Largest_Tag,omitempty"` } type Oneof_Value struct { - Value int32 `protobuf:"varint,100,opt,name=value,oneof"` + Value int32 `protobuf:"varint,100,opt,name=value,oneof" json:"value,omitempty"` } func (*Oneof_F_Bool) isOneof_Union() {} @@ -3323,9 +3323,9 @@ return 0 } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Oneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Oneof_OneofMarshaler, _Oneof_OneofUnmarshaler, _Oneof_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Oneof) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Oneof_F_Bool)(nil), (*Oneof_F_Int32)(nil), (*Oneof_F_Int64)(nil), @@ -3347,298 +3347,6 @@ } } -func _Oneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Oneof) - // union - switch x := m.Union.(type) { - case *Oneof_F_Bool: - t := uint64(0) - if x.F_Bool { - t = 1 - } - _ = b.EncodeVarint(1<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *Oneof_F_Int32: - _ = b.EncodeVarint(2<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.F_Int32)) - case *Oneof_F_Int64: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.F_Int64)) - case *Oneof_F_Fixed32: - _ = b.EncodeVarint(4<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.F_Fixed32)) - case *Oneof_F_Fixed64: - _ = b.EncodeVarint(5<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.F_Fixed64)) - case *Oneof_F_Uint32: - _ = b.EncodeVarint(6<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.F_Uint32)) - case *Oneof_F_Uint64: - _ = b.EncodeVarint(7<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.F_Uint64)) - case *Oneof_F_Float: - _ = b.EncodeVarint(8<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.F_Float))) - case *Oneof_F_Double: - _ = b.EncodeVarint(9<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.F_Double)) - case *Oneof_F_String: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.F_String) - case *Oneof_F_Bytes: - _ = b.EncodeVarint(11<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.F_Bytes) - case *Oneof_F_Sint32: - _ = b.EncodeVarint(12<<3 | proto.WireVarint) - _ = b.EncodeZigzag32(uint64(x.F_Sint32)) - case *Oneof_F_Sint64: - _ = b.EncodeVarint(13<<3 | proto.WireVarint) - _ = b.EncodeZigzag64(uint64(x.F_Sint64)) - case *Oneof_F_Enum: - _ = b.EncodeVarint(14<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.F_Enum)) - case *Oneof_F_Message: - _ = b.EncodeVarint(15<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.F_Message); err != nil { - return err - } - case *Oneof_FGroup: - _ = b.EncodeVarint(16<<3 | proto.WireStartGroup) - if err := b.Marshal(x.FGroup); err != nil { - return err - } - _ = b.EncodeVarint(16<<3 | proto.WireEndGroup) - case *Oneof_F_Largest_Tag: - _ = b.EncodeVarint(536870911<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.F_Largest_Tag)) - case nil: - default: - return fmt.Errorf("Oneof.Union has unexpected type %T", x) - } - // tormato - switch x := m.Tormato.(type) { - case *Oneof_Value: - _ = b.EncodeVarint(100<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Value)) - case nil: - default: - return fmt.Errorf("Oneof.Tormato has unexpected type %T", x) - } - return nil -} - -func _Oneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Oneof) - switch tag { - case 1: // union.F_Bool - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Oneof_F_Bool{x != 0} - return true, err - case 2: // union.F_Int32 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Oneof_F_Int32{int32(x)} - return true, err - case 3: // union.F_Int64 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Oneof_F_Int64{int64(x)} - return true, err - case 4: // union.F_Fixed32 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.Union = &Oneof_F_Fixed32{uint32(x)} - return true, err - case 5: // union.F_Fixed64 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.Union = &Oneof_F_Fixed64{x} - return true, err - case 6: // union.F_Uint32 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Oneof_F_Uint32{uint32(x)} - return true, err - case 7: // union.F_Uint64 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Oneof_F_Uint64{x} - return true, err - case 8: // union.F_Float - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.Union = &Oneof_F_Float{math.Float32frombits(uint32(x))} - return true, err - case 9: // union.F_Double - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.Union = &Oneof_F_Double{math.Float64frombits(x)} - return true, err - case 10: // union.F_String - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Union = &Oneof_F_String{x} - return true, err - case 11: // union.F_Bytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.Union = &Oneof_F_Bytes{x} - return true, err - case 12: // union.F_Sint32 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag32() - m.Union = &Oneof_F_Sint32{int32(x)} - return true, err - case 13: // union.F_Sint64 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag64() - m.Union = &Oneof_F_Sint64{int64(x)} - return true, err - case 14: // union.F_Enum - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Oneof_F_Enum{MyMessage_Color(x)} - return true, err - case 15: // union.F_Message - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(GoTestField) - err := b.DecodeMessage(msg) - m.Union = &Oneof_F_Message{msg} - return true, err - case 16: // union.f_group - if wire != proto.WireStartGroup { - return true, proto.ErrInternalBadWireType - } - msg := new(Oneof_F_Group) - err := b.DecodeGroup(msg) - m.Union = &Oneof_FGroup{msg} - return true, err - case 536870911: // union.F_Largest_Tag - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Oneof_F_Largest_Tag{int32(x)} - return true, err - case 100: // tormato.value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Tormato = &Oneof_Value{int32(x)} - return true, err - default: - return false, nil - } -} - -func _Oneof_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Oneof) - // union - switch x := m.Union.(type) { - case *Oneof_F_Bool: - n += 1 // tag and wire - n += 1 - case *Oneof_F_Int32: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.F_Int32)) - case *Oneof_F_Int64: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.F_Int64)) - case *Oneof_F_Fixed32: - n += 1 // tag and wire - n += 4 - case *Oneof_F_Fixed64: - n += 1 // tag and wire - n += 8 - case *Oneof_F_Uint32: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.F_Uint32)) - case *Oneof_F_Uint64: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.F_Uint64)) - case *Oneof_F_Float: - n += 1 // tag and wire - n += 4 - case *Oneof_F_Double: - n += 1 // tag and wire - n += 8 - case *Oneof_F_String: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.F_String))) - n += len(x.F_String) - case *Oneof_F_Bytes: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.F_Bytes))) - n += len(x.F_Bytes) - case *Oneof_F_Sint32: - n += 1 // tag and wire - n += proto.SizeVarint(uint64((uint32(x.F_Sint32) << 1) ^ uint32((int32(x.F_Sint32) >> 31)))) - case *Oneof_F_Sint64: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(uint64(x.F_Sint64<<1) ^ uint64((int64(x.F_Sint64) >> 63)))) - case *Oneof_F_Enum: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.F_Enum)) - case *Oneof_F_Message: - s := proto.Size(x.F_Message) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Oneof_FGroup: - n += 2 // tag and wire - n += proto.Size(x.FGroup) - n += 2 // tag and wire - case *Oneof_F_Largest_Tag: - n += 5 // tag and wire - n += proto.SizeVarint(uint64(x.F_Largest_Tag)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - // tormato - switch x := m.Tormato.(type) { - case *Oneof_Value: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.Value)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type Oneof_F_Group struct { X *int32 `protobuf:"varint,17,opt,name=x" json:"x,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -3723,22 +3431,22 @@ } type Communique_Number struct { - Number int32 `protobuf:"varint,5,opt,name=number,oneof"` + Number int32 `protobuf:"varint,5,opt,name=number,oneof" json:"number,omitempty"` } type Communique_Name struct { - Name string `protobuf:"bytes,6,opt,name=name,oneof"` + Name string `protobuf:"bytes,6,opt,name=name,oneof" json:"name,omitempty"` } type Communique_Data struct { - Data []byte `protobuf:"bytes,7,opt,name=data,oneof"` + Data []byte `protobuf:"bytes,7,opt,name=data,oneof" json:"data,omitempty"` } type Communique_TempC struct { - TempC float64 `protobuf:"fixed64,8,opt,name=temp_c,json=tempC,oneof"` + TempC float64 `protobuf:"fixed64,8,opt,name=temp_c,json=tempC,oneof" json:"temp_c,omitempty"` } type Communique_Col struct { - Col MyMessage_Color `protobuf:"varint,9,opt,name=col,enum=test_proto.MyMessage_Color,oneof"` + Col MyMessage_Color `protobuf:"varint,9,opt,name=col,enum=test_proto.MyMessage_Color,oneof" json:"col,omitempty"` } type Communique_Msg struct { - Msg *Strings `protobuf:"bytes,10,opt,name=msg,oneof"` + Msg *Strings `protobuf:"bytes,10,opt,name=msg,oneof" json:"msg,omitempty"` } func (*Communique_Number) isCommunique_Union() {} @@ -3804,9 +3512,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Communique) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Communique_OneofMarshaler, _Communique_OneofUnmarshaler, _Communique_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Communique) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Communique_Number)(nil), (*Communique_Name)(nil), (*Communique_Data)(nil), @@ -3816,121 +3524,6 @@ } } -func _Communique_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Communique) - // union - switch x := m.Union.(type) { - case *Communique_Number: - _ = b.EncodeVarint(5<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Number)) - case *Communique_Name: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Name) - case *Communique_Data: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Data) - case *Communique_TempC: - _ = b.EncodeVarint(8<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.TempC)) - case *Communique_Col: - _ = b.EncodeVarint(9<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Col)) - case *Communique_Msg: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Msg); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("Communique.Union has unexpected type %T", x) - } - return nil -} - -func _Communique_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Communique) - switch tag { - case 5: // union.number - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Communique_Number{int32(x)} - return true, err - case 6: // union.name - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Union = &Communique_Name{x} - return true, err - case 7: // union.data - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.Union = &Communique_Data{x} - return true, err - case 8: // union.temp_c - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.Union = &Communique_TempC{math.Float64frombits(x)} - return true, err - case 9: // union.col - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Communique_Col{MyMessage_Color(x)} - return true, err - case 10: // union.msg - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Strings) - err := b.DecodeMessage(msg) - m.Union = &Communique_Msg{msg} - return true, err - default: - return false, nil - } -} - -func _Communique_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Communique) - // union - switch x := m.Union.(type) { - case *Communique_Number: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Number)) - case *Communique_Name: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Name))) - n += len(x.Name) - case *Communique_Data: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Data))) - n += len(x.Data) - case *Communique_TempC: - n += 1 // tag and wire - n += 8 - case *Communique_Col: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Col)) - case *Communique_Msg: - s := proto.Size(x.Msg) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type TestUTF8 struct { Scalar *string `protobuf:"bytes,1,opt,name=scalar" json:"scalar,omitempty"` Vector []string `protobuf:"bytes,2,rep,name=vector" json:"vector,omitempty"` @@ -3973,7 +3566,7 @@ } type TestUTF8_Field struct { - Field string `protobuf:"bytes,3,opt,name=field,oneof"` + Field string `protobuf:"bytes,3,opt,name=field,oneof" json:"field,omitempty"` } func (*TestUTF8_Field) isTestUTF8_Oneof() {} @@ -4020,57 +3613,13 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*TestUTF8) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _TestUTF8_OneofMarshaler, _TestUTF8_OneofUnmarshaler, _TestUTF8_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TestUTF8) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*TestUTF8_Field)(nil), } } -func _TestUTF8_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*TestUTF8) - // oneof - switch x := m.Oneof.(type) { - case *TestUTF8_Field: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field) - case nil: - default: - return fmt.Errorf("TestUTF8.Oneof has unexpected type %T", x) - } - return nil -} - -func _TestUTF8_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*TestUTF8) - switch tag { - case 3: // oneof.field - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Oneof = &TestUTF8_Field{x} - return true, err - default: - return false, nil - } -} - -func _TestUTF8_OneofSizer(msg proto.Message) (n int) { - m := msg.(*TestUTF8) - // oneof - switch x := m.Oneof.(type) { - case *TestUTF8_Field: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field))) - n += len(x.Field) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - var E_Greeting = &proto.ExtensionDesc{ ExtendedType: (*MyMessage)(nil), ExtensionType: ([]string)(nil), diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/text.go golang-gogoprotobuf-1.3.1/proto/text.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/proto/text.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/proto/text.go 2020-05-17 12:22:58.000000000 +0000 @@ -476,6 +476,8 @@ return nil } +var textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem() + // writeAny writes an arbitrary field. func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error { v = reflect.Indirect(v) @@ -589,8 +591,8 @@ // mutating this value. v = v.Addr() } - if etm, ok := v.Interface().(encoding.TextMarshaler); ok { - text, err := etm.MarshalText() + if v.Type().Implements(textMarshalerType) { + text, err := v.Interface().(encoding.TextMarshaler).MarshalText() if err != nil { return err } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/compiler/plugin.proto golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/compiler/plugin.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/compiler/plugin.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/compiler/plugin.proto 2020-05-17 12:22:58.000000000 +0000 @@ -45,6 +45,7 @@ // flag "--${NAME}_out" is passed to protoc. syntax = "proto2"; + package google.protobuf.compiler; option java_package = "com.google.protobuf.compiler"; option java_outer_classname = "PluginProtos"; diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/descriptor.proto golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/descriptor.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/descriptor.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/descriptor.proto 2020-05-17 12:22:58.000000000 +0000 @@ -40,6 +40,7 @@ syntax = "proto2"; package google.protobuf; + option go_package = "descriptor"; option java_package = "com.google.protobuf"; option java_outer_classname = "DescriptorProtos"; @@ -59,8 +60,8 @@ // Describes a complete .proto file. message FileDescriptorProto { - optional string name = 1; // file name, relative to root of source tree - optional string package = 2; // e.g. "foo", "foo.bar", etc. + optional string name = 1; // file name, relative to root of source tree + optional string package = 2; // e.g. "foo", "foo.bar", etc. // Names of files imported by this file. repeated string dependency = 3; @@ -100,8 +101,8 @@ repeated EnumDescriptorProto enum_type = 4; message ExtensionRange { - optional int32 start = 1; - optional int32 end = 2; + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Exclusive. optional ExtensionRangeOptions options = 3; } @@ -115,8 +116,8 @@ // fields or extension ranges in the same message. Reserved ranges may // not overlap. message ReservedRange { - optional int32 start = 1; // Inclusive. - optional int32 end = 2; // Exclusive. + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Exclusive. } repeated ReservedRange reserved_range = 9; // Reserved field names, which may not be used by fields in the same message. @@ -137,42 +138,42 @@ enum Type { // 0 is reserved for errors. // Order is weird for historical reasons. - TYPE_DOUBLE = 1; - TYPE_FLOAT = 2; + TYPE_DOUBLE = 1; + TYPE_FLOAT = 2; // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if // negative values are likely. - TYPE_INT64 = 3; - TYPE_UINT64 = 4; + TYPE_INT64 = 3; + TYPE_UINT64 = 4; // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if // negative values are likely. - TYPE_INT32 = 5; - TYPE_FIXED64 = 6; - TYPE_FIXED32 = 7; - TYPE_BOOL = 8; - TYPE_STRING = 9; + TYPE_INT32 = 5; + TYPE_FIXED64 = 6; + TYPE_FIXED32 = 7; + TYPE_BOOL = 8; + TYPE_STRING = 9; // Tag-delimited aggregate. // Group type is deprecated and not supported in proto3. However, Proto3 // implementations should still be able to parse the group wire format and // treat group fields as unknown fields. - TYPE_GROUP = 10; - TYPE_MESSAGE = 11; // Length-delimited aggregate. + TYPE_GROUP = 10; + TYPE_MESSAGE = 11; // Length-delimited aggregate. // New in version 2. - TYPE_BYTES = 12; - TYPE_UINT32 = 13; - TYPE_ENUM = 14; - TYPE_SFIXED32 = 15; - TYPE_SFIXED64 = 16; - TYPE_SINT32 = 17; // Uses ZigZag encoding. - TYPE_SINT64 = 18; // Uses ZigZag encoding. - }; + TYPE_BYTES = 12; + TYPE_UINT32 = 13; + TYPE_ENUM = 14; + TYPE_SFIXED32 = 15; + TYPE_SFIXED64 = 16; + TYPE_SINT32 = 17; // Uses ZigZag encoding. + TYPE_SINT64 = 18; // Uses ZigZag encoding. + } enum Label { // 0 is reserved for errors - LABEL_OPTIONAL = 1; - LABEL_REQUIRED = 2; - LABEL_REPEATED = 3; - }; + LABEL_OPTIONAL = 1; + LABEL_REQUIRED = 2; + LABEL_REPEATED = 3; + } optional string name = 1; optional int32 number = 3; @@ -234,8 +235,8 @@ // is inclusive such that it can appropriately represent the entire int32 // domain. message EnumReservedRange { - optional int32 start = 1; // Inclusive. - optional int32 end = 2; // Inclusive. + optional int32 start = 1; // Inclusive. + optional int32 end = 2; // Inclusive. } // Range of reserved numeric values. Reserved numeric values may not be used @@ -276,9 +277,9 @@ optional MethodOptions options = 4; // Identifies if client streams multiple client messages - optional bool client_streaming = 5 [default=false]; + optional bool client_streaming = 5 [default = false]; // Identifies if server streams multiple server messages - optional bool server_streaming = 6 [default=false]; + optional bool server_streaming = 6 [default = false]; } @@ -314,7 +315,6 @@ // If this turns out to be popular, a web service will be set up // to automatically assign option numbers. - message FileOptions { // Sets the Java package where classes generated from this .proto will be @@ -337,7 +337,7 @@ // named by java_outer_classname. However, the outer class will still be // generated to contain the file's getDescriptor() method as well as any // top-level extensions defined in the file. - optional bool java_multiple_files = 10 [default=false]; + optional bool java_multiple_files = 10 [default = false]; // This option does nothing. optional bool java_generate_equals_and_hash = 20 [deprecated=true]; @@ -348,17 +348,17 @@ // Message reflection will do the same. // However, an extension field still accepts non-UTF-8 byte sequences. // This option has no effect on when used with the lite runtime. - optional bool java_string_check_utf8 = 27 [default=false]; + optional bool java_string_check_utf8 = 27 [default = false]; // Generated classes can be optimized for speed or code size. enum OptimizeMode { - SPEED = 1; // Generate complete code for parsing, serialization, - // etc. - CODE_SIZE = 2; // Use ReflectionOps to implement these methods. - LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. + SPEED = 1; // Generate complete code for parsing, serialization, + // etc. + CODE_SIZE = 2; // Use ReflectionOps to implement these methods. + LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. } - optional OptimizeMode optimize_for = 9 [default=SPEED]; + optional OptimizeMode optimize_for = 9 [default = SPEED]; // Sets the Go package where structs generated from this .proto will be // placed. If omitted, the Go package will be derived from the following: @@ -369,6 +369,7 @@ + // Should generic services be generated in each language? "Generic" services // are not specific to any particular RPC system. They are generated by the // main code generators in each language (without additional plugins). @@ -379,20 +380,20 @@ // that generate code specific to your particular RPC system. Therefore, // these default to false. Old code which depends on generic services should // explicitly set them to true. - optional bool cc_generic_services = 16 [default=false]; - optional bool java_generic_services = 17 [default=false]; - optional bool py_generic_services = 18 [default=false]; - optional bool php_generic_services = 42 [default=false]; + optional bool cc_generic_services = 16 [default = false]; + optional bool java_generic_services = 17 [default = false]; + optional bool py_generic_services = 18 [default = false]; + optional bool php_generic_services = 42 [default = false]; // Is this file deprecated? // Depending on the target platform, this can emit Deprecated annotations // for everything in the file, or it will be completely ignored; in the very // least, this is a formalization for deprecating files. - optional bool deprecated = 23 [default=false]; + optional bool deprecated = 23 [default = false]; // Enables the use of arenas for the proto messages in this file. This applies // only to generated classes for C++. - optional bool cc_enable_arenas = 31 [default=false]; + optional bool cc_enable_arenas = 31 [default = false]; // Sets the objective c class prefix which is prepended to all objective c @@ -417,10 +418,9 @@ // determining the namespace. optional string php_namespace = 41; - // Use this option to change the namespace of php generated metadata classes. - // Default is empty. When this option is empty, the proto file name will be used - // for determining the namespace. + // Default is empty. When this option is empty, the proto file name will be + // used for determining the namespace. optional string php_metadata_namespace = 44; // Use this option to change the package of ruby generated classes. Default @@ -428,6 +428,7 @@ // determining the ruby package. optional string ruby_package = 45; + // The parser stores options it doesn't recognize here. // See the documentation for the "Options" section above. repeated UninterpretedOption uninterpreted_option = 999; @@ -458,18 +459,18 @@ // // Because this is an option, the above two restrictions are not enforced by // the protocol compiler. - optional bool message_set_wire_format = 1 [default=false]; + optional bool message_set_wire_format = 1 [default = false]; // Disables the generation of the standard "descriptor()" accessor, which can // conflict with a field of the same name. This is meant to make migration // from proto1 easier; new code should avoid fields named "descriptor". - optional bool no_standard_descriptor_accessor = 2 [default=false]; + optional bool no_standard_descriptor_accessor = 2 [default = false]; // Is this message deprecated? // Depending on the target platform, this can emit Deprecated annotations // for the message, or it will be completely ignored; in the very least, // this is a formalization for deprecating messages. - optional bool deprecated = 3 [default=false]; + optional bool deprecated = 3 [default = false]; // Whether the message is an automatically generated map entry type for the // maps field. @@ -486,7 +487,7 @@ // // Implementations may choose not to generate the map_entry=true message, but // use a native map in the target language to hold the keys and values. - // The reflection APIs in such implementions still need to work as + // The reflection APIs in such implementations still need to work as // if the field is a repeated message field. // // NOTE: Do not set the option in .proto files. Always use the maps syntax @@ -497,6 +498,7 @@ //reserved 8; // javalite_serializable //reserved 9; // javanano_as_lite + // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; @@ -576,16 +578,16 @@ // implementation must either *always* check its required fields, or *never* // check its required fields, regardless of whether or not the message has // been parsed. - optional bool lazy = 5 [default=false]; + optional bool lazy = 5 [default = false]; // Is this field deprecated? // Depending on the target platform, this can emit Deprecated annotations // for accessors, or it will be completely ignored; in the very least, this // is a formalization for deprecating fields. - optional bool deprecated = 3 [default=false]; + optional bool deprecated = 3 [default = false]; // For Google-internal migration only. Do not use. - optional bool weak = 10 [default=false]; + optional bool weak = 10 [default = false]; // The parser stores options it doesn't recognize here. See above. @@ -615,7 +617,7 @@ // Depending on the target platform, this can emit Deprecated annotations // for the enum, or it will be completely ignored; in the very least, this // is a formalization for deprecating enums. - optional bool deprecated = 3 [default=false]; + optional bool deprecated = 3 [default = false]; //reserved 5; // javanano_as_lite @@ -631,7 +633,7 @@ // Depending on the target platform, this can emit Deprecated annotations // for the enum value, or it will be completely ignored; in the very least, // this is a formalization for deprecating enum values. - optional bool deprecated = 1 [default=false]; + optional bool deprecated = 1 [default = false]; // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; @@ -651,7 +653,7 @@ // Depending on the target platform, this can emit Deprecated annotations // for the service, or it will be completely ignored; in the very least, // this is a formalization for deprecating services. - optional bool deprecated = 33 [default=false]; + optional bool deprecated = 33 [default = false]; // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; @@ -671,18 +673,18 @@ // Depending on the target platform, this can emit Deprecated annotations // for the method, or it will be completely ignored; in the very least, // this is a formalization for deprecating methods. - optional bool deprecated = 33 [default=false]; + optional bool deprecated = 33 [default = false]; // Is this method side-effect-free (or safe in HTTP parlance), or idempotent, // or neither? HTTP based RPC implementation may choose GET verb for safe // methods, and PUT verb for idempotent methods instead of the default POST. enum IdempotencyLevel { IDEMPOTENCY_UNKNOWN = 0; - NO_SIDE_EFFECTS = 1; // implies idempotent - IDEMPOTENT = 2; // idempotent, but may have side effects + NO_SIDE_EFFECTS = 1; // implies idempotent + IDEMPOTENT = 2; // idempotent, but may have side effects } - optional IdempotencyLevel idempotency_level = - 34 [default=IDEMPOTENCY_UNKNOWN]; + optional IdempotencyLevel idempotency_level = 34 + [default = IDEMPOTENCY_UNKNOWN]; // The parser stores options it doesn't recognize here. See above. repeated UninterpretedOption uninterpreted_option = 999; @@ -763,7 +765,7 @@ // beginning of the "extend" block and is shared by all extensions within // the block. // - Just because a location's span is a subset of some other location's span - // does not mean that it is a descendent. For example, a "group" defines + // does not mean that it is a descendant. For example, a "group" defines // both a type and a field in a single declaration. Thus, the locations // corresponding to the type and field and their components will overlap. // - Code which tries to interpret locations should probably be designed to @@ -794,14 +796,14 @@ // [ 4, 3, 2, 7 ] // this path refers to the whole field declaration (from the beginning // of the label to the terminating semicolon). - repeated int32 path = 1 [packed=true]; + repeated int32 path = 1 [packed = true]; // Always has exactly three or four elements: start line, start column, // end line (optional, otherwise assumed same as start line), end column. // These are packed into a single field for efficiency. Note that line // and column numbers are zero-based -- typically you will want to add // 1 to each before displaying to a user. - repeated int32 span = 2 [packed=true]; + repeated int32 span = 2 [packed = true]; // If this SourceCodeInfo represents a complete declaration, these are any // comments appearing before and after the declaration which appear to be @@ -866,7 +868,7 @@ message Annotation { // Identifies the element in the original source .proto file. This field // is formatted the same as SourceCodeInfo.Location.path. - repeated int32 path = 1 [packed=true]; + repeated int32 path = 1 [packed = true]; // Identifies the filesystem path to the original source .proto. optional string source_file = 2; diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/duration.proto golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/duration.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/duration.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/duration.proto 2020-05-17 12:22:58.000000000 +0000 @@ -101,7 +101,6 @@ // // message Duration { - // Signed seconds of the span of time. Must be from -315,576,000,000 // to +315,576,000,000 inclusive. Note: these bounds are computed from: // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/struct.proto golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/struct.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/struct.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/struct.proto 2020-05-17 12:22:58.000000000 +0000 @@ -40,7 +40,6 @@ option java_multiple_files = true; option objc_class_prefix = "GPB"; - // `Struct` represents a structured data value, consisting of fields // which map to dynamically typed values. In some languages, `Struct` // might be supported by a native representation. For example, in diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/timestamp.proto golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/timestamp.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/timestamp.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/timestamp.proto 2020-05-17 12:22:58.000000000 +0000 @@ -113,17 +113,18 @@ // 01:30 UTC on January 15, 2017. // // In JavaScript, one can convert a Date object to this format using the -// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) +// standard +// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) // method. In Python, a standard `datetime.datetime` object can be converted -// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) -// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one -// can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( +// to this format using +// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with +// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use +// the Joda Time's [`ISODateTimeFormat.dateTime()`]( // http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D // ) to obtain a formatter capable of generating timestamps in this format. // // message Timestamp { - // Represents seconds of UTC time since Unix epoch // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to // 9999-12-31T23:59:59Z inclusive. diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/type.proto golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/type.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/google/protobuf/type.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protobuf/google/protobuf/type.proto 2020-05-17 12:22:58.000000000 +0000 @@ -64,44 +64,44 @@ // Basic field types. enum Kind { // Field type unknown. - TYPE_UNKNOWN = 0; + TYPE_UNKNOWN = 0; // Field type double. - TYPE_DOUBLE = 1; + TYPE_DOUBLE = 1; // Field type float. - TYPE_FLOAT = 2; + TYPE_FLOAT = 2; // Field type int64. - TYPE_INT64 = 3; + TYPE_INT64 = 3; // Field type uint64. - TYPE_UINT64 = 4; + TYPE_UINT64 = 4; // Field type int32. - TYPE_INT32 = 5; + TYPE_INT32 = 5; // Field type fixed64. - TYPE_FIXED64 = 6; + TYPE_FIXED64 = 6; // Field type fixed32. - TYPE_FIXED32 = 7; + TYPE_FIXED32 = 7; // Field type bool. - TYPE_BOOL = 8; + TYPE_BOOL = 8; // Field type string. - TYPE_STRING = 9; + TYPE_STRING = 9; // Field type group. Proto2 syntax only, and deprecated. - TYPE_GROUP = 10; + TYPE_GROUP = 10; // Field type message. - TYPE_MESSAGE = 11; + TYPE_MESSAGE = 11; // Field type bytes. - TYPE_BYTES = 12; + TYPE_BYTES = 12; // Field type uint32. - TYPE_UINT32 = 13; + TYPE_UINT32 = 13; // Field type enum. - TYPE_ENUM = 14; + TYPE_ENUM = 14; // Field type sfixed32. - TYPE_SFIXED32 = 15; + TYPE_SFIXED32 = 15; // Field type sfixed64. - TYPE_SFIXED64 = 16; + TYPE_SFIXED64 = 16; // Field type sint32. - TYPE_SINT32 = 17; + TYPE_SINT32 = 17; // Field type sint64. - TYPE_SINT64 = 18; - }; + TYPE_SINT64 = 18; + } // Whether a field is optional, required, or repeated. enum Cardinality { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/Makefile golang-gogoprotobuf-1.3.1/protobuf/Makefile --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protobuf/Makefile 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protobuf/Makefile 2020-05-17 12:22:58.000000000 +0000 @@ -1,4 +1,4 @@ -VERSION=3.7.1 +VERSION=3.9.1 URL="https://raw.githubusercontent.com/protocolbuffers/protobuf/v${VERSION}/src/google/protobuf" regenerate: diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/descriptor/descriptor.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/descriptor/descriptor.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/descriptor/descriptor.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/descriptor/descriptor.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type FieldDescriptorProto_Type int32 @@ -1364,8 +1364,8 @@ // determining the namespace. PhpNamespace *string `protobuf:"bytes,41,opt,name=php_namespace,json=phpNamespace" json:"php_namespace,omitempty"` // Use this option to change the namespace of php generated metadata classes. - // Default is empty. When this option is empty, the proto file name will be used - // for determining the namespace. + // Default is empty. When this option is empty, the proto file name will be + // used for determining the namespace. PhpMetadataNamespace *string `protobuf:"bytes,44,opt,name=php_metadata_namespace,json=phpMetadataNamespace" json:"php_metadata_namespace,omitempty"` // Use this option to change the package of ruby generated classes. Default // is empty. When this option is not set, the package name will be used for @@ -1615,7 +1615,7 @@ // // Implementations may choose not to generate the map_entry=true message, but // use a native map in the target language to hold the keys and values. - // The reflection APIs in such implementions still need to work as + // The reflection APIs in such implementations still need to work as // if the field is a repeated message field. // // NOTE: Do not set the option in .proto files. Always use the maps syntax @@ -2363,7 +2363,7 @@ // beginning of the "extend" block and is shared by all extensions within // the block. // - Just because a location's span is a subset of some other location's span - // does not mean that it is a descendent. For example, a "group" defines + // does not mean that it is a descendant. For example, a "group" defines // both a type and a field in a single declaration. Thus, the locations // corresponding to the type and field and their components will overlap. // - Code which tries to interpret locations should probably be designed to diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/generator/generator.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/generator/generator.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/generator/generator.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/generator/generator.go 2020-05-17 12:22:58.000000000 +0000 @@ -73,7 +73,7 @@ // It is incremented whenever an incompatibility between the generated code and // proto package is introduced; the generated code references // a constant, proto.ProtoPackageIsVersionN (where N is generatedCodeVersion). -const generatedCodeVersion = 2 +const generatedCodeVersion = 3 // A Plugin provides functionality to add to the output during Go code generation, // such as to produce RPC stubs. @@ -2233,391 +2233,14 @@ getterDef string // Default for getters, e.g. "nil", `""` or "Default_MessageType_FieldName" protoDef string // Default value as defined in the proto file, e.g "yoshi" or "5" deprecated string // Deprecation comment, if any. - wireType string // gogo. We can set this on creation, instead of using a function -} - -// wireTypeName returns a textual wire type, needed for oneof sub fields in generated code. -func (f *oneofSubField) wireTypeName() string { - return f.wireType } // typedNil prints a nil casted to the pointer to this field. -// - for XXX_OneofFuncs +// - for XXX_OneofWrappers func (f *oneofSubField) typedNil(g *Generator) { g.P("(*", f.oneofTypeName, ")(nil),") } -// marshalCase prints the case matching this oneof subfield in the marshalling code. -func (f *oneofSubField) marshalCase(g *Generator, mc *msgCtx) { - // if field.OneofIndex == nil || int(*field.OneofIndex) != oi { - // continue - // } - g.P("case *", f.oneofTypeName, ":") - var pre, post string - val := "x." + f.goName // overridden for TYPE_BOOL - canFail := false // only TYPE_MESSAGE and TYPE_GROUP can fail - switch f.protoType { - case descriptor.FieldDescriptorProto_TYPE_DOUBLE: - pre = "b.EncodeFixed64(" + g.Pkg["math"] + ".Float64bits(" - post = "))" - case descriptor.FieldDescriptorProto_TYPE_FLOAT: - pre = "b.EncodeFixed32(uint64(" + g.Pkg["math"] + ".Float32bits(" - post = ")))" - case descriptor.FieldDescriptorProto_TYPE_INT64, - descriptor.FieldDescriptorProto_TYPE_UINT64: - pre, post = "b.EncodeVarint(uint64(", "))" - case descriptor.FieldDescriptorProto_TYPE_INT32, - descriptor.FieldDescriptorProto_TYPE_UINT32, - descriptor.FieldDescriptorProto_TYPE_ENUM: - pre, post = "b.EncodeVarint(uint64(", "))" - case descriptor.FieldDescriptorProto_TYPE_FIXED64, - descriptor.FieldDescriptorProto_TYPE_SFIXED64: - pre, post = "b.EncodeFixed64(uint64(", "))" - case descriptor.FieldDescriptorProto_TYPE_FIXED32, - descriptor.FieldDescriptorProto_TYPE_SFIXED32: - pre, post = "b.EncodeFixed32(uint64(", "))" - case descriptor.FieldDescriptorProto_TYPE_BOOL: - // bool needs special handling. - g.P("t := uint64(0)") - g.P("if ", val, " { t = 1 }") - val = "t" - pre, post = "b.EncodeVarint(", ")" - case descriptor.FieldDescriptorProto_TYPE_STRING: - pre, post = "b.EncodeStringBytes(", ")" - case descriptor.FieldDescriptorProto_TYPE_GROUP: - pre, post = "b.Marshal(", ")" - canFail = true - case descriptor.FieldDescriptorProto_TYPE_MESSAGE: - pre, post = "b.EncodeMessage(", ")" - canFail = true - case descriptor.FieldDescriptorProto_TYPE_BYTES: - pre, post = "b.EncodeRawBytes(", ")" - case descriptor.FieldDescriptorProto_TYPE_SINT32: - pre, post = "b.EncodeZigzag32(uint64(", "))" - case descriptor.FieldDescriptorProto_TYPE_SINT64: - pre, post = "b.EncodeZigzag64(uint64(", "))" - default: - g.Fail("unhandled oneof field type ", f.protoType.String()) - } - g.P("_ = b.EncodeVarint(", f.fieldNumber, "<<3|", g.Pkg["proto"], ".", f.wireTypeName(), ")") - if f.protoType == descriptor.FieldDescriptorProto_TYPE_BYTES && gogoproto.IsCustomType(f.protoField) { - g.P(`dAtA, err := `, val, `.Marshal()`) - g.P(`if err != nil {`) - g.In() - g.P(`return err`) - g.Out() - g.P(`}`) - val = "dAtA" - } else if gogoproto.IsStdType(f.protoField) { - pkg := g.useTypes() - ptr := "" - fnname := "" - if gogoproto.IsNullable(f.protoField) { - ptr = "*" - } - if gogoproto.IsStdTime(f.protoField) { - fnname = "Time" - } else if gogoproto.IsStdDuration(f.protoField) { - fnname = "Duration" - } else if gogoproto.IsStdDouble(f.protoField) { - fnname = "Double" - } else if gogoproto.IsStdFloat(f.protoField) { - fnname = "Float" - } else if gogoproto.IsStdInt64(f.protoField) { - fnname = "Int64" - } else if gogoproto.IsStdUInt64(f.protoField) { - fnname = "UInt64" - } else if gogoproto.IsStdInt32(f.protoField) { - fnname = "Int32" - } else if gogoproto.IsStdUInt32(f.protoField) { - fnname = "UInt32" - } else if gogoproto.IsStdBool(f.protoField) { - fnname = "Bool" - } else if gogoproto.IsStdString(f.protoField) { - fnname = "String" - } else if gogoproto.IsStdBytes(f.protoField) { - fnname = "Bytes" - } else { - panic("internal error") - } - g.P(`dAtA, err := `, pkg, `.Std`, fnname, `Marshal(`, ptr, val, `)`) - g.P(`if err != nil {`) - g.In() - g.P(`return err`) - g.Out() - g.P(`}`) - val = "dAtA" - pre, post = "b.EncodeRawBytes(", ")" - } - if !canFail { - g.P("_ = ", pre, val, post) - } else { - g.P("if err := ", pre, val, post, "; err != nil {") - g.In() - g.P("return err") - g.Out() - g.P("}") - } - if f.protoType == descriptor.FieldDescriptorProto_TYPE_GROUP { - g.P("_ = b.EncodeVarint(", f.fieldNumber, "<<3|", g.Pkg["proto"], ".WireEndGroup)") - } -} - -// unmarshalCase prints the case matching this oneof subfield in the unmarshalling code. -func (f *oneofSubField) unmarshalCase(g *Generator, origOneofName string, oneofName string, mc *msgCtx) { - // if field.OneofIndex == nil { - // continue - // } - g.P("case ", f.fieldNumber, ": // ", origOneofName, ".", f.getProtoName()) - g.P("if wire != ", g.Pkg["proto"], ".", f.wireTypeName(), " {") - g.P("return true, ", g.Pkg["proto"], ".ErrInternalBadWireType") - g.P("}") - lhs := "x, err" // overridden for TYPE_MESSAGE and TYPE_GROUP - var dec, cast, cast2 string - switch f.protoType { - case descriptor.FieldDescriptorProto_TYPE_DOUBLE: - dec, cast = "b.DecodeFixed64()", g.Pkg["math"]+".Float64frombits" - case descriptor.FieldDescriptorProto_TYPE_FLOAT: - dec, cast, cast2 = "b.DecodeFixed32()", "uint32", g.Pkg["math"]+".Float32frombits" - case descriptor.FieldDescriptorProto_TYPE_INT64: - dec, cast = "b.DecodeVarint()", "int64" - case descriptor.FieldDescriptorProto_TYPE_UINT64: - dec = "b.DecodeVarint()" - case descriptor.FieldDescriptorProto_TYPE_INT32: - dec, cast = "b.DecodeVarint()", "int32" - case descriptor.FieldDescriptorProto_TYPE_FIXED64: - dec = "b.DecodeFixed64()" - case descriptor.FieldDescriptorProto_TYPE_FIXED32: - dec, cast = "b.DecodeFixed32()", "uint32" - case descriptor.FieldDescriptorProto_TYPE_BOOL: - dec = "b.DecodeVarint()" - // handled specially below - case descriptor.FieldDescriptorProto_TYPE_STRING: - dec = "b.DecodeStringBytes()" - case descriptor.FieldDescriptorProto_TYPE_GROUP: - g.P("msg := new(", f.goType[1:], ")") // drop star - lhs = "err" - dec = "b.DecodeGroup(msg)" - // handled specially below - case descriptor.FieldDescriptorProto_TYPE_MESSAGE: - if gogoproto.IsStdType(f.protoField) { - dec = "b.DecodeRawBytes(true)" - } else { - g.P("msg := new(", f.goType[1:], ")") // drop star - lhs = "err" - dec = "b.DecodeMessage(msg)" - } - // handled specially below - case descriptor.FieldDescriptorProto_TYPE_BYTES: - dec = "b.DecodeRawBytes(true)" - case descriptor.FieldDescriptorProto_TYPE_UINT32: - dec, cast = "b.DecodeVarint()", "uint32" - case descriptor.FieldDescriptorProto_TYPE_ENUM: - dec, cast = "b.DecodeVarint()", f.goType - case descriptor.FieldDescriptorProto_TYPE_SFIXED32: - dec, cast = "b.DecodeFixed32()", "int32" - case descriptor.FieldDescriptorProto_TYPE_SFIXED64: - dec, cast = "b.DecodeFixed64()", "int64" - case descriptor.FieldDescriptorProto_TYPE_SINT32: - dec, cast = "b.DecodeZigzag32()", "int32" - case descriptor.FieldDescriptorProto_TYPE_SINT64: - dec, cast = "b.DecodeZigzag64()", "int64" - default: - g.Fail("unhandled oneof field type ", f.protoType.String()) - } - g.P(lhs, " := ", dec) - val := "x" - if f.protoType == descriptor.FieldDescriptorProto_TYPE_BYTES && gogoproto.IsCustomType(f.protoField) { - g.P(`if err != nil {`) - g.In() - g.P(`return true, err`) - g.Out() - g.P(`}`) - _, ctyp, err := GetCustomType(f.protoField) - if err != nil { - panic(err) - } - g.P(`var cc `, ctyp) - g.P(`c := &cc`) - g.P(`err = c.Unmarshal(`, val, `)`) - val = "*c" - } else if gogoproto.IsStdType(f.protoField) { - var stdtype string - var fnname string - if gogoproto.IsStdTime(f.protoField) { - stdtype = "time.Time" - fnname = "Time" - } else if gogoproto.IsStdDuration(f.protoField) { - stdtype = "time.Duration" - fnname = "Duration" - } else if gogoproto.IsStdDouble(f.protoField) { - stdtype = "float64" - fnname = "Double" - } else if gogoproto.IsStdFloat(f.protoField) { - stdtype = "float32" - fnname = "Float" - } else if gogoproto.IsStdInt64(f.protoField) { - stdtype = "int64" - fnname = "Int64" - } else if gogoproto.IsStdUInt64(f.protoField) { - stdtype = "uint64" - fnname = "UInt64" - } else if gogoproto.IsStdInt32(f.protoField) { - stdtype = "int32" - fnname = "Int32" - } else if gogoproto.IsStdUInt32(f.protoField) { - stdtype = "uint32" - fnname = "UInt32" - } else if gogoproto.IsStdBool(f.protoField) { - stdtype = "bool" - fnname = "Bool" - } else if gogoproto.IsStdString(f.protoField) { - stdtype = "string" - fnname = "String" - } else if gogoproto.IsStdBytes(f.protoField) { - stdtype = "[]byte" - fnname = "Bytes" - } else { - panic("internal error") - } - - pkg := g.useTypes() - g.P(`if err != nil {`) - g.In() - g.P(`return true, err`) - g.Out() - g.P(`}`) - g.P(`c := new(`, stdtype, `)`) - g.P(`if err2 := `, pkg, `.Std`, fnname, `Unmarshal(c, `, val, `); err2 != nil {`) - g.In() - g.P(`return true, err`) - g.Out() - g.P(`}`) - val = "c" - } - if cast != "" { - val = cast + "(" + val + ")" - } - if cast2 != "" { - val = cast2 + "(" + val + ")" - } - switch f.protoType { - case descriptor.FieldDescriptorProto_TYPE_BOOL: - val += " != 0" - case descriptor.FieldDescriptorProto_TYPE_GROUP, - descriptor.FieldDescriptorProto_TYPE_MESSAGE: - if !gogoproto.IsStdType(f.protoField) { - val = "msg" - } - } - if gogoproto.IsCastType(f.protoField) { - _, typ, err := getCastType(f.protoField) - if err != nil { - g.Fail(err.Error()) - } - val = typ + "(" + val + ")" - } - g.P("m.", oneofName, " = &", f.oneofTypeName, "{", val, "}") - g.P("return true, err") -} - -// sizerCase prints the case matching this oneof subfield in the sizer code. -func (f *oneofSubField) sizerCase(g *Generator) { - // if field.OneofIndex == nil || int(*field.OneofIndex) != oi { - // continue - // } - g.P("case *", f.oneofTypeName, ":") - val := "x." + f.goName - var varint, fixed string - switch f.protoType { - case descriptor.FieldDescriptorProto_TYPE_DOUBLE: - fixed = "8" - case descriptor.FieldDescriptorProto_TYPE_FLOAT: - fixed = "4" - case descriptor.FieldDescriptorProto_TYPE_INT64, - descriptor.FieldDescriptorProto_TYPE_UINT64, - descriptor.FieldDescriptorProto_TYPE_INT32, - descriptor.FieldDescriptorProto_TYPE_UINT32, - descriptor.FieldDescriptorProto_TYPE_ENUM: - varint = val - case descriptor.FieldDescriptorProto_TYPE_FIXED64, - descriptor.FieldDescriptorProto_TYPE_SFIXED64: - fixed = "8" - case descriptor.FieldDescriptorProto_TYPE_FIXED32, - descriptor.FieldDescriptorProto_TYPE_SFIXED32: - fixed = "4" - case descriptor.FieldDescriptorProto_TYPE_BOOL: - fixed = "1" - case descriptor.FieldDescriptorProto_TYPE_STRING: - fixed = "len(" + val + ")" - varint = fixed - case descriptor.FieldDescriptorProto_TYPE_GROUP: - fixed = g.Pkg["proto"] + ".Size(" + val + ")" - case descriptor.FieldDescriptorProto_TYPE_MESSAGE: - if gogoproto.IsStdType(f.protoField) { - pkg := g.useTypes() - if gogoproto.IsNullable(f.protoField) { - val = "*" + val - } - if gogoproto.IsStdTime(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdTime(", val, ")") - } else if gogoproto.IsStdDuration(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdDuration(", val, ")") - } else if gogoproto.IsStdDouble(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdDouble(", val, ")") - } else if gogoproto.IsStdFloat(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdFloat(", val, ")") - } else if gogoproto.IsStdInt64(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdInt64(", val, ")") - } else if gogoproto.IsStdUInt64(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdUInt64(", val, ")") - } else if gogoproto.IsStdInt32(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdInt32(", val, ")") - } else if gogoproto.IsStdUInt32(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdUInt32(", val, ")") - } else if gogoproto.IsStdBool(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdBool(", val, ")") - } else if gogoproto.IsStdString(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdString(", val, ")") - } else if gogoproto.IsStdBytes(f.protoField) { - g.P("s := ", pkg, ".SizeOfStdBytes(", val, ")") - } else { - panic("internal error") - } - } else { - g.P("s := ", g.Pkg["proto"], ".Size(", val, ")") - } - fixed = "s" - varint = fixed - case descriptor.FieldDescriptorProto_TYPE_BYTES: - if gogoproto.IsCustomType(f.protoField) { - fixed = val + ".Size()" - } else { - fixed = "len(" + val + ")" - } - varint = fixed - case descriptor.FieldDescriptorProto_TYPE_SINT32: - varint = "(uint32(" + val + ") << 1) ^ uint32((int32(" + val + ") >> 31))" - case descriptor.FieldDescriptorProto_TYPE_SINT64: - varint = "uint64(" + val + " << 1) ^ uint64((int64(" + val + ") >> 63))" - default: - g.Fail("unhandled oneof field type ", f.protoType.String()) - } - // Tag and wire varint is known statically, - // so don't generate code for that part of the size computation. - tagAndWireSize := proto.SizeVarint(uint64(f.fieldNumber << 3)) // wire doesn't affect varint size - g.P("n += ", tagAndWireSize, " // tag and wire") - if varint != "" { - g.P("n += ", g.Pkg["proto"], ".SizeVarint(uint64(", varint, "))") - } - if fixed != "" { - g.P("n += ", fixed) - } - if f.protoType == descriptor.FieldDescriptorProto_TYPE_GROUP { - g.P("n += ", tagAndWireSize, " // tag and wire") - } -} - // getProtoDef returns the default value explicitly stated in the proto file, e.g "yoshi" or "5". func (f *oneofSubField) getProtoDef() string { return f.protoDef @@ -2896,17 +2519,11 @@ if len(ofields) == 0 { return } - enc := "_" + mc.goName + "_OneofMarshaler" - dec := "_" + mc.goName + "_OneofUnmarshaler" - size := "_" + mc.goName + "_OneofSizer" - encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error" - decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)" - sizeSig := "(msg " + g.Pkg["proto"] + ".Message) (n int)" // OneofFuncs - g.P("// XXX_OneofFuncs is for the internal use of the proto package.") - g.P("func (*", mc.goName, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {") - g.P("return ", enc, ", ", dec, ", ", size, ", []interface{}{") + g.P("// XXX_OneofWrappers is for the internal use of the proto package.") + g.P("func (*", mc.goName, ") XXX_OneofWrappers() []interface{} {") + g.P("return []interface{}{") for _, of := range ofields { for _, sf := range of.subFields { sf.typedNil(g) @@ -2915,56 +2532,6 @@ g.P("}") g.P("}") g.P() - - // marshaler - g.P("func ", enc, encSig, " {") - g.P("m := msg.(*", mc.goName, ")") - for _, of := range ofields { - g.P("// ", of.getProtoName()) - g.P("switch x := m.", of.goName, ".(type) {") - for _, sf := range of.subFields { - sf.marshalCase(g, mc) - } - g.P("case nil:") - g.P("default: return ", g.Pkg["fmt"], `.Errorf("`, mc.goName, ".", of.goName, ` has unexpected type %T", x)`) - g.P("}") - } - g.P("return nil") - g.P("}") - g.P() - - // unmarshaler - g.P("func ", dec, decSig, " {") - g.P("m := msg.(*", mc.goName, ")") - g.P("switch tag {") - for _, of := range ofields { - for _, sf := range of.subFields { - sf.unmarshalCase(g, of.getProtoName(), of.goName, mc) - } - } - g.P("default: return false, nil") - g.P("}") - g.P("}") - g.P() - - // sizer - g.P("func ", size, sizeSig, " {") - g.P("m := msg.(*", mc.goName, ")") - for _, of := range ofields { - g.P("// ", of.getProtoName()) - g.P("switch x := m.", of.goName, ".(type) {") - for _, sf := range of.subFields { - // also fills in field.wire - sf.sizerCase(g) - } - g.P("case nil:") - g.P("default:") - g.P("panic(", g.Pkg["fmt"], ".Sprintf(\"proto: unexpected type %T in oneof\", x))") - g.P("}") - } - g.P("return n") - g.P("}") - g.P() } func (g *Generator) generateOneofDecls(mc *msgCtx, topLevelFields []topLevelField) { @@ -3005,16 +2572,17 @@ if gogoproto.IsProtoSizer(g.file.FileDescriptorProto, mc.message.DescriptorProto) { g.P(`ProtoSize() int`) } + if gogoproto.HasCompare(g.file.FileDescriptorProto, mc.message.DescriptorProto) { + g.P(`Compare(interface{}) int`) + } g.Out() g.P("}") } g.P() for _, of := range ofields { for i, sf := range of.subFields { - _, wiretype := g.GoType(mc.message, sf.protoField) - tag := "protobuf:" + g.goTag(mc.message, sf.protoField, wiretype) fieldFullPath := fmt.Sprintf("%s,%d,%d", mc.message.path, messageFieldPath, i) - g.P("type ", Annotate(mc.message.file, fieldFullPath, sf.oneofTypeName), " struct{ ", Annotate(mc.message.file, fieldFullPath, sf.goName), " ", sf.goType, " `", tag, "` }") + g.P("type ", Annotate(mc.message.file, fieldFullPath, sf.oneofTypeName), " struct{ ", Annotate(mc.message.file, fieldFullPath, sf.goName), " ", sf.goType, " `", sf.tags, "` }") if !gogoproto.IsStdType(sf.protoField) && !gogoproto.IsCustomType(sf.protoField) && !gogoproto.IsCastType(sf.protoField) { g.RecordTypeUse(sf.protoField.GetTypeName()) } @@ -3148,7 +2716,7 @@ gogoproto.IsUnsafeMarshaler(g.file.FileDescriptorProto, mc.message.DescriptorProto) { if gogoproto.IsStableMarshaler(g.file.FileDescriptorProto, mc.message.DescriptorProto) { g.P("b = b[:cap(b)]") - g.P("n, err := m.MarshalTo(b)") + g.P("n, err := m.MarshalToSizedBuffer(b)") g.P("if err != nil {") g.In() g.P("return nil, err") @@ -3162,7 +2730,7 @@ g.P("} else {") g.In() g.P("b = b[:cap(b)]") - g.P("n, err := m.MarshalTo(b)") + g.P("n, err := m.MarshalToSizedBuffer(b)") g.P("if err != nil {") g.In() g.P("return nil, err") @@ -3362,7 +2930,6 @@ } oneofField := oFields[*field.OneofIndex] - tag = "protobuf:" + g.goTag(message, field, wiretype) sf := oneofSubField{ fieldCommon: fieldCommon{ goName: fieldName, @@ -3380,7 +2947,6 @@ protoDef: field.GetDefaultValue(), oneofTypeName: tname, deprecated: fieldDeprecated, - wireType: wireTypeName(field), } oneofField.subFields = append(oneofField.subFields, &sf) @@ -3821,44 +3387,6 @@ } } -func wireTypeName(field *descriptor.FieldDescriptorProto) string { - switch *field.Type { - case descriptor.FieldDescriptorProto_TYPE_DOUBLE: - return "WireFixed64" - case descriptor.FieldDescriptorProto_TYPE_FLOAT: - return "WireFixed32" - case descriptor.FieldDescriptorProto_TYPE_INT64, - descriptor.FieldDescriptorProto_TYPE_UINT64: - return "WireVarint" - case descriptor.FieldDescriptorProto_TYPE_INT32, - descriptor.FieldDescriptorProto_TYPE_UINT32, - descriptor.FieldDescriptorProto_TYPE_ENUM: - return "WireVarint" - case descriptor.FieldDescriptorProto_TYPE_FIXED64, - descriptor.FieldDescriptorProto_TYPE_SFIXED64: - return "WireFixed64" - case descriptor.FieldDescriptorProto_TYPE_FIXED32, - descriptor.FieldDescriptorProto_TYPE_SFIXED32: - return "WireFixed32" - case descriptor.FieldDescriptorProto_TYPE_BOOL: - return "WireVarint" - case descriptor.FieldDescriptorProto_TYPE_STRING: - return "WireBytes" - case descriptor.FieldDescriptorProto_TYPE_GROUP: - return "WireStartGroup" - case descriptor.FieldDescriptorProto_TYPE_MESSAGE: - return "WireBytes" - case descriptor.FieldDescriptorProto_TYPE_BYTES: - return "WireBytes" - case descriptor.FieldDescriptorProto_TYPE_SINT32: - return "WireVarint" - case descriptor.FieldDescriptorProto_TYPE_SINT64: - return "WireVarint" - default: - return "WireVarint" - } -} - // badToUnderscore is the mapping function used to generate Go names from package names, // which can be dotted in the input .proto file. It replaces non-identifier characters such as // dot or dash with underscore. diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/plugin/plugin.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/plugin/plugin.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/plugin/plugin.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/plugin/plugin.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // The version number of protocol compiler. type Version struct { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/deprecated/deprecated.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/deprecated/deprecated.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/deprecated/deprecated.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/deprecated/deprecated.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -24,7 +24,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // DeprecatedEnum contains deprecated values. type DeprecatedEnum int32 // Deprecated: Do not use. @@ -125,7 +125,7 @@ } type DeprecatedResponse_DeprecatedOneofField struct { - DeprecatedOneofField string `protobuf:"bytes,2,opt,name=deprecated_oneof_field,json=deprecatedOneofField,proto3,oneof"` + DeprecatedOneofField string `protobuf:"bytes,2,opt,name=deprecated_oneof_field,json=deprecatedOneofField,proto3,oneof" json:"deprecated_oneof_field,omitempty"` } func (*DeprecatedResponse_DeprecatedOneofField) isDeprecatedResponse_DeprecatedOneof() {} @@ -153,57 +153,13 @@ return "" } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*DeprecatedResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _DeprecatedResponse_OneofMarshaler, _DeprecatedResponse_OneofUnmarshaler, _DeprecatedResponse_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*DeprecatedResponse) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*DeprecatedResponse_DeprecatedOneofField)(nil), } } -func _DeprecatedResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*DeprecatedResponse) - // deprecated_oneof - switch x := m.DeprecatedOneof.(type) { - case *DeprecatedResponse_DeprecatedOneofField: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.DeprecatedOneofField) - case nil: - default: - return fmt.Errorf("DeprecatedResponse.DeprecatedOneof has unexpected type %T", x) - } - return nil -} - -func _DeprecatedResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*DeprecatedResponse) - switch tag { - case 2: // deprecated_oneof.deprecated_oneof_field - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.DeprecatedOneof = &DeprecatedResponse_DeprecatedOneofField{x} - return true, err - default: - return false, nil - } -} - -func _DeprecatedResponse_OneofSizer(msg proto.Message) (n int) { - m := msg.(*DeprecatedResponse) - // deprecated_oneof - switch x := m.DeprecatedOneof.(type) { - case *DeprecatedResponse_DeprecatedOneofField: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.DeprecatedOneofField))) - n += len(x.DeprecatedOneofField) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterEnum("deprecated.DeprecatedEnum", DeprecatedEnum_name, DeprecatedEnum_value) proto.RegisterType((*DeprecatedRequest)(nil), "deprecated.DeprecatedRequest") diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/extension_base/extension_base.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/extension_base/extension_base.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/extension_base/extension_base.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/extension_base/extension_base.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type BaseMessage struct { Height *int32 `protobuf:"varint,1,opt,name=height" json:"height,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/extension_extra/extension_extra.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/extension_extra/extension_extra.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/extension_extra/extension_extra.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/extension_extra/extension_extra.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type ExtraMessage struct { Width *int32 `protobuf:"varint,1,opt,name=width" json:"width,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/extension_user/extension_user.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/extension_user/extension_user.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/extension_user/extension_user.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/extension_user/extension_user.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type UserMessage struct { Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/grpc/grpc_empty.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/grpc/grpc_empty.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/grpc/grpc_empty.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/grpc/grpc_empty.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("grpc/grpc_empty.proto", fileDescriptor_c580a37f1c90e9b1) } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/grpc/grpc.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/grpc/grpc.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/grpc/grpc.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/grpc/grpc.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type SimpleRequest struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/import_public/a.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/import_public/a.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/import_public/a.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/import_public/a.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package const Default_M_DefaultField = sub.Default_M_DefaultField diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/import_public/b.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/import_public/b.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/import_public/b.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/import_public/b.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Local struct { M *sub.M `protobuf:"bytes,1,opt,name=m" json:"m,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/import_public/importing/importing.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/import_public/importing/importing.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/import_public/importing/importing.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/import_public/importing/importing.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M struct { // Message type defined in a file publicly imported by a file we import. diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/import_public/sub/a.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/import_public/sub/a.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/import_public/sub/a.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/import_public/sub/a.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type E int32 @@ -176,10 +176,10 @@ } type M_OneofInt32 struct { - OneofInt32 int32 `protobuf:"varint,2,opt,name=oneof_int32,json=oneofInt32,oneof"` + OneofInt32 int32 `protobuf:"varint,2,opt,name=oneof_int32,json=oneofInt32,oneof" json:"oneof_int32,omitempty"` } type M_OneofInt64 struct { - OneofInt64 int64 `protobuf:"varint,3,opt,name=oneof_int64,json=oneofInt64,oneof"` + OneofInt64 int64 `protobuf:"varint,3,opt,name=oneof_int64,json=oneofInt64,oneof" json:"oneof_int64,omitempty"` } func (*M_OneofInt32) isM_OneofField() {} @@ -227,70 +227,14 @@ return Default_M_DefaultField } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*M) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _M_OneofMarshaler, _M_OneofUnmarshaler, _M_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*M) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*M_OneofInt32)(nil), (*M_OneofInt64)(nil), } } -func _M_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*M) - // oneof_field - switch x := m.OneofField.(type) { - case *M_OneofInt32: - _ = b.EncodeVarint(2<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.OneofInt32)) - case *M_OneofInt64: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.OneofInt64)) - case nil: - default: - return fmt.Errorf("M.OneofField has unexpected type %T", x) - } - return nil -} - -func _M_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*M) - switch tag { - case 2: // oneof_field.oneof_int32 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.OneofField = &M_OneofInt32{int32(x)} - return true, err - case 3: // oneof_field.oneof_int64 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.OneofField = &M_OneofInt64{int64(x)} - return true, err - default: - return false, nil - } -} - -func _M_OneofSizer(msg proto.Message) (n int) { - m := msg.(*M) - // oneof_field - switch x := m.OneofField.(type) { - case *M_OneofInt32: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.OneofInt32)) - case *M_OneofInt64: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.OneofInt64)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type M_Grouping struct { GroupField *string `protobuf:"bytes,5,opt,name=group_field,json=groupField" json:"group_field,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -368,10 +312,10 @@ } type M_Submessage_SubmessageOneofInt32 struct { - SubmessageOneofInt32 int32 `protobuf:"varint,1,opt,name=submessage_oneof_int32,json=submessageOneofInt32,oneof"` + SubmessageOneofInt32 int32 `protobuf:"varint,1,opt,name=submessage_oneof_int32,json=submessageOneofInt32,oneof" json:"submessage_oneof_int32,omitempty"` } type M_Submessage_SubmessageOneofInt64 struct { - SubmessageOneofInt64 int64 `protobuf:"varint,2,opt,name=submessage_oneof_int64,json=submessageOneofInt64,oneof"` + SubmessageOneofInt64 int64 `protobuf:"varint,2,opt,name=submessage_oneof_int64,json=submessageOneofInt64,oneof" json:"submessage_oneof_int64,omitempty"` } func (*M_Submessage_SubmessageOneofInt32) isM_Submessage_SubmessageOneofField() {} @@ -398,70 +342,14 @@ return 0 } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*M_Submessage) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _M_Submessage_OneofMarshaler, _M_Submessage_OneofUnmarshaler, _M_Submessage_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*M_Submessage) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*M_Submessage_SubmessageOneofInt32)(nil), (*M_Submessage_SubmessageOneofInt64)(nil), } } -func _M_Submessage_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*M_Submessage) - // submessage_oneof_field - switch x := m.SubmessageOneofField.(type) { - case *M_Submessage_SubmessageOneofInt32: - _ = b.EncodeVarint(1<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.SubmessageOneofInt32)) - case *M_Submessage_SubmessageOneofInt64: - _ = b.EncodeVarint(2<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.SubmessageOneofInt64)) - case nil: - default: - return fmt.Errorf("M_Submessage.SubmessageOneofField has unexpected type %T", x) - } - return nil -} - -func _M_Submessage_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*M_Submessage) - switch tag { - case 1: // submessage_oneof_field.submessage_oneof_int32 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.SubmessageOneofField = &M_Submessage_SubmessageOneofInt32{int32(x)} - return true, err - case 2: // submessage_oneof_field.submessage_oneof_int64 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.SubmessageOneofField = &M_Submessage_SubmessageOneofInt64{int64(x)} - return true, err - default: - return false, nil - } -} - -func _M_Submessage_OneofSizer(msg proto.Message) (n int) { - m := msg.(*M_Submessage) - // submessage_oneof_field - switch x := m.SubmessageOneofField.(type) { - case *M_Submessage_SubmessageOneofInt32: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.SubmessageOneofInt32)) - case *M_Submessage_SubmessageOneofInt64: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.SubmessageOneofInt64)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - var E_ExtensionField = &proto.ExtensionDesc{ ExtendedType: (*M2)(nil), ExtensionType: (*string)(nil), diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/import_public/sub/b.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/import_public/sub/b.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/import_public/sub/b.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/import_public/sub/b.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M2 struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/fmt/m.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/fmt/m.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/fmt/m.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/fmt/m.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_a_1/m1.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_a_1/m1.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_a_1/m1.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_a_1/m1.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type E1 int32 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_a_1/m2.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_a_1/m2.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_a_1/m2.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_a_1/m2.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M2 struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_a_2/m3.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_a_2/m3.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_a_2/m3.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_a_2/m3.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M3 struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_a_2/m4.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_a_2/m4.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_a_2/m4.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_a_2/m4.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M4 struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_b_1/m1.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_b_1/m1.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_b_1/m1.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_b_1/m1.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M1 struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_b_1/m2.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_b_1/m2.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_b_1/m2.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_b_1/m2.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M2 struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_import_a1m1.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_import_a1m1.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_import_a1m1.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_import_a1m1.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type A1M1 struct { F *test_a_1.M1 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_import_a1m2.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_import_a1m2.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_import_a1m2.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_import_a1m2.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type A1M2 struct { F *test_a_1.M2 `protobuf:"bytes,1,opt,name=f,proto3" json:"f,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_import_all.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_import_all.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/imports/test_import_all.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/imports/test_import_all.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type All struct { Am1 *test_a_1.M1 `protobuf:"bytes,1,opt,name=am1,proto3" json:"am1,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/my_test/test.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/my_test/test.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/my_test/test.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/my_test/test.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type HatType int32 @@ -743,34 +743,34 @@ } type Communique_Number struct { - Number int32 `protobuf:"varint,5,opt,name=number,oneof"` + Number int32 `protobuf:"varint,5,opt,name=number,oneof" json:"number,omitempty"` } type Communique_Name struct { - Name string `protobuf:"bytes,6,opt,name=name,oneof"` + Name string `protobuf:"bytes,6,opt,name=name,oneof" json:"name,omitempty"` } type Communique_Data struct { - Data []byte `protobuf:"bytes,7,opt,name=data,oneof"` + Data []byte `protobuf:"bytes,7,opt,name=data,oneof" json:"data,omitempty"` } type Communique_TempC struct { - TempC float64 `protobuf:"fixed64,8,opt,name=temp_c,json=tempC,oneof"` + TempC float64 `protobuf:"fixed64,8,opt,name=temp_c,json=tempC,oneof" json:"temp_c,omitempty"` } type Communique_Height struct { - Height float32 `protobuf:"fixed32,9,opt,name=height,oneof"` + Height float32 `protobuf:"fixed32,9,opt,name=height,oneof" json:"height,omitempty"` } type Communique_Today struct { - Today Days `protobuf:"varint,10,opt,name=today,enum=my.test.Days,oneof"` + Today Days `protobuf:"varint,10,opt,name=today,enum=my.test.Days,oneof" json:"today,omitempty"` } type Communique_Maybe struct { - Maybe bool `protobuf:"varint,11,opt,name=maybe,oneof"` + Maybe bool `protobuf:"varint,11,opt,name=maybe,oneof" json:"maybe,omitempty"` } type Communique_Delta_ struct { - Delta int32 `protobuf:"zigzag32,12,opt,name=delta,oneof"` + Delta int32 `protobuf:"zigzag32,12,opt,name=delta,oneof" json:"delta,omitempty"` } type Communique_Msg struct { - Msg *Reply `protobuf:"bytes,16,opt,name=msg,oneof"` + Msg *Reply `protobuf:"bytes,16,opt,name=msg,oneof" json:"msg,omitempty"` } type Communique_Somegroup struct { - Somegroup *Communique_SomeGroup `protobuf:"group,14,opt,name=SomeGroup,json=somegroup,oneof"` + Somegroup *Communique_SomeGroup `protobuf:"group,14,opt,name=SomeGroup,json=somegroup,oneof" json:"somegroup,omitempty"` } func (*Communique_Number) isCommunique_Union() {} @@ -868,9 +868,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Communique) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Communique_OneofMarshaler, _Communique_OneofUnmarshaler, _Communique_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Communique) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Communique_Number)(nil), (*Communique_Name)(nil), (*Communique_Data)(nil), @@ -884,182 +884,6 @@ } } -func _Communique_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Communique) - // union - switch x := m.Union.(type) { - case *Communique_Number: - _ = b.EncodeVarint(5<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Number)) - case *Communique_Name: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Name) - case *Communique_Data: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Data) - case *Communique_TempC: - _ = b.EncodeVarint(8<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.TempC)) - case *Communique_Height: - _ = b.EncodeVarint(9<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Height))) - case *Communique_Today: - _ = b.EncodeVarint(10<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Today)) - case *Communique_Maybe: - t := uint64(0) - if x.Maybe { - t = 1 - } - _ = b.EncodeVarint(11<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *Communique_Delta_: - _ = b.EncodeVarint(12<<3 | proto.WireVarint) - _ = b.EncodeZigzag32(uint64(x.Delta)) - case *Communique_Msg: - _ = b.EncodeVarint(16<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Msg); err != nil { - return err - } - case *Communique_Somegroup: - _ = b.EncodeVarint(14<<3 | proto.WireStartGroup) - if err := b.Marshal(x.Somegroup); err != nil { - return err - } - _ = b.EncodeVarint(14<<3 | proto.WireEndGroup) - case nil: - default: - return fmt.Errorf("Communique.Union has unexpected type %T", x) - } - return nil -} - -func _Communique_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Communique) - switch tag { - case 5: // union.number - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Communique_Number{int32(x)} - return true, err - case 6: // union.name - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Union = &Communique_Name{x} - return true, err - case 7: // union.data - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.Union = &Communique_Data{x} - return true, err - case 8: // union.temp_c - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.Union = &Communique_TempC{math.Float64frombits(x)} - return true, err - case 9: // union.height - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.Union = &Communique_Height{math.Float32frombits(uint32(x))} - return true, err - case 10: // union.today - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Communique_Today{Days(x)} - return true, err - case 11: // union.maybe - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &Communique_Maybe{x != 0} - return true, err - case 12: // union.delta - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag32() - m.Union = &Communique_Delta_{int32(x)} - return true, err - case 16: // union.msg - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Reply) - err := b.DecodeMessage(msg) - m.Union = &Communique_Msg{msg} - return true, err - case 14: // union.somegroup - if wire != proto.WireStartGroup { - return true, proto.ErrInternalBadWireType - } - msg := new(Communique_SomeGroup) - err := b.DecodeGroup(msg) - m.Union = &Communique_Somegroup{msg} - return true, err - default: - return false, nil - } -} - -func _Communique_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Communique) - // union - switch x := m.Union.(type) { - case *Communique_Number: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Number)) - case *Communique_Name: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Name))) - n += len(x.Name) - case *Communique_Data: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Data))) - n += len(x.Data) - case *Communique_TempC: - n += 1 // tag and wire - n += 8 - case *Communique_Height: - n += 1 // tag and wire - n += 4 - case *Communique_Today: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Today)) - case *Communique_Maybe: - n += 1 // tag and wire - n += 1 - case *Communique_Delta_: - n += 1 // tag and wire - n += proto.SizeVarint(uint64((uint32(x.Delta) << 1) ^ uint32((int32(x.Delta) >> 31)))) - case *Communique_Msg: - s := proto.Size(x.Msg) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Communique_Somegroup: - n += 1 // tag and wire - n += proto.Size(x.Somegroup) - n += 1 // tag and wire - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type Communique_SomeGroup struct { Member *string `protobuf:"bytes,15,opt,name=member" json:"member,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/proto3/proto3.pb.go golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/proto3/proto3.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogo/testdata/proto3/proto3.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogo/testdata/proto3/proto3.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -18,7 +18,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Request_Flavour int32 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogotypes/main.go golang-gogoprotobuf-1.3.1/protoc-gen-gogotypes/main.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/protoc-gen-gogotypes/main.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/protoc-gen-gogotypes/main.go 2020-05-17 12:22:58.000000000 +0000 @@ -57,7 +57,7 @@ if strings.HasSuffix(file.GetName(), "struct.proto") { // TODO struct can also get a compare method when // https://github.com/gogo/protobuf/issues/221 is fixed - continue + //continue } vanity.TurnOnCompareAll(file) } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/Readme.md golang-gogoprotobuf-1.3.1/Readme.md --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/Readme.md 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/Readme.md 2020-05-17 12:22:58.000000000 +0000 @@ -17,6 +17,18 @@ Keeping track of how up to date gogoprotobuf is relative to golang/protobuf is done in this issue +## Release v1.3.0 + +The project has updated to release v1.3.0. Check out the release notes here. + +With this new release comes a new internal library version. This means any newly generated *pb.go files generated with the v1.3.0 library will not be compatible with the old library version (v1.2.1). However, current *pb.go files (generated with v1.2.1) should still work with the new library. + +Please make sure you manage your dependencies correctly when upgrading your project. If you are still using v1.2.1 and you update your dependencies, one of which could include a new *pb.go (generated with v1.3.0), you could get a compile time error. + +Our upstream repo, golang/protobuf, also had to go through this process in order to update their library version. +Here is a link explaining hermetic builds. + + ## Users These projects use gogoprotobuf: @@ -50,6 +62,7 @@ - cortex - sample proto file - Apache SkyWalking APM - Istio telemetry receiver based on Mixer bypass protocol - Hyperledger Burrow - a permissioned DLT framework + - IOV Weave - a blockchain framework - sample proto files Please let us know if you are using gogoprotobuf by posting on our GoogleGroup. diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/asymetric-issue125/asym.pb.go golang-gogoprotobuf-1.3.1/test/asymetric-issue125/asym.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/asymetric-issue125/asym.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/asymetric-issue125/asym.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M struct { Arr []MyType `protobuf:"bytes,1,rep,name=arr,customtype=MyType" json:"arr"` @@ -45,7 +45,7 @@ return xxx_messageInfo_M.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -242,7 +242,7 @@ func (m *M) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -250,40 +250,50 @@ } func (m *M) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *M) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Arr) > 0 { - for _, msg := range m.Arr { - dAtA[i] = 0xa - i++ - i = encodeVarintAsym(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Arr) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Arr[iNdEx].Size() + i -= size + if _, err := m.Arr[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintAsym(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintAsym(dAtA []byte, offset int, v uint64) int { + offset -= sovAsym(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedM(r randyAsym, easy bool) *M { this := &M{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.Arr = make([]MyType, v1) for i := 0; i < v1; i++ { @@ -539,6 +549,7 @@ func skipAsym(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -570,10 +581,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -594,55 +603,30 @@ return 0, ErrInvalidLengthAsym } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthAsym - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowAsym - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipAsym(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthAsym - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupAsym + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthAsym + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthAsym = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowAsym = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthAsym = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowAsym = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupAsym = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/cachedsize/cachedsize.pb.go golang-gogoprotobuf-1.3.1/test/cachedsize/cachedsize.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/cachedsize/cachedsize.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/cachedsize/cachedsize.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Foo struct { Field1 *Bar `protobuf:"bytes,1,opt,name=field1" json:"field1,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/casttype/combos/both/casttype.pb.go golang-gogoprotobuf-1.3.1/test/casttype/combos/both/casttype.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/casttype/combos/both/casttype.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/casttype/combos/both/casttype.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -31,7 +31,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Castaway struct { Int32Ptr *int32 `protobuf:"varint,1,opt,name=Int32Ptr,casttype=int32" json:"Int32Ptr,omitempty"` @@ -68,7 +68,7 @@ return xxx_messageInfo_Castaway.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -107,7 +107,7 @@ return xxx_messageInfo_Wilson.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1075,7 +1075,7 @@ func (m *Castaway) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1083,167 +1083,172 @@ } func (m *Castaway) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Castaway) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Int32Ptr != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(*m.Int32Ptr)) - } - dAtA[i] = 0x10 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(m.Int32)) - if m.MyUint64Ptr != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(*m.MyUint64Ptr)) - } - dAtA[i] = 0x20 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(m.MyUint64)) - if m.MyFloat32Ptr != nil { - dAtA[i] = 0x2d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.MyFloat32Ptr)))) - i += 4 - } - dAtA[i] = 0x35 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.MyFloat32)))) - i += 4 - if m.MyFloat64Ptr != nil { - dAtA[i] = 0x39 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.MyFloat64Ptr)))) - i += 8 - } - dAtA[i] = 0x41 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.MyFloat64)))) - i += 8 - if m.MyBytes != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintCasttype(dAtA, i, uint64(len(m.MyBytes))) - i += copy(dAtA[i:], m.MyBytes) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.NormalBytes != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(len(m.NormalBytes))) - i += copy(dAtA[i:], m.NormalBytes) + if m.String_ != nil { + i -= len(*m.String_) + copy(dAtA[i:], *m.String_) + i = encodeVarintCasttype(dAtA, i, uint64(len(*m.String_))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } - if len(m.MyUint64S) > 0 { - for _, num := range m.MyUint64S { - dAtA[i] = 0x58 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(num)) + if len(m.MyEmbeddedMap) > 0 { + for k := range m.MyEmbeddedMap { + v := m.MyEmbeddedMap[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCasttype(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + i = encodeVarintCasttype(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintCasttype(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.MyMap) > 0 { - for k := range m.MyMap { - dAtA[i] = 0x62 - i++ - v := m.MyMap[k] - mapSize := 1 + len(k) + sovCasttype(uint64(len(k))) + 1 + sovCasttype(uint64(v)) - i = encodeVarintCasttype(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintCasttype(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(v)) + if len(m.MyNullableMap) > 0 { + for k := range m.MyNullableMap { + v := m.MyNullableMap[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCasttype(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i = encodeVarintCasttype(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintCasttype(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } if len(m.MyCustomMap) > 0 { for k := range m.MyCustomMap { - dAtA[i] = 0x6a - i++ v := m.MyCustomMap[k] - mapSize := 1 + len(k) + sovCasttype(uint64(len(k))) + 1 + sovCasttype(uint64(v)) - i = encodeVarintCasttype(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintCasttype(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ + baseI := i i = encodeVarintCasttype(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintCasttype(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintCasttype(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } - if len(m.MyNullableMap) > 0 { - for k := range m.MyNullableMap { - dAtA[i] = 0x72 - i++ - v := m.MyNullableMap[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovCasttype(uint64(msgSize)) - } - mapSize := 1 + sovCasttype(uint64(k)) + msgSize - i = encodeVarintCasttype(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(v.Size())) - n1, err1 := v.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 - } - i += n1 - } + if len(m.MyMap) > 0 { + for k := range m.MyMap { + v := m.MyMap[k] + baseI := i + i = encodeVarintCasttype(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintCasttype(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintCasttype(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.MyEmbeddedMap) > 0 { - for k := range m.MyEmbeddedMap { - dAtA[i] = 0x7a - i++ - v := m.MyEmbeddedMap[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovCasttype(uint64(msgSize)) - } - mapSize := 1 + sovCasttype(uint64(k)) + msgSize - i = encodeVarintCasttype(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintCasttype(dAtA, i, uint64((&v).Size())) - n2, err2 := (&v).MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 - } - i += n2 + if len(m.MyUint64S) > 0 { + for iNdEx := len(m.MyUint64S) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintCasttype(dAtA, i, uint64(m.MyUint64S[iNdEx])) + i-- + dAtA[i] = 0x58 } } - if m.String_ != nil { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(len(*m.String_))) - i += copy(dAtA[i:], *m.String_) + if m.NormalBytes != nil { + i -= len(m.NormalBytes) + copy(dAtA[i:], m.NormalBytes) + i = encodeVarintCasttype(dAtA, i, uint64(len(m.NormalBytes))) + i-- + dAtA[i] = 0x52 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.MyBytes != nil { + i -= len(m.MyBytes) + copy(dAtA[i:], m.MyBytes) + i = encodeVarintCasttype(dAtA, i, uint64(len(m.MyBytes))) + i-- + dAtA[i] = 0x4a + } + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.MyFloat64)))) + i-- + dAtA[i] = 0x41 + if m.MyFloat64Ptr != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.MyFloat64Ptr)))) + i-- + dAtA[i] = 0x39 + } + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.MyFloat32)))) + i-- + dAtA[i] = 0x35 + if m.MyFloat32Ptr != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.MyFloat32Ptr)))) + i-- + dAtA[i] = 0x2d + } + i = encodeVarintCasttype(dAtA, i, uint64(m.MyUint64)) + i-- + dAtA[i] = 0x20 + if m.MyUint64Ptr != nil { + i = encodeVarintCasttype(dAtA, i, uint64(*m.MyUint64Ptr)) + i-- + dAtA[i] = 0x18 + } + i = encodeVarintCasttype(dAtA, i, uint64(m.Int32)) + i-- + dAtA[i] = 0x10 + if m.Int32Ptr != nil { + i = encodeVarintCasttype(dAtA, i, uint64(*m.Int32Ptr)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *Wilson) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1251,33 +1256,41 @@ } func (m *Wilson) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Wilson) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Int64 != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintCasttype(dAtA, i, uint64(*m.Int64)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintCasttype(dAtA []byte, offset int, v uint64) int { + offset -= sovCasttype(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedCastaway(r randyCasttype, easy bool) *Castaway { this := &Castaway{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := int32(r.Int63()) if r.Intn(2) == 0 { v1 *= -1 @@ -1288,12 +1301,12 @@ if r.Intn(2) == 0 { this.Int32 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) this.MyUint64Ptr = &v2 } this.MyUint64 = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := github_com_gogo_protobuf_test_casttype.MyFloat32Type(r.Float32()) if r.Intn(2) == 0 { v3 *= -1 @@ -1304,7 +1317,7 @@ if r.Intn(2) == 0 { this.MyFloat32 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := github_com_gogo_protobuf_test_casttype.MyFloat64Type(r.Float64()) if r.Intn(2) == 0 { v4 *= -1 @@ -1315,28 +1328,28 @@ if r.Intn(2) == 0 { this.MyFloat64 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(100) this.MyBytes = make(github_com_gogo_protobuf_test_casttype.Bytes, v5) for i := 0; i < v5; i++ { this.MyBytes[i] = byte(r.Intn(256)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(100) this.NormalBytes = make([]byte, v6) for i := 0; i < v6; i++ { this.NormalBytes[i] = byte(r.Intn(256)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(10) this.MyUint64S = make([]github_com_gogo_protobuf_test_casttype.MyUint64Type, v7) for i := 0; i < v7; i++ { this.MyUint64S[i] = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(10) this.MyMap = make(github_com_gogo_protobuf_test_casttype.MyMapType) for i := 0; i < v8; i++ { @@ -1344,7 +1357,7 @@ this.MyMap[v9] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.MyCustomMap = make(map[github_com_gogo_protobuf_test_casttype.MyStringType]github_com_gogo_protobuf_test_casttype.MyUint64Type) for i := 0; i < v10; i++ { @@ -1352,21 +1365,21 @@ this.MyCustomMap[v11] = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := r.Intn(10) this.MyNullableMap = make(map[github_com_gogo_protobuf_test_casttype.MyInt32Type]*Wilson) for i := 0; i < v12; i++ { this.MyNullableMap[github_com_gogo_protobuf_test_casttype.MyInt32Type(int32(r.Int31()))] = NewPopulatedWilson(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.MyEmbeddedMap = make(map[github_com_gogo_protobuf_test_casttype.MyInt32Type]Wilson) for i := 0; i < v13; i++ { this.MyEmbeddedMap[github_com_gogo_protobuf_test_casttype.MyInt32Type(int32(r.Int31()))] = *NewPopulatedWilson(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := github_com_gogo_protobuf_test_casttype.MyStringType(randStringCasttype(r)) this.String_ = &v14 } @@ -1378,7 +1391,7 @@ func NewPopulatedWilson(r randyCasttype, easy bool) *Wilson { this := &Wilson{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := int64(r.Int63()) if r.Intn(2) == 0 { v15 *= -1 @@ -2540,6 +2553,7 @@ func skipCasttype(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -2571,10 +2585,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -2595,55 +2607,30 @@ return 0, ErrInvalidLengthCasttype } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthCasttype - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCasttype - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipCasttype(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthCasttype - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupCasttype + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthCasttype + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthCasttype = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowCasttype = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthCasttype = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowCasttype = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupCasttype = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/casttype/combos/marshaler/casttype.pb.go golang-gogoprotobuf-1.3.1/test/casttype/combos/marshaler/casttype.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/casttype/combos/marshaler/casttype.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/casttype/combos/marshaler/casttype.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -30,7 +30,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Castaway struct { Int32Ptr *int32 `protobuf:"varint,1,opt,name=Int32Ptr,casttype=int32" json:"Int32Ptr,omitempty"` @@ -67,7 +67,7 @@ return xxx_messageInfo_Castaway.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -106,7 +106,7 @@ return xxx_messageInfo_Wilson.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1074,7 +1074,7 @@ func (m *Castaway) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1082,167 +1082,172 @@ } func (m *Castaway) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Castaway) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Int32Ptr != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(*m.Int32Ptr)) - } - dAtA[i] = 0x10 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(m.Int32)) - if m.MyUint64Ptr != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(*m.MyUint64Ptr)) - } - dAtA[i] = 0x20 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(m.MyUint64)) - if m.MyFloat32Ptr != nil { - dAtA[i] = 0x2d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.MyFloat32Ptr)))) - i += 4 - } - dAtA[i] = 0x35 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.MyFloat32)))) - i += 4 - if m.MyFloat64Ptr != nil { - dAtA[i] = 0x39 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.MyFloat64Ptr)))) - i += 8 - } - dAtA[i] = 0x41 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.MyFloat64)))) - i += 8 - if m.MyBytes != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintCasttype(dAtA, i, uint64(len(m.MyBytes))) - i += copy(dAtA[i:], m.MyBytes) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.NormalBytes != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(len(m.NormalBytes))) - i += copy(dAtA[i:], m.NormalBytes) + if m.String_ != nil { + i -= len(*m.String_) + copy(dAtA[i:], *m.String_) + i = encodeVarintCasttype(dAtA, i, uint64(len(*m.String_))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } - if len(m.MyUint64S) > 0 { - for _, num := range m.MyUint64S { - dAtA[i] = 0x58 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(num)) + if len(m.MyEmbeddedMap) > 0 { + for k := range m.MyEmbeddedMap { + v := m.MyEmbeddedMap[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCasttype(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + i = encodeVarintCasttype(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintCasttype(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.MyMap) > 0 { - for k := range m.MyMap { - dAtA[i] = 0x62 - i++ - v := m.MyMap[k] - mapSize := 1 + len(k) + sovCasttype(uint64(len(k))) + 1 + sovCasttype(uint64(v)) - i = encodeVarintCasttype(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintCasttype(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(v)) + if len(m.MyNullableMap) > 0 { + for k := range m.MyNullableMap { + v := m.MyNullableMap[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCasttype(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i = encodeVarintCasttype(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintCasttype(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } if len(m.MyCustomMap) > 0 { for k := range m.MyCustomMap { - dAtA[i] = 0x6a - i++ v := m.MyCustomMap[k] - mapSize := 1 + len(k) + sovCasttype(uint64(len(k))) + 1 + sovCasttype(uint64(v)) - i = encodeVarintCasttype(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintCasttype(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ + baseI := i i = encodeVarintCasttype(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintCasttype(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintCasttype(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } - if len(m.MyNullableMap) > 0 { - for k := range m.MyNullableMap { - dAtA[i] = 0x72 - i++ - v := m.MyNullableMap[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovCasttype(uint64(msgSize)) - } - mapSize := 1 + sovCasttype(uint64(k)) + msgSize - i = encodeVarintCasttype(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(v.Size())) - n1, err1 := v.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 - } - i += n1 - } + if len(m.MyMap) > 0 { + for k := range m.MyMap { + v := m.MyMap[k] + baseI := i + i = encodeVarintCasttype(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintCasttype(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintCasttype(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.MyEmbeddedMap) > 0 { - for k := range m.MyEmbeddedMap { - dAtA[i] = 0x7a - i++ - v := m.MyEmbeddedMap[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovCasttype(uint64(msgSize)) - } - mapSize := 1 + sovCasttype(uint64(k)) + msgSize - i = encodeVarintCasttype(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintCasttype(dAtA, i, uint64((&v).Size())) - n2, err2 := (&v).MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 - } - i += n2 + if len(m.MyUint64S) > 0 { + for iNdEx := len(m.MyUint64S) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintCasttype(dAtA, i, uint64(m.MyUint64S[iNdEx])) + i-- + dAtA[i] = 0x58 } } - if m.String_ != nil { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintCasttype(dAtA, i, uint64(len(*m.String_))) - i += copy(dAtA[i:], *m.String_) + if m.NormalBytes != nil { + i -= len(m.NormalBytes) + copy(dAtA[i:], m.NormalBytes) + i = encodeVarintCasttype(dAtA, i, uint64(len(m.NormalBytes))) + i-- + dAtA[i] = 0x52 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.MyBytes != nil { + i -= len(m.MyBytes) + copy(dAtA[i:], m.MyBytes) + i = encodeVarintCasttype(dAtA, i, uint64(len(m.MyBytes))) + i-- + dAtA[i] = 0x4a + } + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.MyFloat64)))) + i-- + dAtA[i] = 0x41 + if m.MyFloat64Ptr != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.MyFloat64Ptr)))) + i-- + dAtA[i] = 0x39 } - return i, nil + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.MyFloat32)))) + i-- + dAtA[i] = 0x35 + if m.MyFloat32Ptr != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.MyFloat32Ptr)))) + i-- + dAtA[i] = 0x2d + } + i = encodeVarintCasttype(dAtA, i, uint64(m.MyUint64)) + i-- + dAtA[i] = 0x20 + if m.MyUint64Ptr != nil { + i = encodeVarintCasttype(dAtA, i, uint64(*m.MyUint64Ptr)) + i-- + dAtA[i] = 0x18 + } + i = encodeVarintCasttype(dAtA, i, uint64(m.Int32)) + i-- + dAtA[i] = 0x10 + if m.Int32Ptr != nil { + i = encodeVarintCasttype(dAtA, i, uint64(*m.Int32Ptr)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil } func (m *Wilson) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1250,33 +1255,41 @@ } func (m *Wilson) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Wilson) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Int64 != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintCasttype(dAtA, i, uint64(*m.Int64)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintCasttype(dAtA []byte, offset int, v uint64) int { + offset -= sovCasttype(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedCastaway(r randyCasttype, easy bool) *Castaway { this := &Castaway{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := int32(r.Int63()) if r.Intn(2) == 0 { v1 *= -1 @@ -1287,12 +1300,12 @@ if r.Intn(2) == 0 { this.Int32 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) this.MyUint64Ptr = &v2 } this.MyUint64 = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := github_com_gogo_protobuf_test_casttype.MyFloat32Type(r.Float32()) if r.Intn(2) == 0 { v3 *= -1 @@ -1303,7 +1316,7 @@ if r.Intn(2) == 0 { this.MyFloat32 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := github_com_gogo_protobuf_test_casttype.MyFloat64Type(r.Float64()) if r.Intn(2) == 0 { v4 *= -1 @@ -1314,28 +1327,28 @@ if r.Intn(2) == 0 { this.MyFloat64 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(100) this.MyBytes = make(github_com_gogo_protobuf_test_casttype.Bytes, v5) for i := 0; i < v5; i++ { this.MyBytes[i] = byte(r.Intn(256)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(100) this.NormalBytes = make([]byte, v6) for i := 0; i < v6; i++ { this.NormalBytes[i] = byte(r.Intn(256)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(10) this.MyUint64S = make([]github_com_gogo_protobuf_test_casttype.MyUint64Type, v7) for i := 0; i < v7; i++ { this.MyUint64S[i] = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(10) this.MyMap = make(github_com_gogo_protobuf_test_casttype.MyMapType) for i := 0; i < v8; i++ { @@ -1343,7 +1356,7 @@ this.MyMap[v9] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.MyCustomMap = make(map[github_com_gogo_protobuf_test_casttype.MyStringType]github_com_gogo_protobuf_test_casttype.MyUint64Type) for i := 0; i < v10; i++ { @@ -1351,21 +1364,21 @@ this.MyCustomMap[v11] = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := r.Intn(10) this.MyNullableMap = make(map[github_com_gogo_protobuf_test_casttype.MyInt32Type]*Wilson) for i := 0; i < v12; i++ { this.MyNullableMap[github_com_gogo_protobuf_test_casttype.MyInt32Type(int32(r.Int31()))] = NewPopulatedWilson(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.MyEmbeddedMap = make(map[github_com_gogo_protobuf_test_casttype.MyInt32Type]Wilson) for i := 0; i < v13; i++ { this.MyEmbeddedMap[github_com_gogo_protobuf_test_casttype.MyInt32Type(int32(r.Int31()))] = *NewPopulatedWilson(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := github_com_gogo_protobuf_test_casttype.MyStringType(randStringCasttype(r)) this.String_ = &v14 } @@ -1377,7 +1390,7 @@ func NewPopulatedWilson(r randyCasttype, easy bool) *Wilson { this := &Wilson{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := int64(r.Int63()) if r.Intn(2) == 0 { v15 *= -1 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/casttype/combos/neither/casttype.pb.go golang-gogoprotobuf-1.3.1/test/casttype/combos/neither/casttype.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/casttype/combos/neither/casttype.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/casttype/combos/neither/casttype.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,7 +29,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Castaway struct { Int32Ptr *int32 `protobuf:"varint,1,opt,name=Int32Ptr,casttype=int32" json:"Int32Ptr,omitempty"` @@ -1054,7 +1054,7 @@ } func NewPopulatedCastaway(r randyCasttype, easy bool) *Castaway { this := &Castaway{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := int32(r.Int63()) if r.Intn(2) == 0 { v1 *= -1 @@ -1065,12 +1065,12 @@ if r.Intn(2) == 0 { this.Int32 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) this.MyUint64Ptr = &v2 } this.MyUint64 = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := github_com_gogo_protobuf_test_casttype.MyFloat32Type(r.Float32()) if r.Intn(2) == 0 { v3 *= -1 @@ -1081,7 +1081,7 @@ if r.Intn(2) == 0 { this.MyFloat32 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := github_com_gogo_protobuf_test_casttype.MyFloat64Type(r.Float64()) if r.Intn(2) == 0 { v4 *= -1 @@ -1092,28 +1092,28 @@ if r.Intn(2) == 0 { this.MyFloat64 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(100) this.MyBytes = make(github_com_gogo_protobuf_test_casttype.Bytes, v5) for i := 0; i < v5; i++ { this.MyBytes[i] = byte(r.Intn(256)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(100) this.NormalBytes = make([]byte, v6) for i := 0; i < v6; i++ { this.NormalBytes[i] = byte(r.Intn(256)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(10) this.MyUint64S = make([]github_com_gogo_protobuf_test_casttype.MyUint64Type, v7) for i := 0; i < v7; i++ { this.MyUint64S[i] = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(10) this.MyMap = make(github_com_gogo_protobuf_test_casttype.MyMapType) for i := 0; i < v8; i++ { @@ -1121,7 +1121,7 @@ this.MyMap[v9] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.MyCustomMap = make(map[github_com_gogo_protobuf_test_casttype.MyStringType]github_com_gogo_protobuf_test_casttype.MyUint64Type) for i := 0; i < v10; i++ { @@ -1129,21 +1129,21 @@ this.MyCustomMap[v11] = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := r.Intn(10) this.MyNullableMap = make(map[github_com_gogo_protobuf_test_casttype.MyInt32Type]*Wilson) for i := 0; i < v12; i++ { this.MyNullableMap[github_com_gogo_protobuf_test_casttype.MyInt32Type(int32(r.Int31()))] = NewPopulatedWilson(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.MyEmbeddedMap = make(map[github_com_gogo_protobuf_test_casttype.MyInt32Type]Wilson) for i := 0; i < v13; i++ { this.MyEmbeddedMap[github_com_gogo_protobuf_test_casttype.MyInt32Type(int32(r.Int31()))] = *NewPopulatedWilson(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := github_com_gogo_protobuf_test_casttype.MyStringType(randStringCasttype(r)) this.String_ = &v14 } @@ -1155,7 +1155,7 @@ func NewPopulatedWilson(r randyCasttype, easy bool) *Wilson { this := &Wilson{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := int64(r.Int63()) if r.Intn(2) == 0 { v15 *= -1 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/casttype/combos/unmarshaler/casttype.pb.go golang-gogoprotobuf-1.3.1/test/casttype/combos/unmarshaler/casttype.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/casttype/combos/unmarshaler/casttype.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/casttype/combos/unmarshaler/casttype.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -31,7 +31,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Castaway struct { Int32Ptr *int32 `protobuf:"varint,1,opt,name=Int32Ptr,casttype=int32" json:"Int32Ptr,omitempty"` @@ -1056,7 +1056,7 @@ } func NewPopulatedCastaway(r randyCasttype, easy bool) *Castaway { this := &Castaway{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := int32(r.Int63()) if r.Intn(2) == 0 { v1 *= -1 @@ -1067,12 +1067,12 @@ if r.Intn(2) == 0 { this.Int32 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) this.MyUint64Ptr = &v2 } this.MyUint64 = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := github_com_gogo_protobuf_test_casttype.MyFloat32Type(r.Float32()) if r.Intn(2) == 0 { v3 *= -1 @@ -1083,7 +1083,7 @@ if r.Intn(2) == 0 { this.MyFloat32 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := github_com_gogo_protobuf_test_casttype.MyFloat64Type(r.Float64()) if r.Intn(2) == 0 { v4 *= -1 @@ -1094,28 +1094,28 @@ if r.Intn(2) == 0 { this.MyFloat64 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(100) this.MyBytes = make(github_com_gogo_protobuf_test_casttype.Bytes, v5) for i := 0; i < v5; i++ { this.MyBytes[i] = byte(r.Intn(256)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(100) this.NormalBytes = make([]byte, v6) for i := 0; i < v6; i++ { this.NormalBytes[i] = byte(r.Intn(256)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(10) this.MyUint64S = make([]github_com_gogo_protobuf_test_casttype.MyUint64Type, v7) for i := 0; i < v7; i++ { this.MyUint64S[i] = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(10) this.MyMap = make(github_com_gogo_protobuf_test_casttype.MyMapType) for i := 0; i < v8; i++ { @@ -1123,7 +1123,7 @@ this.MyMap[v9] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.MyCustomMap = make(map[github_com_gogo_protobuf_test_casttype.MyStringType]github_com_gogo_protobuf_test_casttype.MyUint64Type) for i := 0; i < v10; i++ { @@ -1131,21 +1131,21 @@ this.MyCustomMap[v11] = github_com_gogo_protobuf_test_casttype.MyUint64Type(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := r.Intn(10) this.MyNullableMap = make(map[github_com_gogo_protobuf_test_casttype.MyInt32Type]*Wilson) for i := 0; i < v12; i++ { this.MyNullableMap[github_com_gogo_protobuf_test_casttype.MyInt32Type(int32(r.Int31()))] = NewPopulatedWilson(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.MyEmbeddedMap = make(map[github_com_gogo_protobuf_test_casttype.MyInt32Type]Wilson) for i := 0; i < v13; i++ { this.MyEmbeddedMap[github_com_gogo_protobuf_test_casttype.MyInt32Type(int32(r.Int31()))] = *NewPopulatedWilson(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := github_com_gogo_protobuf_test_casttype.MyStringType(randStringCasttype(r)) this.String_ = &v14 } @@ -1157,7 +1157,7 @@ func NewPopulatedWilson(r randyCasttype, easy bool) *Wilson { this := &Wilson{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := int64(r.Int63()) if r.Intn(2) == 0 { v15 *= -1 @@ -2319,6 +2319,7 @@ func skipCasttype(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -2350,10 +2351,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -2374,55 +2373,30 @@ return 0, ErrInvalidLengthCasttype } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthCasttype - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCasttype - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipCasttype(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthCasttype - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupCasttype + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthCasttype + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthCasttype = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowCasttype = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthCasttype = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowCasttype = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupCasttype = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/castvalue/castvalue.pb.go golang-gogoprotobuf-1.3.1/test/castvalue/castvalue.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/castvalue/castvalue.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/castvalue/castvalue.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -28,7 +28,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Castaway struct { CastMapValueMessage map[int32]MyWilson `protobuf:"bytes,1,rep,name=CastMapValueMessage,castvalue=MyWilson,castvaluetype=castvalue.Wilson" json:"CastMapValueMessage" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` @@ -686,14 +686,14 @@ } func NewPopulatedCastaway(r randyCastvalue, easy bool) *Castaway { this := &Castaway{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.CastMapValueMessage = make(map[int32]MyWilson) for i := 0; i < v1; i++ { this.CastMapValueMessage[int32(r.Int31())] = (MyWilson)(*NewPopulatedWilson(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.CastMapValueMessageNullable = make(map[int32]*MyWilson) for i := 0; i < v2; i++ { @@ -708,7 +708,7 @@ func NewPopulatedWilson(r randyCastvalue, easy bool) *Wilson { this := &Wilson{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := int64(r.Int63()) if r.Intn(2) == 0 { v3 *= -1 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/castvalue/combos/both/castvalue.pb.go golang-gogoprotobuf-1.3.1/test/castvalue/combos/both/castvalue.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/castvalue/combos/both/castvalue.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/castvalue/combos/both/castvalue.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,7 +29,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Castaway struct { CastMapValueMessage map[int32]MyWilson `protobuf:"bytes,1,rep,name=CastMapValueMessage,castvalue=MyWilson,castvaluetype=castvalue.Wilson" json:"CastMapValueMessage" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` @@ -52,7 +52,7 @@ return xxx_messageInfo_Castaway.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -91,7 +91,7 @@ return xxx_messageInfo_Wilson.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -707,7 +707,7 @@ func (m *Castaway) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -715,72 +715,72 @@ } func (m *Castaway) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Castaway) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.CastMapValueMessage) > 0 { - for k := range m.CastMapValueMessage { - dAtA[i] = 0xa - i++ - v := m.CastMapValueMessage[k] - msgSize := 0 - if ((*Wilson)(&v)) != nil { - msgSize = ((*Wilson)(&v)).Size() - msgSize += 1 + sovCastvalue(uint64(msgSize)) - } - mapSize := 1 + sovCastvalue(uint64(k)) + msgSize - i = encodeVarintCastvalue(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintCastvalue(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintCastvalue(dAtA, i, uint64(((*Wilson)(&v)).Size())) - n1, err1 := ((*Wilson)(&v)).MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 - } - i += n1 - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.CastMapValueMessageNullable) > 0 { for k := range m.CastMapValueMessageNullable { - dAtA[i] = 0x12 - i++ v := m.CastMapValueMessageNullable[k] - msgSize := 0 + baseI := i if ((*Wilson)(v)) != nil { - msgSize = ((*Wilson)(v)).Size() - msgSize += 1 + sovCastvalue(uint64(msgSize)) + { + size, err := ((*Wilson)(v)).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCastvalue(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - mapSize := 1 + sovCastvalue(uint64(k)) + msgSize - i = encodeVarintCastvalue(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintCastvalue(dAtA, i, uint64(k)) - if ((*Wilson)(v)) != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintCastvalue(dAtA, i, uint64(((*Wilson)(v)).Size())) - n2, err2 := ((*Wilson)(v)).MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + i-- + dAtA[i] = 0x8 + i = encodeVarintCastvalue(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 + } + } + if len(m.CastMapValueMessage) > 0 { + for k := range m.CastMapValueMessage { + v := m.CastMapValueMessage[k] + baseI := i + { + size, err := ((*Wilson)(&v)).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n2 + i -= size + i = encodeVarintCastvalue(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x12 + i = encodeVarintCastvalue(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintCastvalue(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *Wilson) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -788,40 +788,48 @@ } func (m *Wilson) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Wilson) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Int64 != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintCastvalue(dAtA, i, uint64(*m.Int64)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintCastvalue(dAtA []byte, offset int, v uint64) int { + offset -= sovCastvalue(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedCastaway(r randyCastvalue, easy bool) *Castaway { this := &Castaway{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.CastMapValueMessage = make(map[int32]MyWilson) for i := 0; i < v1; i++ { this.CastMapValueMessage[int32(r.Int31())] = (MyWilson)(*NewPopulatedWilson(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.CastMapValueMessageNullable = make(map[int32]*MyWilson) for i := 0; i < v2; i++ { @@ -836,7 +844,7 @@ func NewPopulatedWilson(r randyCastvalue, easy bool) *Wilson { this := &Wilson{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := int64(r.Int63()) if r.Intn(2) == 0 { v3 *= -1 @@ -1388,6 +1396,7 @@ func skipCastvalue(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1419,10 +1428,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1443,55 +1450,30 @@ return 0, ErrInvalidLengthCastvalue } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthCastvalue - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCastvalue - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipCastvalue(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthCastvalue - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupCastvalue + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthCastvalue + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthCastvalue = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowCastvalue = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthCastvalue = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowCastvalue = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupCastvalue = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/castvalue/combos/marshaler/castvalue.pb.go golang-gogoprotobuf-1.3.1/test/castvalue/combos/marshaler/castvalue.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/castvalue/combos/marshaler/castvalue.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/castvalue/combos/marshaler/castvalue.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -28,7 +28,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Castaway struct { CastMapValueMessage map[int32]MyWilson `protobuf:"bytes,1,rep,name=CastMapValueMessage,castvalue=MyWilson,castvaluetype=castvalue.Wilson" json:"CastMapValueMessage" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` @@ -51,7 +51,7 @@ return xxx_messageInfo_Castaway.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -90,7 +90,7 @@ return xxx_messageInfo_Wilson.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -706,7 +706,7 @@ func (m *Castaway) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -714,72 +714,72 @@ } func (m *Castaway) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Castaway) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.CastMapValueMessage) > 0 { - for k := range m.CastMapValueMessage { - dAtA[i] = 0xa - i++ - v := m.CastMapValueMessage[k] - msgSize := 0 - if ((*Wilson)(&v)) != nil { - msgSize = ((*Wilson)(&v)).Size() - msgSize += 1 + sovCastvalue(uint64(msgSize)) - } - mapSize := 1 + sovCastvalue(uint64(k)) + msgSize - i = encodeVarintCastvalue(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintCastvalue(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintCastvalue(dAtA, i, uint64(((*Wilson)(&v)).Size())) - n1, err1 := ((*Wilson)(&v)).MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 - } - i += n1 - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.CastMapValueMessageNullable) > 0 { for k := range m.CastMapValueMessageNullable { - dAtA[i] = 0x12 - i++ v := m.CastMapValueMessageNullable[k] - msgSize := 0 + baseI := i if ((*Wilson)(v)) != nil { - msgSize = ((*Wilson)(v)).Size() - msgSize += 1 + sovCastvalue(uint64(msgSize)) + { + size, err := ((*Wilson)(v)).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCastvalue(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - mapSize := 1 + sovCastvalue(uint64(k)) + msgSize - i = encodeVarintCastvalue(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintCastvalue(dAtA, i, uint64(k)) - if ((*Wilson)(v)) != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintCastvalue(dAtA, i, uint64(((*Wilson)(v)).Size())) - n2, err2 := ((*Wilson)(v)).MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + i-- + dAtA[i] = 0x8 + i = encodeVarintCastvalue(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 + } + } + if len(m.CastMapValueMessage) > 0 { + for k := range m.CastMapValueMessage { + v := m.CastMapValueMessage[k] + baseI := i + { + size, err := ((*Wilson)(&v)).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n2 + i -= size + i = encodeVarintCastvalue(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x12 + i = encodeVarintCastvalue(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintCastvalue(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *Wilson) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -787,40 +787,48 @@ } func (m *Wilson) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Wilson) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Int64 != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintCastvalue(dAtA, i, uint64(*m.Int64)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintCastvalue(dAtA []byte, offset int, v uint64) int { + offset -= sovCastvalue(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedCastaway(r randyCastvalue, easy bool) *Castaway { this := &Castaway{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.CastMapValueMessage = make(map[int32]MyWilson) for i := 0; i < v1; i++ { this.CastMapValueMessage[int32(r.Int31())] = (MyWilson)(*NewPopulatedWilson(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.CastMapValueMessageNullable = make(map[int32]*MyWilson) for i := 0; i < v2; i++ { @@ -835,7 +843,7 @@ func NewPopulatedWilson(r randyCastvalue, easy bool) *Wilson { this := &Wilson{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := int64(r.Int63()) if r.Intn(2) == 0 { v3 *= -1 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/castvalue/combos/unmarshaler/castvalue.pb.go golang-gogoprotobuf-1.3.1/test/castvalue/combos/unmarshaler/castvalue.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/castvalue/combos/unmarshaler/castvalue.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/castvalue/combos/unmarshaler/castvalue.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,7 +29,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Castaway struct { CastMapValueMessage map[int32]MyWilson `protobuf:"bytes,1,rep,name=CastMapValueMessage,castvalue=MyWilson,castvaluetype=castvalue.Wilson" json:"CastMapValueMessage" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` @@ -688,14 +688,14 @@ } func NewPopulatedCastaway(r randyCastvalue, easy bool) *Castaway { this := &Castaway{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.CastMapValueMessage = make(map[int32]MyWilson) for i := 0; i < v1; i++ { this.CastMapValueMessage[int32(r.Int31())] = (MyWilson)(*NewPopulatedWilson(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.CastMapValueMessageNullable = make(map[int32]*MyWilson) for i := 0; i < v2; i++ { @@ -710,7 +710,7 @@ func NewPopulatedWilson(r randyCastvalue, easy bool) *Wilson { this := &Wilson{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := int64(r.Int63()) if r.Intn(2) == 0 { v3 *= -1 @@ -1262,6 +1262,7 @@ func skipCastvalue(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1293,10 +1294,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1317,55 +1316,30 @@ return 0, ErrInvalidLengthCastvalue } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthCastvalue - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowCastvalue - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipCastvalue(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthCastvalue - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupCastvalue + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthCastvalue + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthCastvalue = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowCastvalue = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthCastvalue = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowCastvalue = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupCastvalue = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/combos/both/thetest.pb.go golang-gogoprotobuf-1.3.1/test/combos/both/thetest.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/combos/both/thetest.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/combos/both/thetest.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -34,7 +34,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type TheTestEnum int32 @@ -274,7 +274,7 @@ return xxx_messageInfo_NidOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -327,7 +327,7 @@ return xxx_messageInfo_NinOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -380,7 +380,7 @@ return xxx_messageInfo_NidRepNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -433,7 +433,7 @@ return xxx_messageInfo_NinRepNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -484,7 +484,7 @@ return xxx_messageInfo_NidRepPackedNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -535,7 +535,7 @@ return xxx_messageInfo_NinRepPackedNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -583,7 +583,7 @@ return xxx_messageInfo_NidOptStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -631,7 +631,7 @@ return xxx_messageInfo_NinOptStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -679,7 +679,7 @@ return xxx_messageInfo_NidRepStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -727,7 +727,7 @@ return xxx_messageInfo_NinRepStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -768,7 +768,7 @@ return xxx_messageInfo_NidEmbeddedStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -809,7 +809,7 @@ return xxx_messageInfo_NinEmbeddedStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -849,7 +849,7 @@ return xxx_messageInfo_NidNestedStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -889,7 +889,7 @@ return xxx_messageInfo_NinNestedStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -929,7 +929,7 @@ return xxx_messageInfo_NidOptCustom.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -968,7 +968,7 @@ return xxx_messageInfo_CustomDash.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1008,7 +1008,7 @@ return xxx_messageInfo_NinOptCustom.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1048,7 +1048,7 @@ return xxx_messageInfo_NidRepCustom.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1088,7 +1088,7 @@ return xxx_messageInfo_NinRepCustom.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1135,7 +1135,7 @@ return xxx_messageInfo_NinOptNativeUnion.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1182,7 +1182,7 @@ return xxx_messageInfo_NinOptStructUnion.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1223,7 +1223,7 @@ return xxx_messageInfo_NinEmbeddedStructUnion.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1264,7 +1264,7 @@ return xxx_messageInfo_NinNestedStructUnion.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1305,7 +1305,7 @@ return xxx_messageInfo_Tree.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1345,7 +1345,7 @@ return xxx_messageInfo_OrBranch.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1385,7 +1385,7 @@ return xxx_messageInfo_AndBranch.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1425,7 +1425,7 @@ return xxx_messageInfo_Leaf.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1466,7 +1466,7 @@ return xxx_messageInfo_DeepTree.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1505,7 +1505,7 @@ return xxx_messageInfo_ADeepBranch.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1545,7 +1545,7 @@ return xxx_messageInfo_AndDeepBranch.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1584,7 +1584,7 @@ return xxx_messageInfo_DeepLeaf.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1622,7 +1622,7 @@ return xxx_messageInfo_Nil.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1661,7 +1661,7 @@ return xxx_messageInfo_NidOptEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1702,7 +1702,7 @@ return xxx_messageInfo_NinOptEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1743,7 +1743,7 @@ return xxx_messageInfo_NidRepEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1784,7 +1784,7 @@ return xxx_messageInfo_NinRepEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1825,7 +1825,7 @@ return xxx_messageInfo_NinOptEnumDefault.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1891,7 +1891,7 @@ return xxx_messageInfo_AnotherNinOptEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1932,7 +1932,7 @@ return xxx_messageInfo_AnotherNinOptEnumDefault.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1998,7 +1998,7 @@ return xxx_messageInfo_Timer.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2047,7 +2047,7 @@ return xxx_messageInfo_MyExtendable.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2099,7 +2099,7 @@ return xxx_messageInfo_OtherExtenable.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2141,7 +2141,7 @@ return xxx_messageInfo_NestedDefinition.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2181,7 +2181,7 @@ return xxx_messageInfo_NestedDefinition_NestedMessage.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2222,7 +2222,7 @@ return xxx_messageInfo_NestedDefinition_NestedMessage_NestedNestedMsg.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2263,7 +2263,7 @@ return xxx_messageInfo_NestedScope.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2316,7 +2316,7 @@ return xxx_messageInfo_NinOptNativeDefault.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2475,7 +2475,7 @@ return xxx_messageInfo_CustomContainer.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2528,7 +2528,7 @@ return xxx_messageInfo_CustomNameNidOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2581,7 +2581,7 @@ return xxx_messageInfo_CustomNameNinOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2634,7 +2634,7 @@ return xxx_messageInfo_CustomNameNinRepNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2682,7 +2682,7 @@ return xxx_messageInfo_CustomNameNinStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2724,7 +2724,7 @@ return xxx_messageInfo_CustomNameCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2765,7 +2765,7 @@ return xxx_messageInfo_CustomNameNinEmbeddedStructUnion.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2805,7 +2805,7 @@ return xxx_messageInfo_CustomNameEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2860,7 +2860,7 @@ return xxx_messageInfo_NoExtensionsMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2898,7 +2898,7 @@ return xxx_messageInfo_Unrecognized.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2938,7 +2938,7 @@ return xxx_messageInfo_UnrecognizedWithInner.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2976,7 +2976,7 @@ return xxx_messageInfo_UnrecognizedWithInner_Inner.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3016,7 +3016,7 @@ return xxx_messageInfo_UnrecognizedWithEmbed.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3054,7 +3054,7 @@ return xxx_messageInfo_UnrecognizedWithEmbed_Embedded.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3094,7 +3094,7 @@ return xxx_messageInfo_Node.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3133,7 +3133,7 @@ return xxx_messageInfo_NonByteCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3172,7 +3172,7 @@ return xxx_messageInfo_NidOptNonByteCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3211,7 +3211,7 @@ return xxx_messageInfo_NinOptNonByteCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3250,7 +3250,7 @@ return xxx_messageInfo_NidRepNonByteCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3289,7 +3289,7 @@ return xxx_messageInfo_NinRepNonByteCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3328,7 +3328,7 @@ return xxx_messageInfo_ProtoType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -20799,16 +20799,16 @@ s = append(s, "Field2: "+fmt.Sprintf("%#v", this.Field2)+",\n") } if this.Field3 != nil { - vs := make([]*NidOptNative, len(this.Field3)) + vs := make([]NidOptNative, len(this.Field3)) for i := range vs { - vs[i] = &this.Field3[i] + vs[i] = this.Field3[i] } s = append(s, "Field3: "+fmt.Sprintf("%#v", vs)+",\n") } if this.Field4 != nil { - vs := make([]*NinOptNative, len(this.Field4)) + vs := make([]NinOptNative, len(this.Field4)) for i := range vs { - vs[i] = &this.Field4[i] + vs[i] = this.Field4[i] } s = append(s, "Field4: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -20819,9 +20819,9 @@ s = append(s, "Field7: "+fmt.Sprintf("%#v", this.Field7)+",\n") } if this.Field8 != nil { - vs := make([]*NidOptNative, len(this.Field8)) + vs := make([]NidOptNative, len(this.Field8)) for i := range vs { - vs[i] = &this.Field8[i] + vs[i] = this.Field8[i] } s = append(s, "Field8: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -20928,9 +20928,9 @@ s = append(s, "&test.NidNestedStruct{") s = append(s, "Field1: "+strings.Replace(this.Field1.GoString(), `&`, ``, 1)+",\n") if this.Field2 != nil { - vs := make([]*NidRepStruct, len(this.Field2)) + vs := make([]NidRepStruct, len(this.Field2)) for i := range vs { - vs[i] = &this.Field2[i] + vs[i] = this.Field2[i] } s = append(s, "Field2: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -22106,7 +22106,7 @@ func (m *NidOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22114,80 +22114,88 @@ } func (m *NidOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field3)) - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field4)) - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field5)) - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field6)) - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) - dAtA[i] = 0x40 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint64(m.Field8)<<1)^uint64((m.Field8>>63)))) - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9)) - i += 4 - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10)) - i += 4 - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11)) - i += 8 - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12)) - i += 8 - dAtA[i] = 0x68 - i++ - if m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i++ - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14))) - i += copy(dAtA[i:], m.Field14) if m.Field15 != nil { - dAtA[i] = 0x7a - i++ + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + i-- + dAtA[i] = 0x7a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.Field14) + copy(dAtA[i:], m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14))) + i-- + dAtA[i] = 0x72 + i-- + if m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - return i, nil + i-- + dAtA[i] = 0x68 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12)) + i-- + dAtA[i] = 0x61 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11)) + i-- + dAtA[i] = 0x59 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10)) + i-- + dAtA[i] = 0x55 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9)) + i-- + dAtA[i] = 0x4d + i = encodeVarintThetest(dAtA, i, uint64((uint64(m.Field8)<<1)^uint64((m.Field8>>63)))) + i-- + dAtA[i] = 0x40 + i = encodeVarintThetest(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) + i-- + dAtA[i] = 0x38 + i = encodeVarintThetest(dAtA, i, uint64(m.Field6)) + i-- + dAtA[i] = 0x30 + i = encodeVarintThetest(dAtA, i, uint64(m.Field5)) + i-- + dAtA[i] = 0x28 + i = encodeVarintThetest(dAtA, i, uint64(m.Field4)) + i-- + dAtA[i] = 0x20 + i = encodeVarintThetest(dAtA, i, uint64(m.Field3)) + i-- + dAtA[i] = 0x18 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) + i-- + dAtA[i] = 0x15 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *NinOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22195,108 +22203,116 @@ } func (m *NinOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 - } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field3 != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field4 != nil { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } - if m.Field5 != nil { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + if m.Field13 != nil { + i-- + if *m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + if m.Field12 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) + i-- + dAtA[i] = 0x61 } - if m.Field7 != nil { - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + if m.Field11 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) + i-- + dAtA[i] = 0x59 } - if m.Field8 != nil { - dAtA[i] = 0x40 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + if m.Field10 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) + i-- + dAtA[i] = 0x55 } if m.Field9 != nil { - dAtA[i] = 0x4d - i++ + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field9)) - i += 4 + i-- + dAtA[i] = 0x4d } - if m.Field10 != nil { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) - i += 4 + if m.Field8 != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + i-- + dAtA[i] = 0x40 } - if m.Field11 != nil { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) - i += 8 + if m.Field7 != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field12 != nil { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) - i += 8 + if m.Field6 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field13 != nil { - dAtA[i] = 0x68 - i++ - if *m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if m.Field5 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + i-- + dAtA[i] = 0x28 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field4 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + i-- + dAtA[i] = 0x20 } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field3 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 + } + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22304,161 +22320,150 @@ } func (m *NidRepNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x9 - i++ - f1 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f1)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field15) > 0 { + for iNdEx := len(m.Field15) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field15[iNdEx]) + copy(dAtA[i:], m.Field15[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15[iNdEx]))) + i-- + dAtA[i] = 0x7a } } - if len(m.Field2) > 0 { - for _, num := range m.Field2 { - dAtA[i] = 0x15 - i++ - f2 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f2)) - i += 4 + if len(m.Field14) > 0 { + for iNdEx := len(m.Field14) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field14[iNdEx]) + copy(dAtA[i:], m.Field14[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14[iNdEx]))) + i-- + dAtA[i] = 0x72 } } - if len(m.Field3) > 0 { - for _, num := range m.Field3 { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } } - if len(m.Field4) > 0 { - for _, num := range m.Field4 { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field12) > 0 { + for iNdEx := len(m.Field12) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12[iNdEx])) + i-- + dAtA[i] = 0x61 } } - if len(m.Field5) > 0 { - for _, num := range m.Field5 { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field11) > 0 { + for iNdEx := len(m.Field11) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11[iNdEx])) + i-- + dAtA[i] = 0x59 } } - if len(m.Field6) > 0 { - for _, num := range m.Field6 { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field10) > 0 { + for iNdEx := len(m.Field10) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10[iNdEx])) + i-- + dAtA[i] = 0x55 } } - if len(m.Field7) > 0 { - for _, num := range m.Field7 { - dAtA[i] = 0x38 - i++ - x3 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x3 >= 1<<7 { - dAtA[i] = uint8(uint64(x3)&0x7f | 0x80) - x3 >>= 7 - i++ - } - dAtA[i] = uint8(x3) - i++ + if len(m.Field9) > 0 { + for iNdEx := len(m.Field9) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9[iNdEx])) + i-- + dAtA[i] = 0x4d } } if len(m.Field8) > 0 { - for _, num := range m.Field8 { + for iNdEx := len(m.Field8) - 1; iNdEx >= 0; iNdEx-- { + x1 := (uint64(m.Field8[iNdEx]) << 1) ^ uint64((m.Field8[iNdEx] >> 63)) + i = encodeVarintThetest(dAtA, i, uint64(x1)) + i-- dAtA[i] = 0x40 - i++ - x4 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x4 >= 1<<7 { - dAtA[i] = uint8(uint64(x4)&0x7f | 0x80) - x4 >>= 7 - i++ - } - dAtA[i] = uint8(x4) - i++ } } - if len(m.Field9) > 0 { - for _, num := range m.Field9 { - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.Field7) > 0 { + for iNdEx := len(m.Field7) - 1; iNdEx >= 0; iNdEx-- { + x2 := (uint32(m.Field7[iNdEx]) << 1) ^ uint32((m.Field7[iNdEx] >> 31)) + i = encodeVarintThetest(dAtA, i, uint64(x2)) + i-- + dAtA[i] = 0x38 } } - if len(m.Field10) > 0 { - for _, num := range m.Field10 { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.Field6) > 0 { + for iNdEx := len(m.Field6) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field6[iNdEx])) + i-- + dAtA[i] = 0x30 } } - if len(m.Field11) > 0 { - for _, num := range m.Field11 { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field5) > 0 { + for iNdEx := len(m.Field5) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field5[iNdEx])) + i-- + dAtA[i] = 0x28 } } - if len(m.Field12) > 0 { - for _, num := range m.Field12 { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field4) > 0 { + for iNdEx := len(m.Field4) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field4[iNdEx])) + i-- + dAtA[i] = 0x20 } } - if len(m.Field13) > 0 { - for _, b := range m.Field13 { - dAtA[i] = 0x68 - i++ - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field3[iNdEx])) + i-- + dAtA[i] = 0x18 } } - if len(m.Field14) > 0 { - for _, s := range m.Field14 { - dAtA[i] = 0x72 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f3 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f3)) + i-- + dAtA[i] = 0x15 } } - if len(m.Field15) > 0 { - for _, b := range m.Field15 { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f4 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f4)) + i-- + dAtA[i] = 0x9 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22466,161 +22471,150 @@ } func (m *NinRepNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x9 - i++ - f5 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f5)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field15) > 0 { + for iNdEx := len(m.Field15) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field15[iNdEx]) + copy(dAtA[i:], m.Field15[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15[iNdEx]))) + i-- + dAtA[i] = 0x7a } } - if len(m.Field2) > 0 { - for _, num := range m.Field2 { - dAtA[i] = 0x15 - i++ - f6 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f6)) - i += 4 + if len(m.Field14) > 0 { + for iNdEx := len(m.Field14) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field14[iNdEx]) + copy(dAtA[i:], m.Field14[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14[iNdEx]))) + i-- + dAtA[i] = 0x72 } } - if len(m.Field3) > 0 { - for _, num := range m.Field3 { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } } - if len(m.Field4) > 0 { - for _, num := range m.Field4 { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field12) > 0 { + for iNdEx := len(m.Field12) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12[iNdEx])) + i-- + dAtA[i] = 0x61 } } - if len(m.Field5) > 0 { - for _, num := range m.Field5 { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field11) > 0 { + for iNdEx := len(m.Field11) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11[iNdEx])) + i-- + dAtA[i] = 0x59 } } - if len(m.Field6) > 0 { - for _, num := range m.Field6 { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field10) > 0 { + for iNdEx := len(m.Field10) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10[iNdEx])) + i-- + dAtA[i] = 0x55 } } - if len(m.Field7) > 0 { - for _, num := range m.Field7 { - dAtA[i] = 0x38 - i++ - x7 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x7 >= 1<<7 { - dAtA[i] = uint8(uint64(x7)&0x7f | 0x80) - x7 >>= 7 - i++ - } - dAtA[i] = uint8(x7) - i++ + if len(m.Field9) > 0 { + for iNdEx := len(m.Field9) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9[iNdEx])) + i-- + dAtA[i] = 0x4d } } if len(m.Field8) > 0 { - for _, num := range m.Field8 { + for iNdEx := len(m.Field8) - 1; iNdEx >= 0; iNdEx-- { + x5 := (uint64(m.Field8[iNdEx]) << 1) ^ uint64((m.Field8[iNdEx] >> 63)) + i = encodeVarintThetest(dAtA, i, uint64(x5)) + i-- dAtA[i] = 0x40 - i++ - x8 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x8 >= 1<<7 { - dAtA[i] = uint8(uint64(x8)&0x7f | 0x80) - x8 >>= 7 - i++ - } - dAtA[i] = uint8(x8) - i++ } } - if len(m.Field9) > 0 { - for _, num := range m.Field9 { - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.Field7) > 0 { + for iNdEx := len(m.Field7) - 1; iNdEx >= 0; iNdEx-- { + x6 := (uint32(m.Field7[iNdEx]) << 1) ^ uint32((m.Field7[iNdEx] >> 31)) + i = encodeVarintThetest(dAtA, i, uint64(x6)) + i-- + dAtA[i] = 0x38 } } - if len(m.Field10) > 0 { - for _, num := range m.Field10 { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.Field6) > 0 { + for iNdEx := len(m.Field6) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field6[iNdEx])) + i-- + dAtA[i] = 0x30 } } - if len(m.Field11) > 0 { - for _, num := range m.Field11 { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field5) > 0 { + for iNdEx := len(m.Field5) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field5[iNdEx])) + i-- + dAtA[i] = 0x28 } } - if len(m.Field12) > 0 { - for _, num := range m.Field12 { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field4) > 0 { + for iNdEx := len(m.Field4) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field4[iNdEx])) + i-- + dAtA[i] = 0x20 } } - if len(m.Field13) > 0 { - for _, b := range m.Field13 { - dAtA[i] = 0x68 - i++ - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field3[iNdEx])) + i-- + dAtA[i] = 0x18 } } - if len(m.Field14) > 0 { - for _, s := range m.Field14 { - dAtA[i] = 0x72 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f7 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f7)) + i-- + dAtA[i] = 0x15 } } - if len(m.Field15) > 0 { - for _, b := range m.Field15 { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f8 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f8)) + i-- + dAtA[i] = 0x9 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepPackedNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22628,70 +22622,110 @@ } func (m *NidRepPackedNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepPackedNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field1)*8)) - for _, num := range m.Field1 { - f9 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f9)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field13))) + i-- + dAtA[i] = 0x6a } - if len(m.Field2) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field2)*4)) - for _, num := range m.Field2 { - f10 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f10)) - i += 4 + if len(m.Field12) > 0 { + for iNdEx := len(m.Field12) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12[iNdEx])) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field12)*8)) + i-- + dAtA[i] = 0x62 } - if len(m.Field3) > 0 { - dAtA12 := make([]byte, len(m.Field3)*10) - var j11 int - for _, num1 := range m.Field3 { - num := uint64(num1) - for num >= 1<<7 { - dAtA12[j11] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 - j11++ - } - dAtA12[j11] = uint8(num) - j11++ + if len(m.Field11) > 0 { + for iNdEx := len(m.Field11) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11[iNdEx])) } - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(j11)) - i += copy(dAtA[i:], dAtA12[:j11]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field11)*8)) + i-- + dAtA[i] = 0x5a } - if len(m.Field4) > 0 { - dAtA14 := make([]byte, len(m.Field4)*10) + if len(m.Field10) > 0 { + for iNdEx := len(m.Field10) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10[iNdEx])) + } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field10)*4)) + i-- + dAtA[i] = 0x52 + } + if len(m.Field9) > 0 { + for iNdEx := len(m.Field9) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9[iNdEx])) + } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field9)*4)) + i-- + dAtA[i] = 0x4a + } + if len(m.Field8) > 0 { + var j9 int + dAtA11 := make([]byte, len(m.Field8)*10) + for _, num := range m.Field8 { + x10 := (uint64(num) << 1) ^ uint64((num >> 63)) + for x10 >= 1<<7 { + dAtA11[j9] = uint8(uint64(x10)&0x7f | 0x80) + j9++ + x10 >>= 7 + } + dAtA11[j9] = uint8(x10) + j9++ + } + i -= j9 + copy(dAtA[i:], dAtA11[:j9]) + i = encodeVarintThetest(dAtA, i, uint64(j9)) + i-- + dAtA[i] = 0x42 + } + if len(m.Field7) > 0 { + dAtA12 := make([]byte, len(m.Field7)*5) var j13 int - for _, num1 := range m.Field4 { - num := uint64(num1) - for num >= 1<<7 { - dAtA14[j13] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 + for _, num := range m.Field7 { + x14 := (uint32(num) << 1) ^ uint32((num >> 31)) + for x14 >= 1<<7 { + dAtA12[j13] = uint8(uint64(x14)&0x7f | 0x80) j13++ + x14 >>= 7 } - dAtA14[j13] = uint8(num) + dAtA12[j13] = uint8(x14) j13++ } - dAtA[i] = 0x22 - i++ + i -= j13 + copy(dAtA[i:], dAtA12[:j13]) i = encodeVarintThetest(dAtA, i, uint64(j13)) - i += copy(dAtA[i:], dAtA14[:j13]) + i-- + dAtA[i] = 0x3a } - if len(m.Field5) > 0 { - dAtA16 := make([]byte, len(m.Field5)*10) + if len(m.Field6) > 0 { + dAtA16 := make([]byte, len(m.Field6)*10) var j15 int - for _, num := range m.Field5 { + for _, num := range m.Field6 { for num >= 1<<7 { dAtA16[j15] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 @@ -22700,15 +22734,16 @@ dAtA16[j15] = uint8(num) j15++ } - dAtA[i] = 0x2a - i++ + i -= j15 + copy(dAtA[i:], dAtA16[:j15]) i = encodeVarintThetest(dAtA, i, uint64(j15)) - i += copy(dAtA[i:], dAtA16[:j15]) + i-- + dAtA[i] = 0x32 } - if len(m.Field6) > 0 { - dAtA18 := make([]byte, len(m.Field6)*10) + if len(m.Field5) > 0 { + dAtA18 := make([]byte, len(m.Field5)*10) var j17 int - for _, num := range m.Field6 { + for _, num := range m.Field5 { for num >= 1<<7 { dAtA18[j17] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 @@ -22717,106 +22752,77 @@ dAtA18[j17] = uint8(num) j17++ } - dAtA[i] = 0x32 - i++ + i -= j17 + copy(dAtA[i:], dAtA18[:j17]) i = encodeVarintThetest(dAtA, i, uint64(j17)) - i += copy(dAtA[i:], dAtA18[:j17]) + i-- + dAtA[i] = 0x2a } - if len(m.Field7) > 0 { - dAtA19 := make([]byte, len(m.Field7)*5) - var j20 int - for _, num := range m.Field7 { - x21 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x21 >= 1<<7 { - dAtA19[j20] = uint8(uint64(x21)&0x7f | 0x80) - j20++ - x21 >>= 7 + if len(m.Field4) > 0 { + dAtA20 := make([]byte, len(m.Field4)*10) + var j19 int + for _, num1 := range m.Field4 { + num := uint64(num1) + for num >= 1<<7 { + dAtA20[j19] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j19++ } - dAtA19[j20] = uint8(x21) - j20++ + dAtA20[j19] = uint8(num) + j19++ } - dAtA[i] = 0x3a - i++ - i = encodeVarintThetest(dAtA, i, uint64(j20)) - i += copy(dAtA[i:], dAtA19[:j20]) + i -= j19 + copy(dAtA[i:], dAtA20[:j19]) + i = encodeVarintThetest(dAtA, i, uint64(j19)) + i-- + dAtA[i] = 0x22 } - if len(m.Field8) > 0 { - var j22 int - dAtA24 := make([]byte, len(m.Field8)*10) - for _, num := range m.Field8 { - x23 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x23 >= 1<<7 { - dAtA24[j22] = uint8(uint64(x23)&0x7f | 0x80) - j22++ - x23 >>= 7 + if len(m.Field3) > 0 { + dAtA22 := make([]byte, len(m.Field3)*10) + var j21 int + for _, num1 := range m.Field3 { + num := uint64(num1) + for num >= 1<<7 { + dAtA22[j21] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j21++ } - dAtA24[j22] = uint8(x23) - j22++ - } - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(j22)) - i += copy(dAtA[i:], dAtA24[:j22]) - } - if len(m.Field9) > 0 { - dAtA[i] = 0x4a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field9)*4)) - for _, num := range m.Field9 { - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 - } - } - if len(m.Field10) > 0 { - dAtA[i] = 0x52 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field10)*4)) - for _, num := range m.Field10 { - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 - } - } - if len(m.Field11) > 0 { - dAtA[i] = 0x5a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field11)*8)) - for _, num := range m.Field11 { - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + dAtA22[j21] = uint8(num) + j21++ } + i -= j21 + copy(dAtA[i:], dAtA22[:j21]) + i = encodeVarintThetest(dAtA, i, uint64(j21)) + i-- + dAtA[i] = 0x1a } - if len(m.Field12) > 0 { - dAtA[i] = 0x62 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field12)*8)) - for _, num := range m.Field12 { - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f23 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f23)) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field2)*4)) + i-- + dAtA[i] = 0x12 } - if len(m.Field13) > 0 { - dAtA[i] = 0x6a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field13))) - for _, b := range m.Field13 { - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f24 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f24)) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field1)*8)) + i-- + dAtA[i] = 0xa } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepPackedNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22824,70 +22830,110 @@ } func (m *NinRepPackedNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepPackedNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field1)*8)) - for _, num := range m.Field1 { - f25 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f25)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field13))) + i-- + dAtA[i] = 0x6a } - if len(m.Field2) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field2)*4)) - for _, num := range m.Field2 { - f26 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f26)) - i += 4 + if len(m.Field12) > 0 { + for iNdEx := len(m.Field12) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12[iNdEx])) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field12)*8)) + i-- + dAtA[i] = 0x62 } - if len(m.Field3) > 0 { - dAtA28 := make([]byte, len(m.Field3)*10) - var j27 int - for _, num1 := range m.Field3 { - num := uint64(num1) - for num >= 1<<7 { - dAtA28[j27] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 - j27++ - } - dAtA28[j27] = uint8(num) - j27++ + if len(m.Field11) > 0 { + for iNdEx := len(m.Field11) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11[iNdEx])) } - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(j27)) - i += copy(dAtA[i:], dAtA28[:j27]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field11)*8)) + i-- + dAtA[i] = 0x5a } - if len(m.Field4) > 0 { - dAtA30 := make([]byte, len(m.Field4)*10) + if len(m.Field10) > 0 { + for iNdEx := len(m.Field10) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10[iNdEx])) + } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field10)*4)) + i-- + dAtA[i] = 0x52 + } + if len(m.Field9) > 0 { + for iNdEx := len(m.Field9) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9[iNdEx])) + } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field9)*4)) + i-- + dAtA[i] = 0x4a + } + if len(m.Field8) > 0 { + var j25 int + dAtA27 := make([]byte, len(m.Field8)*10) + for _, num := range m.Field8 { + x26 := (uint64(num) << 1) ^ uint64((num >> 63)) + for x26 >= 1<<7 { + dAtA27[j25] = uint8(uint64(x26)&0x7f | 0x80) + j25++ + x26 >>= 7 + } + dAtA27[j25] = uint8(x26) + j25++ + } + i -= j25 + copy(dAtA[i:], dAtA27[:j25]) + i = encodeVarintThetest(dAtA, i, uint64(j25)) + i-- + dAtA[i] = 0x42 + } + if len(m.Field7) > 0 { + dAtA28 := make([]byte, len(m.Field7)*5) var j29 int - for _, num1 := range m.Field4 { - num := uint64(num1) - for num >= 1<<7 { - dAtA30[j29] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 + for _, num := range m.Field7 { + x30 := (uint32(num) << 1) ^ uint32((num >> 31)) + for x30 >= 1<<7 { + dAtA28[j29] = uint8(uint64(x30)&0x7f | 0x80) j29++ + x30 >>= 7 } - dAtA30[j29] = uint8(num) + dAtA28[j29] = uint8(x30) j29++ } - dAtA[i] = 0x22 - i++ + i -= j29 + copy(dAtA[i:], dAtA28[:j29]) i = encodeVarintThetest(dAtA, i, uint64(j29)) - i += copy(dAtA[i:], dAtA30[:j29]) + i-- + dAtA[i] = 0x3a } - if len(m.Field5) > 0 { - dAtA32 := make([]byte, len(m.Field5)*10) + if len(m.Field6) > 0 { + dAtA32 := make([]byte, len(m.Field6)*10) var j31 int - for _, num := range m.Field5 { + for _, num := range m.Field6 { for num >= 1<<7 { dAtA32[j31] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 @@ -22896,15 +22942,16 @@ dAtA32[j31] = uint8(num) j31++ } - dAtA[i] = 0x2a - i++ + i -= j31 + copy(dAtA[i:], dAtA32[:j31]) i = encodeVarintThetest(dAtA, i, uint64(j31)) - i += copy(dAtA[i:], dAtA32[:j31]) + i-- + dAtA[i] = 0x32 } - if len(m.Field6) > 0 { - dAtA34 := make([]byte, len(m.Field6)*10) + if len(m.Field5) > 0 { + dAtA34 := make([]byte, len(m.Field5)*10) var j33 int - for _, num := range m.Field6 { + for _, num := range m.Field5 { for num >= 1<<7 { dAtA34[j33] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 @@ -22913,106 +22960,77 @@ dAtA34[j33] = uint8(num) j33++ } - dAtA[i] = 0x32 - i++ + i -= j33 + copy(dAtA[i:], dAtA34[:j33]) i = encodeVarintThetest(dAtA, i, uint64(j33)) - i += copy(dAtA[i:], dAtA34[:j33]) + i-- + dAtA[i] = 0x2a } - if len(m.Field7) > 0 { - dAtA35 := make([]byte, len(m.Field7)*5) - var j36 int - for _, num := range m.Field7 { - x37 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x37 >= 1<<7 { - dAtA35[j36] = uint8(uint64(x37)&0x7f | 0x80) - j36++ - x37 >>= 7 + if len(m.Field4) > 0 { + dAtA36 := make([]byte, len(m.Field4)*10) + var j35 int + for _, num1 := range m.Field4 { + num := uint64(num1) + for num >= 1<<7 { + dAtA36[j35] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j35++ } - dAtA35[j36] = uint8(x37) - j36++ + dAtA36[j35] = uint8(num) + j35++ } - dAtA[i] = 0x3a - i++ - i = encodeVarintThetest(dAtA, i, uint64(j36)) - i += copy(dAtA[i:], dAtA35[:j36]) + i -= j35 + copy(dAtA[i:], dAtA36[:j35]) + i = encodeVarintThetest(dAtA, i, uint64(j35)) + i-- + dAtA[i] = 0x22 } - if len(m.Field8) > 0 { - var j38 int - dAtA40 := make([]byte, len(m.Field8)*10) - for _, num := range m.Field8 { - x39 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x39 >= 1<<7 { - dAtA40[j38] = uint8(uint64(x39)&0x7f | 0x80) - j38++ - x39 >>= 7 + if len(m.Field3) > 0 { + dAtA38 := make([]byte, len(m.Field3)*10) + var j37 int + for _, num1 := range m.Field3 { + num := uint64(num1) + for num >= 1<<7 { + dAtA38[j37] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j37++ } - dAtA40[j38] = uint8(x39) - j38++ - } - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(j38)) - i += copy(dAtA[i:], dAtA40[:j38]) - } - if len(m.Field9) > 0 { - dAtA[i] = 0x4a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field9)*4)) - for _, num := range m.Field9 { - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 - } - } - if len(m.Field10) > 0 { - dAtA[i] = 0x52 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field10)*4)) - for _, num := range m.Field10 { - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 - } - } - if len(m.Field11) > 0 { - dAtA[i] = 0x5a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field11)*8)) - for _, num := range m.Field11 { - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + dAtA38[j37] = uint8(num) + j37++ } + i -= j37 + copy(dAtA[i:], dAtA38[:j37]) + i = encodeVarintThetest(dAtA, i, uint64(j37)) + i-- + dAtA[i] = 0x1a } - if len(m.Field12) > 0 { - dAtA[i] = 0x62 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field12)*8)) - for _, num := range m.Field12 { - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f39 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f39)) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field2)*4)) + i-- + dAtA[i] = 0x12 } - if len(m.Field13) > 0 { - dAtA[i] = 0x6a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field13))) - for _, b := range m.Field13 { - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f40 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f40)) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field1)*8)) + i-- + dAtA[i] = 0xa } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NidOptStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23020,76 +23038,90 @@ } func (m *NidOptStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field3.Size())) - n41, err41 := m.Field3.MarshalTo(dAtA[i:]) - if err41 != nil { - return 0, err41 - } - i += n41 - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field4.Size())) - n42, err42 := m.Field4.MarshalTo(dAtA[i:]) - if err42 != nil { - return 0, err42 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n42 - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field6)) - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field8.Size())) - n43, err43 := m.Field8.MarshalTo(dAtA[i:]) - if err43 != nil { - return 0, err43 + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - i += n43 - dAtA[i] = 0x68 - i++ + i -= len(m.Field14) + copy(dAtA[i:], m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14))) + i-- + dAtA[i] = 0x72 + i-- if m.Field13 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14))) - i += copy(dAtA[i:], m.Field14) - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + i-- + dAtA[i] = 0x68 + { + size, err := m.Field8.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x42 + i = encodeVarintThetest(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) + i-- + dAtA[i] = 0x38 + i = encodeVarintThetest(dAtA, i, uint64(m.Field6)) + i-- + dAtA[i] = 0x30 + { + size, err := m.Field4.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + { + size, err := m.Field3.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0x1a + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) + i-- + dAtA[i] = 0x15 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *NinOptStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23097,94 +23129,108 @@ } func (m *NinOptStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field3 != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field3.Size())) - n44, err44 := m.Field3.MarshalTo(dAtA[i:]) - if err44 != nil { - return 0, err44 - } - i += n44 + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } - if m.Field4 != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field4.Size())) - n45, err45 := m.Field4.MarshalTo(dAtA[i:]) - if err45 != nil { - return 0, err45 + if m.Field13 != nil { + i-- + if *m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - i += n45 + i-- + dAtA[i] = 0x68 } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + if m.Field8 != nil { + { + size, err := m.Field8.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 } if m.Field7 != nil { - dAtA[i] = 0x38 - i++ i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field8 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field8.Size())) - n46, err46 := m.Field8.MarshalTo(dAtA[i:]) - if err46 != nil { - return 0, err46 - } - i += n46 + if m.Field6 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field13 != nil { - dAtA[i] = 0x68 - i++ - if *m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.Field4 != nil { + { + size, err := m.Field4.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i++ + i-- + dAtA[i] = 0x22 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field3 != nil { + { + size, err := m.Field3.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23192,130 +23238,131 @@ } func (m *NidRepStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x9 - i++ - f47 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f47)) - i += 8 - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Field2) > 0 { - for _, num := range m.Field2 { - dAtA[i] = 0x15 - i++ - f48 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f48)) - i += 4 + if len(m.Field15) > 0 { + for iNdEx := len(m.Field15) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field15[iNdEx]) + copy(dAtA[i:], m.Field15[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15[iNdEx]))) + i-- + dAtA[i] = 0x7a } } - if len(m.Field3) > 0 { - for _, msg := range m.Field3 { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n + if len(m.Field14) > 0 { + for iNdEx := len(m.Field14) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field14[iNdEx]) + copy(dAtA[i:], m.Field14[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14[iNdEx]))) + i-- + dAtA[i] = 0x72 } } - if len(m.Field4) > 0 { - for _, msg := range m.Field4 { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - i += n + i-- + dAtA[i] = 0x68 } } - if len(m.Field6) > 0 { - for _, num := range m.Field6 { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field8) > 0 { + for iNdEx := len(m.Field8) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field8[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 } } if len(m.Field7) > 0 { - for _, num := range m.Field7 { + for iNdEx := len(m.Field7) - 1; iNdEx >= 0; iNdEx-- { + x47 := (uint32(m.Field7[iNdEx]) << 1) ^ uint32((m.Field7[iNdEx] >> 31)) + i = encodeVarintThetest(dAtA, i, uint64(x47)) + i-- dAtA[i] = 0x38 - i++ - x49 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x49 >= 1<<7 { - dAtA[i] = uint8(uint64(x49)&0x7f | 0x80) - x49 >>= 7 - i++ - } - dAtA[i] = uint8(x49) - i++ } } - if len(m.Field8) > 0 { - for _, msg := range m.Field8 { - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n + if len(m.Field6) > 0 { + for iNdEx := len(m.Field6) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field6[iNdEx])) + i-- + dAtA[i] = 0x30 } } - if len(m.Field13) > 0 { - for _, b := range m.Field13 { - dAtA[i] = 0x68 - i++ - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if len(m.Field4) > 0 { + for iNdEx := len(m.Field4) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field4[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i++ + i-- + dAtA[i] = 0x22 } } - if len(m.Field14) > 0 { - for _, s := range m.Field14 { - dAtA[i] = 0x72 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field3[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } } - if len(m.Field15) > 0 { - for _, b := range m.Field15 { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f48 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f48)) + i-- + dAtA[i] = 0x15 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f49 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f49)) + i-- + dAtA[i] = 0x9 + } } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23323,130 +23370,131 @@ } func (m *NinRepStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x9 - i++ - f50 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f50)) - i += 8 - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Field2) > 0 { - for _, num := range m.Field2 { - dAtA[i] = 0x15 - i++ - f51 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f51)) - i += 4 + if len(m.Field15) > 0 { + for iNdEx := len(m.Field15) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field15[iNdEx]) + copy(dAtA[i:], m.Field15[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15[iNdEx]))) + i-- + dAtA[i] = 0x7a } } - if len(m.Field3) > 0 { - for _, msg := range m.Field3 { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n + if len(m.Field14) > 0 { + for iNdEx := len(m.Field14) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field14[iNdEx]) + copy(dAtA[i:], m.Field14[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14[iNdEx]))) + i-- + dAtA[i] = 0x72 } } - if len(m.Field4) > 0 { - for _, msg := range m.Field4 { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - i += n + i-- + dAtA[i] = 0x68 } } - if len(m.Field6) > 0 { - for _, num := range m.Field6 { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field8) > 0 { + for iNdEx := len(m.Field8) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field8[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 } } if len(m.Field7) > 0 { - for _, num := range m.Field7 { + for iNdEx := len(m.Field7) - 1; iNdEx >= 0; iNdEx-- { + x50 := (uint32(m.Field7[iNdEx]) << 1) ^ uint32((m.Field7[iNdEx] >> 31)) + i = encodeVarintThetest(dAtA, i, uint64(x50)) + i-- dAtA[i] = 0x38 - i++ - x52 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x52 >= 1<<7 { - dAtA[i] = uint8(uint64(x52)&0x7f | 0x80) - x52 >>= 7 - i++ - } - dAtA[i] = uint8(x52) - i++ } } - if len(m.Field8) > 0 { - for _, msg := range m.Field8 { - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n + if len(m.Field6) > 0 { + for iNdEx := len(m.Field6) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field6[iNdEx])) + i-- + dAtA[i] = 0x30 } } - if len(m.Field13) > 0 { - for _, b := range m.Field13 { - dAtA[i] = 0x68 - i++ - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if len(m.Field4) > 0 { + for iNdEx := len(m.Field4) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field4[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i++ + i-- + dAtA[i] = 0x22 } } - if len(m.Field14) > 0 { - for _, s := range m.Field14 { - dAtA[i] = 0x72 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field3[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } } - if len(m.Field15) > 0 { - for _, b := range m.Field15 { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f51 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f51)) + i-- + dAtA[i] = 0x15 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f52 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f52)) + i-- + dAtA[i] = 0x9 + } } - return i, nil + return len(dAtA) - i, nil } func (m *NidEmbeddedStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23454,50 +23502,60 @@ } func (m *NidEmbeddedStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidEmbeddedStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NidOptNative != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NidOptNative.Size())) - n53, err53 := m.NidOptNative.MarshalTo(dAtA[i:]) - if err53 != nil { - return 0, err53 - } - i += n53 - } - dAtA[i] = 0xc2 - i++ - dAtA[i] = 0xc - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field200.Size())) - n54, err54 := m.Field200.MarshalTo(dAtA[i:]) - if err54 != nil { - return 0, err54 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n54 - dAtA[i] = 0x90 - i++ - dAtA[i] = 0xd - i++ + i-- if m.Field210 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xd + i-- + dAtA[i] = 0x90 + { + size, err := m.Field200.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xc + i-- + dAtA[i] = 0xc2 + if m.NidOptNative != nil { + { + size, err := m.NidOptNative.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NinEmbeddedStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23505,54 +23563,64 @@ } func (m *NinEmbeddedStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinEmbeddedStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NidOptNative != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NidOptNative.Size())) - n55, err55 := m.NidOptNative.MarshalTo(dAtA[i:]) - if err55 != nil { - return 0, err55 - } - i += n55 - } - if m.Field200 != nil { - dAtA[i] = 0xc2 - i++ - dAtA[i] = 0xc - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field200.Size())) - n56, err56 := m.Field200.MarshalTo(dAtA[i:]) - if err56 != nil { - return 0, err56 - } - i += n56 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field210 != nil { - dAtA[i] = 0x90 - i++ - dAtA[i] = 0xd - i++ + i-- if *m.Field210 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0xd + i-- + dAtA[i] = 0x90 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field200 != nil { + { + size, err := m.Field200.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xc + i-- + dAtA[i] = 0xc2 } - return i, nil + if m.NidOptNative != nil { + { + size, err := m.NidOptNative.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func (m *NidNestedStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23560,40 +23628,50 @@ } func (m *NidNestedStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidNestedStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n57, err57 := m.Field1.MarshalTo(dAtA[i:]) - if err57 != nil { - return 0, err57 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n57 if len(m.Field2) > 0 { - for _, msg := range m.Field2 { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field2[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + { + size, err := m.Field1.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *NinNestedStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23601,42 +23679,52 @@ } func (m *NinNestedStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinNestedStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n58, err58 := m.Field1.MarshalTo(dAtA[i:]) - if err58 != nil { - return 0, err58 - } - i += n58 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Field2) > 0 { - for _, msg := range m.Field2 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field2[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) + } + } + if m.Field1 != nil { + { + size, err := m.Field1.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } - i += n + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NidOptCustom) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23644,36 +23732,46 @@ } func (m *NidOptCustom) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptCustom) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Id.Size())) - n59, err59 := m.Id.MarshalTo(dAtA[i:]) - if err59 != nil { - return 0, err59 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n59 - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Value.Size())) - n60, err60 := m.Value.MarshalTo(dAtA[i:]) - if err60 != nil { - return 0, err60 + { + size := m.Value.Size() + i -= size + if _, err := m.Value.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n60 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x12 + { + size := m.Id.Size() + i -= size + if _, err := m.Id.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *CustomDash) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23681,30 +23779,38 @@ } func (m *CustomDash) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomDash) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Value != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Value.Size())) - n61, err61 := m.Value.MarshalTo(dAtA[i:]) - if err61 != nil { - return 0, err61 + { + size := m.Value.Size() + i -= size + if _, err := m.Value.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n61 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptCustom) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23712,40 +23818,50 @@ } func (m *NinOptCustom) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptCustom) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Id != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Id.Size())) - n62, err62 := m.Id.MarshalTo(dAtA[i:]) - if err62 != nil { - return 0, err62 - } - i += n62 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Value != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Value.Size())) - n63, err63 := m.Value.MarshalTo(dAtA[i:]) - if err63 != nil { - return 0, err63 + { + size := m.Value.Size() + i -= size + if _, err := m.Value.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n63 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Id != nil { + { + size := m.Id.Size() + i -= size + if _, err := m.Id.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepCustom) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23753,44 +23869,54 @@ } func (m *NidRepCustom) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepCustom) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Id) > 0 { - for _, msg := range m.Id { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Value) > 0 { - for _, msg := range m.Value { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Value) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Value[iNdEx].Size() + i -= size + if _, err := m.Value[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Id) > 0 { + for iNdEx := len(m.Id) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Id[iNdEx].Size() + i -= size + if _, err := m.Id[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepCustom) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23798,44 +23924,54 @@ } func (m *NinRepCustom) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepCustom) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Id) > 0 { - for _, msg := range m.Id { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Value) > 0 { - for _, msg := range m.Value { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Value) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Value[iNdEx].Size() + i -= size + if _, err := m.Value[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Id) > 0 { + for iNdEx := len(m.Id) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Id[iNdEx].Size() + i -= size + if _, err := m.Id[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptNativeUnion) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23843,74 +23979,82 @@ } func (m *NinOptNativeUnion) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptNativeUnion) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 - } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 - } - if m.Field3 != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) - } - if m.Field4 != nil { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field5 != nil { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } if m.Field13 != nil { - dAtA[i] = 0x68 - i++ + i-- if *m.Field13 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x68 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field6 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field5 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + i-- + dAtA[i] = 0x28 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field4 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + i-- + dAtA[i] = 0x20 + } + if m.Field3 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 + } + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 + } + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptStructUnion) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23918,84 +24062,96 @@ } func (m *NinOptStructUnion) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptStructUnion) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 - } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 - } - if m.Field3 != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field3.Size())) - n64, err64 := m.Field3.MarshalTo(dAtA[i:]) - if err64 != nil { - return 0, err64 - } - i += n64 - } - if m.Field4 != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field4.Size())) - n65, err65 := m.Field4.MarshalTo(dAtA[i:]) - if err65 != nil { - return 0, err65 - } - i += n65 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field7 != nil { - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } if m.Field13 != nil { - dAtA[i] = 0x68 - i++ + i-- if *m.Field13 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x68 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field7 != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field6 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field4 != nil { + { + size, err := m.Field4.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if m.Field3 != nil { + { + size, err := m.Field3.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 + } + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NinEmbeddedStructUnion) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24003,54 +24159,64 @@ } func (m *NinEmbeddedStructUnion) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinEmbeddedStructUnion) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NidOptNative != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NidOptNative.Size())) - n66, err66 := m.NidOptNative.MarshalTo(dAtA[i:]) - if err66 != nil { - return 0, err66 - } - i += n66 - } - if m.Field200 != nil { - dAtA[i] = 0xc2 - i++ - dAtA[i] = 0xc - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field200.Size())) - n67, err67 := m.Field200.MarshalTo(dAtA[i:]) - if err67 != nil { - return 0, err67 - } - i += n67 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field210 != nil { - dAtA[i] = 0x90 - i++ - dAtA[i] = 0xd - i++ + i-- if *m.Field210 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0xd + i-- + dAtA[i] = 0x90 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field200 != nil { + { + size, err := m.Field200.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xc + i-- + dAtA[i] = 0xc2 + } + if m.NidOptNative != nil { + { + size, err := m.NidOptNative.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NinNestedStructUnion) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24058,50 +24224,62 @@ } func (m *NinNestedStructUnion) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinNestedStructUnion) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n68, err68 := m.Field1.MarshalTo(dAtA[i:]) - if err68 != nil { - return 0, err68 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Field3 != nil { + { + size, err := m.Field3.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n68 + i-- + dAtA[i] = 0x1a } if m.Field2 != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field2.Size())) - n69, err69 := m.Field2.MarshalTo(dAtA[i:]) - if err69 != nil { - return 0, err69 + { + size, err := m.Field2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n69 + i-- + dAtA[i] = 0x12 } - if m.Field3 != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field3.Size())) - n70, err70 := m.Field3.MarshalTo(dAtA[i:]) - if err70 != nil { - return 0, err70 + if m.Field1 != nil { + { + size, err := m.Field1.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n70 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *Tree) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24109,50 +24287,62 @@ } func (m *Tree) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Tree) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Or != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Or.Size())) - n71, err71 := m.Or.MarshalTo(dAtA[i:]) - if err71 != nil { - return 0, err71 - } - i += n71 - } - if m.And != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.And.Size())) - n72, err72 := m.And.MarshalTo(dAtA[i:]) - if err72 != nil { - return 0, err72 - } - i += n72 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Leaf != nil { + { + size, err := m.Leaf.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Leaf.Size())) - n73, err73 := m.Leaf.MarshalTo(dAtA[i:]) - if err73 != nil { - return 0, err73 + } + if m.And != nil { + { + size, err := m.And.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n73 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Or != nil { + { + size, err := m.Or.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *OrBranch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24160,36 +24350,46 @@ } func (m *OrBranch) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OrBranch) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Left.Size())) - n74, err74 := m.Left.MarshalTo(dAtA[i:]) - if err74 != nil { - return 0, err74 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n74 - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Right.Size())) - n75, err75 := m.Right.MarshalTo(dAtA[i:]) - if err75 != nil { - return 0, err75 + { + size, err := m.Right.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n75 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x12 + { + size, err := m.Left.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *AndBranch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24197,36 +24397,46 @@ } func (m *AndBranch) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AndBranch) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Left.Size())) - n76, err76 := m.Left.MarshalTo(dAtA[i:]) - if err76 != nil { - return 0, err76 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n76 - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Right.Size())) - n77, err77 := m.Right.MarshalTo(dAtA[i:]) - if err77 != nil { - return 0, err77 + { + size, err := m.Right.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n77 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x12 + { + size, err := m.Left.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *Leaf) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24234,27 +24444,34 @@ } func (m *Leaf) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Leaf) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Value)) - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.StrValue))) - i += copy(dAtA[i:], m.StrValue) if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + i -= len(m.StrValue) + copy(dAtA[i:], m.StrValue) + i = encodeVarintThetest(dAtA, i, uint64(len(m.StrValue))) + i-- + dAtA[i] = 0x12 + i = encodeVarintThetest(dAtA, i, uint64(m.Value)) + i-- + dAtA[i] = 0x8 + return len(dAtA) - i, nil } func (m *DeepTree) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24262,50 +24479,62 @@ } func (m *DeepTree) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DeepTree) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Down != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Down.Size())) - n78, err78 := m.Down.MarshalTo(dAtA[i:]) - if err78 != nil { - return 0, err78 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Leaf != nil { + { + size, err := m.Leaf.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n78 + i-- + dAtA[i] = 0x1a } if m.And != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.And.Size())) - n79, err79 := m.And.MarshalTo(dAtA[i:]) - if err79 != nil { - return 0, err79 + { + size, err := m.And.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n79 + i-- + dAtA[i] = 0x12 } - if m.Leaf != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Leaf.Size())) - n80, err80 := m.Leaf.MarshalTo(dAtA[i:]) - if err80 != nil { - return 0, err80 + if m.Down != nil { + { + size, err := m.Down.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n80 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *ADeepBranch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24313,28 +24542,36 @@ } func (m *ADeepBranch) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ADeepBranch) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Down.Size())) - n81, err81 := m.Down.MarshalTo(dAtA[i:]) - if err81 != nil { - return 0, err81 - } - i += n81 if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + { + size, err := m.Down.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0x12 + return len(dAtA) - i, nil } func (m *AndDeepBranch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24342,36 +24579,46 @@ } func (m *AndDeepBranch) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AndDeepBranch) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Left.Size())) - n82, err82 := m.Left.MarshalTo(dAtA[i:]) - if err82 != nil { - return 0, err82 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n82 - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Right.Size())) - n83, err83 := m.Right.MarshalTo(dAtA[i:]) - if err83 != nil { - return 0, err83 + { + size, err := m.Right.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n83 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x12 + { + size, err := m.Left.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *DeepLeaf) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24379,28 +24626,36 @@ } func (m *DeepLeaf) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DeepLeaf) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Tree.Size())) - n84, err84 := m.Tree.MarshalTo(dAtA[i:]) - if err84 != nil { - return 0, err84 - } - i += n84 if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + { + size, err := m.Tree.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *Nil) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24408,20 +24663,26 @@ } func (m *Nil) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Nil) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *NidOptEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24429,23 +24690,29 @@ } func (m *NidOptEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1)) if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + i = encodeVarintThetest(dAtA, i, uint64(m.Field1)) + i-- + dAtA[i] = 0x8 + return len(dAtA) - i, nil } func (m *NinOptEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24453,35 +24720,41 @@ } func (m *NinOptEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) - } - if m.Field2 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field3 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 + } + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24489,41 +24762,47 @@ } func (m *NidRepEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field3[iNdEx])) + i-- + dAtA[i] = 0x18 } } if len(m.Field2) > 0 { - for _, num := range m.Field2 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field2[iNdEx])) + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) } } - if len(m.Field3) > 0 { - for _, num := range m.Field3 { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field1[iNdEx])) + i-- + dAtA[i] = 0x8 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24531,41 +24810,47 @@ } func (m *NinRepEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field3[iNdEx])) + i-- + dAtA[i] = 0x18 } } if len(m.Field2) > 0 { - for _, num := range m.Field2 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field2[iNdEx])) + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) } } - if len(m.Field3) > 0 { - for _, num := range m.Field3 { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field1[iNdEx])) + i-- + dAtA[i] = 0x8 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptEnumDefault) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24573,35 +24858,41 @@ } func (m *NinOptEnumDefault) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptEnumDefault) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) - } - if m.Field2 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field3 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 + } + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *AnotherNinOptEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24609,35 +24900,41 @@ } func (m *AnotherNinOptEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AnotherNinOptEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) - } - if m.Field2 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field3 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 + } + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *AnotherNinOptEnumDefault) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24645,35 +24942,41 @@ } func (m *AnotherNinOptEnumDefault) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AnotherNinOptEnumDefault) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) - } - if m.Field2 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field3 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 } - return i, nil + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil } func (m *Timer) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24681,34 +24984,41 @@ } func (m *Timer) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Timer) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Time1)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Time2)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Data != nil { - dAtA[i] = 0x1a - i++ + i -= len(m.Data) + copy(dAtA[i:], m.Data) i = encodeVarintThetest(dAtA, i, uint64(len(m.Data))) - i += copy(dAtA[i:], m.Data) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x1a } - return i, nil + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Time2)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Time1)) + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *MyExtendable) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24716,30 +25026,36 @@ } func (m *MyExtendable) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MyExtendable) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - n, err := github_com_gogo_protobuf_proto.EncodeInternalExtension(m, dAtA[i:]) - if err != nil { + if n, err := github_com_gogo_protobuf_proto.EncodeInternalExtensionBackwards(m, dAtA[:i]); err != nil { return 0, err + } else { + i -= n } - i += n - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *OtherExtenable) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24747,45 +25063,53 @@ } func (m *OtherExtenable) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OtherExtenable) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.M != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.M.Size())) - n85, err85 := m.M.MarshalTo(dAtA[i:]) - if err85 != nil { - return 0, err85 - } - i += n85 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field2 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + if n, err := github_com_gogo_protobuf_proto.EncodeInternalExtensionBackwards(m, dAtA[:i]); err != nil { + return 0, err + } else { + i -= n } if m.Field13 != nil { - dAtA[i] = 0x68 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field13)) + i-- + dAtA[i] = 0x68 } - n, err := github_com_gogo_protobuf_proto.EncodeInternalExtension(m, dAtA[i:]) - if err != nil { - return 0, err + if m.Field2 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 } - i += n - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.M != nil { + { + size, err := m.M.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NestedDefinition) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24793,50 +25117,60 @@ } func (m *NestedDefinition) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedDefinition) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.EnumField != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.EnumField)) + if m.NM != nil { + { + size, err := m.NM.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 } if m.NNM != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NNM.Size())) - n86, err86 := m.NNM.MarshalTo(dAtA[i:]) - if err86 != nil { - return 0, err86 + { + size, err := m.NNM.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n86 + i-- + dAtA[i] = 0x1a } - if m.NM != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NM.Size())) - n87, err87 := m.NM.MarshalTo(dAtA[i:]) - if err87 != nil { - return 0, err87 - } - i += n87 + if m.EnumField != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.EnumField)) + i-- + dAtA[i] = 0x10 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *NestedDefinition_NestedMessage) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24844,36 +25178,44 @@ } func (m *NestedDefinition_NestedMessage) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedDefinition_NestedMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NestedField1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.NestedField1)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.NNM != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NNM.Size())) - n88, err88 := m.NNM.MarshalTo(dAtA[i:]) - if err88 != nil { - return 0, err88 + { + size, err := m.NNM.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n88 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.NestedField1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.NestedField1)) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NestedDefinition_NestedMessage_NestedNestedMsg) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24881,26 +25223,33 @@ } func (m *NestedDefinition_NestedMessage_NestedNestedMsg) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedDefinition_NestedMessage_NestedNestedMsg) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.NestedNestedField1 != nil { - dAtA[i] = 0x52 - i++ + i -= len(*m.NestedNestedField1) + copy(dAtA[i:], *m.NestedNestedField1) i = encodeVarintThetest(dAtA, i, uint64(len(*m.NestedNestedField1))) - i += copy(dAtA[i:], *m.NestedNestedField1) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x52 } - return i, nil + return len(dAtA) - i, nil } func (m *NestedScope) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24908,45 +25257,55 @@ } func (m *NestedScope) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedScope) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.A != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.A.Size())) - n89, err89 := m.A.MarshalTo(dAtA[i:]) - if err89 != nil { - return 0, err89 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.C != nil { + { + size, err := m.C.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n89 + i-- + dAtA[i] = 0x1a } if m.B != nil { - dAtA[i] = 0x10 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.B)) + i-- + dAtA[i] = 0x10 } - if m.C != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.C.Size())) - n90, err90 := m.C.MarshalTo(dAtA[i:]) - if err90 != nil { - return 0, err90 + if m.A != nil { + { + size, err := m.A.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n90 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptNativeDefault) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24954,108 +25313,116 @@ } func (m *NinOptNativeDefault) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptNativeDefault) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 - } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field3 != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field4 != nil { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } - if m.Field5 != nil { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + if m.Field13 != nil { + i-- + if *m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + if m.Field12 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) + i-- + dAtA[i] = 0x61 } - if m.Field7 != nil { - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + if m.Field11 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) + i-- + dAtA[i] = 0x59 } - if m.Field8 != nil { - dAtA[i] = 0x40 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + if m.Field10 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) + i-- + dAtA[i] = 0x55 } if m.Field9 != nil { - dAtA[i] = 0x4d - i++ + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field9)) - i += 4 + i-- + dAtA[i] = 0x4d } - if m.Field10 != nil { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) - i += 4 + if m.Field8 != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + i-- + dAtA[i] = 0x40 } - if m.Field11 != nil { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) - i += 8 + if m.Field7 != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field12 != nil { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) - i += 8 + if m.Field6 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field13 != nil { - dAtA[i] = 0x68 - i++ - if *m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if m.Field5 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + i-- + dAtA[i] = 0x28 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field4 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + i-- + dAtA[i] = 0x20 } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field3 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 + } + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *CustomContainer) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25063,28 +25430,36 @@ } func (m *CustomContainer) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomContainer) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.CustomStruct.Size())) - n91, err91 := m.CustomStruct.MarshalTo(dAtA[i:]) - if err91 != nil { - return 0, err91 - } - i += n91 if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + { + size, err := m.CustomStruct.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *CustomNameNidOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25092,80 +25467,88 @@ } func (m *CustomNameNidOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameNidOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.FieldA)))) - i += 8 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.FieldB)))) - i += 4 - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldC)) - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldD)) - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldE)) - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldF)) - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(m.FieldG)<<1)^uint32((m.FieldG>>31)))) - dAtA[i] = 0x40 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint64(m.FieldH)<<1)^uint64((m.FieldH>>63)))) - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldI)) - i += 4 - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldJ)) - i += 4 - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldK)) - i += 8 - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldL)) - i += 8 - dAtA[i] = 0x68 - i++ - if m.FieldM { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i++ - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldN))) - i += copy(dAtA[i:], m.FieldN) if m.FieldO != nil { - dAtA[i] = 0x7a - i++ + i -= len(m.FieldO) + copy(dAtA[i:], m.FieldO) i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldO))) - i += copy(dAtA[i:], m.FieldO) + i-- + dAtA[i] = 0x7a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.FieldN) + copy(dAtA[i:], m.FieldN) + i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldN))) + i-- + dAtA[i] = 0x72 + i-- + if m.FieldM { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - return i, nil + i-- + dAtA[i] = 0x68 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldL)) + i-- + dAtA[i] = 0x61 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldK)) + i-- + dAtA[i] = 0x59 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldJ)) + i-- + dAtA[i] = 0x55 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldI)) + i-- + dAtA[i] = 0x4d + i = encodeVarintThetest(dAtA, i, uint64((uint64(m.FieldH)<<1)^uint64((m.FieldH>>63)))) + i-- + dAtA[i] = 0x40 + i = encodeVarintThetest(dAtA, i, uint64((uint32(m.FieldG)<<1)^uint32((m.FieldG>>31)))) + i-- + dAtA[i] = 0x38 + i = encodeVarintThetest(dAtA, i, uint64(m.FieldF)) + i-- + dAtA[i] = 0x30 + i = encodeVarintThetest(dAtA, i, uint64(m.FieldE)) + i-- + dAtA[i] = 0x28 + i = encodeVarintThetest(dAtA, i, uint64(m.FieldD)) + i-- + dAtA[i] = 0x20 + i = encodeVarintThetest(dAtA, i, uint64(m.FieldC)) + i-- + dAtA[i] = 0x18 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.FieldB)))) + i-- + dAtA[i] = 0x15 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.FieldA)))) + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *CustomNameNinOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25173,108 +25556,116 @@ } func (m *CustomNameNinOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameNinOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.FieldA != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.FieldA)))) - i += 8 - } - if m.FieldB != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.FieldB)))) - i += 4 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.FieldC != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldC)) + if m.FieldO != nil { + i -= len(m.FieldO) + copy(dAtA[i:], m.FieldO) + i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldO))) + i-- + dAtA[i] = 0x7a } - if m.FieldD != nil { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldD)) + if m.FieldN != nil { + i -= len(*m.FieldN) + copy(dAtA[i:], *m.FieldN) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.FieldN))) + i-- + dAtA[i] = 0x72 } - if m.FieldE != nil { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldE)) + if m.FieldM != nil { + i-- + if *m.FieldM { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } - if m.FieldF != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldF)) + if m.FielL != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.FielL)) + i-- + dAtA[i] = 0x61 } - if m.FieldG != nil { - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.FieldG)<<1)^uint32((*m.FieldG>>31)))) + if m.FieldK != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.FieldK)) + i-- + dAtA[i] = 0x59 } - if m.FieldH != nil { - dAtA[i] = 0x40 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.FieldH)<<1)^uint64((*m.FieldH>>63)))) + if m.FieldJ != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.FieldJ)) + i-- + dAtA[i] = 0x55 } if m.FieldI != nil { - dAtA[i] = 0x4d - i++ + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.FieldI)) - i += 4 + i-- + dAtA[i] = 0x4d } - if m.FieldJ != nil { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.FieldJ)) - i += 4 + if m.FieldH != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.FieldH)<<1)^uint64((*m.FieldH>>63)))) + i-- + dAtA[i] = 0x40 } - if m.FieldK != nil { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.FieldK)) - i += 8 + if m.FieldG != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.FieldG)<<1)^uint32((*m.FieldG>>31)))) + i-- + dAtA[i] = 0x38 } - if m.FielL != nil { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.FielL)) - i += 8 + if m.FieldF != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldF)) + i-- + dAtA[i] = 0x30 } - if m.FieldM != nil { - dAtA[i] = 0x68 - i++ - if *m.FieldM { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if m.FieldE != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldE)) + i-- + dAtA[i] = 0x28 } - if m.FieldN != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.FieldN))) - i += copy(dAtA[i:], *m.FieldN) + if m.FieldD != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldD)) + i-- + dAtA[i] = 0x20 } - if m.FieldO != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldO))) - i += copy(dAtA[i:], m.FieldO) + if m.FieldC != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldC)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.FieldB != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.FieldB)))) + i-- + dAtA[i] = 0x15 + } + if m.FieldA != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.FieldA)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *CustomNameNinRepNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25282,161 +25673,150 @@ } func (m *CustomNameNinRepNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameNinRepNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.FieldA) > 0 { - for _, num := range m.FieldA { - dAtA[i] = 0x9 - i++ - f92 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f92)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.FieldO) > 0 { + for iNdEx := len(m.FieldO) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.FieldO[iNdEx]) + copy(dAtA[i:], m.FieldO[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldO[iNdEx]))) + i-- + dAtA[i] = 0x7a } } - if len(m.FieldB) > 0 { - for _, num := range m.FieldB { - dAtA[i] = 0x15 - i++ - f93 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f93)) - i += 4 + if len(m.FieldN) > 0 { + for iNdEx := len(m.FieldN) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.FieldN[iNdEx]) + copy(dAtA[i:], m.FieldN[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldN[iNdEx]))) + i-- + dAtA[i] = 0x72 } } - if len(m.FieldC) > 0 { - for _, num := range m.FieldC { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.FieldM) > 0 { + for iNdEx := len(m.FieldM) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.FieldM[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } } - if len(m.FieldD) > 0 { - for _, num := range m.FieldD { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.FieldL) > 0 { + for iNdEx := len(m.FieldL) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldL[iNdEx])) + i-- + dAtA[i] = 0x61 } } - if len(m.FieldE) > 0 { - for _, num := range m.FieldE { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.FieldK) > 0 { + for iNdEx := len(m.FieldK) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldK[iNdEx])) + i-- + dAtA[i] = 0x59 } } - if len(m.FieldF) > 0 { - for _, num := range m.FieldF { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.FieldJ) > 0 { + for iNdEx := len(m.FieldJ) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldJ[iNdEx])) + i-- + dAtA[i] = 0x55 } } - if len(m.FieldG) > 0 { - for _, num := range m.FieldG { - dAtA[i] = 0x38 - i++ - x94 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x94 >= 1<<7 { - dAtA[i] = uint8(uint64(x94)&0x7f | 0x80) - x94 >>= 7 - i++ - } - dAtA[i] = uint8(x94) - i++ + if len(m.FieldI) > 0 { + for iNdEx := len(m.FieldI) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldI[iNdEx])) + i-- + dAtA[i] = 0x4d } } if len(m.FieldH) > 0 { - for _, num := range m.FieldH { + for iNdEx := len(m.FieldH) - 1; iNdEx >= 0; iNdEx-- { + x87 := (uint64(m.FieldH[iNdEx]) << 1) ^ uint64((m.FieldH[iNdEx] >> 63)) + i = encodeVarintThetest(dAtA, i, uint64(x87)) + i-- dAtA[i] = 0x40 - i++ - x95 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x95 >= 1<<7 { - dAtA[i] = uint8(uint64(x95)&0x7f | 0x80) - x95 >>= 7 - i++ - } - dAtA[i] = uint8(x95) - i++ } } - if len(m.FieldI) > 0 { - for _, num := range m.FieldI { - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.FieldG) > 0 { + for iNdEx := len(m.FieldG) - 1; iNdEx >= 0; iNdEx-- { + x88 := (uint32(m.FieldG[iNdEx]) << 1) ^ uint32((m.FieldG[iNdEx] >> 31)) + i = encodeVarintThetest(dAtA, i, uint64(x88)) + i-- + dAtA[i] = 0x38 } } - if len(m.FieldJ) > 0 { - for _, num := range m.FieldJ { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.FieldF) > 0 { + for iNdEx := len(m.FieldF) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.FieldF[iNdEx])) + i-- + dAtA[i] = 0x30 } } - if len(m.FieldK) > 0 { - for _, num := range m.FieldK { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.FieldE) > 0 { + for iNdEx := len(m.FieldE) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.FieldE[iNdEx])) + i-- + dAtA[i] = 0x28 } } - if len(m.FieldL) > 0 { - for _, num := range m.FieldL { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.FieldD) > 0 { + for iNdEx := len(m.FieldD) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.FieldD[iNdEx])) + i-- + dAtA[i] = 0x20 } } - if len(m.FieldM) > 0 { - for _, b := range m.FieldM { - dAtA[i] = 0x68 - i++ - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.FieldC) > 0 { + for iNdEx := len(m.FieldC) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.FieldC[iNdEx])) + i-- + dAtA[i] = 0x18 } } - if len(m.FieldN) > 0 { - for _, s := range m.FieldN { - dAtA[i] = 0x72 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + if len(m.FieldB) > 0 { + for iNdEx := len(m.FieldB) - 1; iNdEx >= 0; iNdEx-- { + f89 := math.Float32bits(float32(m.FieldB[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f89)) + i-- + dAtA[i] = 0x15 } } - if len(m.FieldO) > 0 { - for _, b := range m.FieldO { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) + if len(m.FieldA) > 0 { + for iNdEx := len(m.FieldA) - 1; iNdEx >= 0; iNdEx-- { + f90 := math.Float64bits(float64(m.FieldA[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f90)) + i-- + dAtA[i] = 0x9 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *CustomNameNinStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25444,96 +25824,110 @@ } func (m *CustomNameNinStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameNinStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.FieldA != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.FieldA)))) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.FieldB != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.FieldB)))) - i += 4 + if m.FieldJ != nil { + i -= len(m.FieldJ) + copy(dAtA[i:], m.FieldJ) + i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldJ))) + i-- + dAtA[i] = 0x7a } - if m.FieldC != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldC.Size())) - n96, err96 := m.FieldC.MarshalTo(dAtA[i:]) - if err96 != nil { - return 0, err96 + if m.FieldI != nil { + i -= len(*m.FieldI) + copy(dAtA[i:], *m.FieldI) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.FieldI))) + i-- + dAtA[i] = 0x72 + } + if m.FieldH != nil { + i-- + if *m.FieldH { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - i += n96 + i-- + dAtA[i] = 0x68 } - if len(m.FieldD) > 0 { - for _, msg := range m.FieldD { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) + if m.FieldG != nil { + { + size, err := m.FieldG.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } - i += n + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - } - if m.FieldE != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldE)) + i-- + dAtA[i] = 0x42 } if m.FieldF != nil { - dAtA[i] = 0x38 - i++ i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.FieldF)<<1)^uint32((*m.FieldF>>31)))) + i-- + dAtA[i] = 0x38 } - if m.FieldG != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldG.Size())) - n97, err97 := m.FieldG.MarshalTo(dAtA[i:]) - if err97 != nil { - return 0, err97 - } - i += n97 + if m.FieldE != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldE)) + i-- + dAtA[i] = 0x30 } - if m.FieldH != nil { - dAtA[i] = 0x68 - i++ - if *m.FieldH { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if len(m.FieldD) > 0 { + for iNdEx := len(m.FieldD) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.FieldD[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 } - i++ } - if m.FieldI != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.FieldI))) - i += copy(dAtA[i:], *m.FieldI) + if m.FieldC != nil { + { + size, err := m.FieldC.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } - if m.FieldJ != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldJ))) - i += copy(dAtA[i:], m.FieldJ) + if m.FieldB != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.FieldB)))) + i-- + dAtA[i] = 0x15 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.FieldA != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.FieldA)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *CustomNameCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25541,64 +25935,78 @@ } func (m *CustomNameCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.FieldA != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldA.Size())) - n98, err98 := m.FieldA.MarshalTo(dAtA[i:]) - if err98 != nil { - return 0, err98 - } - i += n98 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.FieldB != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldB.Size())) - n99, err99 := m.FieldB.MarshalTo(dAtA[i:]) - if err99 != nil { - return 0, err99 + if len(m.FieldD) > 0 { + for iNdEx := len(m.FieldD) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.FieldD[iNdEx].Size() + i -= size + if _, err := m.FieldD[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 } - i += n99 } if len(m.FieldC) > 0 { - for _, msg := range m.FieldC { + for iNdEx := len(m.FieldC) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.FieldC[iNdEx].Size() + i -= size + if _, err := m.FieldC[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { + } + } + if m.FieldB != nil { + { + size := m.FieldB.Size() + i -= size + if _, err := m.FieldB.MarshalTo(dAtA[i:]); err != nil { return 0, err } - i += n + i = encodeVarintThetest(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x12 } - if len(m.FieldD) > 0 { - for _, msg := range m.FieldD { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { + if m.FieldA != nil { + { + size := m.FieldA.Size() + i -= size + if _, err := m.FieldA.MarshalTo(dAtA[i:]); err != nil { return 0, err } - i += n + i = encodeVarintThetest(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *CustomNameNinEmbeddedStructUnion) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25606,54 +26014,64 @@ } func (m *CustomNameNinEmbeddedStructUnion) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameNinEmbeddedStructUnion) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NidOptNative != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NidOptNative.Size())) - n100, err100 := m.NidOptNative.MarshalTo(dAtA[i:]) - if err100 != nil { - return 0, err100 - } - i += n100 - } - if m.FieldA != nil { - dAtA[i] = 0xc2 - i++ - dAtA[i] = 0xc - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldA.Size())) - n101, err101 := m.FieldA.MarshalTo(dAtA[i:]) - if err101 != nil { - return 0, err101 - } - i += n101 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.FieldB != nil { - dAtA[i] = 0x90 - i++ - dAtA[i] = 0xd - i++ + i-- if *m.FieldB { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0xd + i-- + dAtA[i] = 0x90 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.FieldA != nil { + { + size, err := m.FieldA.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xc + i-- + dAtA[i] = 0xc2 + } + if m.NidOptNative != nil { + { + size, err := m.NidOptNative.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *CustomNameEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25661,32 +26079,38 @@ } func (m *CustomNameEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.FieldA != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldA)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.FieldB) > 0 { - for _, num := range m.FieldB { + for iNdEx := len(m.FieldB) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.FieldB[iNdEx])) + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.FieldA != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldA)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *NoExtensionsMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25694,28 +26118,35 @@ } func (m *NoExtensionsMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NoExtensionsMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.XXX_extensions != nil { - i += copy(dAtA[i:], m.XXX_extensions) + i -= len(m.XXX_extensions) + copy(dAtA[i:], m.XXX_extensions) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *Unrecognized) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25723,23 +26154,29 @@ } func (m *Unrecognized) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Unrecognized) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.Field1 != nil { - dAtA[i] = 0xa - i++ + i -= len(*m.Field1) + copy(dAtA[i:], *m.Field1) i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field1))) - i += copy(dAtA[i:], *m.Field1) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *UnrecognizedWithInner) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25747,38 +26184,47 @@ } func (m *UnrecognizedWithInner) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnrecognizedWithInner) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Embedded) > 0 { - for _, msg := range m.Embedded { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field2 != nil { - dAtA[i] = 0x12 - i++ + i -= len(*m.Field2) + copy(dAtA[i:], *m.Field2) i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field2))) - i += copy(dAtA[i:], *m.Field2) + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Embedded) > 0 { + for iNdEx := len(m.Embedded) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Embedded[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *UnrecognizedWithInner_Inner) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25786,22 +26232,27 @@ } func (m *UnrecognizedWithInner_Inner) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnrecognizedWithInner_Inner) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.Field1 != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *UnrecognizedWithEmbed) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25809,34 +26260,43 @@ } func (m *UnrecognizedWithEmbed) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnrecognizedWithEmbed) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.UnrecognizedWithEmbed_Embedded.Size())) - n102, err102 := m.UnrecognizedWithEmbed_Embedded.MarshalTo(dAtA[i:]) - if err102 != nil { - return 0, err102 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n102 if m.Field2 != nil { - dAtA[i] = 0x12 - i++ + i -= len(*m.Field2) + copy(dAtA[i:], *m.Field2) i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field2))) - i += copy(dAtA[i:], *m.Field2) + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + { + size, err := m.UnrecognizedWithEmbed_Embedded.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *UnrecognizedWithEmbed_Embedded) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25844,22 +26304,27 @@ } func (m *UnrecognizedWithEmbed_Embedded) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnrecognizedWithEmbed_Embedded) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.Field1 != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *Node) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25867,38 +26332,47 @@ } func (m *Node) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Node) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Label != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Label))) - i += copy(dAtA[i:], *m.Label) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Children) > 0 { - for _, msg := range m.Children { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Children) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Children[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Label != nil { + i -= len(*m.Label) + copy(dAtA[i:], *m.Label) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Label))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NonByteCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25906,30 +26380,38 @@ } func (m *NonByteCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NonByteCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Field1 != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n103, err103 := m.Field1.MarshalTo(dAtA[i:]) - if err103 != nil { - return 0, err103 + { + size := m.Field1.Size() + i -= size + if _, err := m.Field1.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n103 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NidOptNonByteCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25937,28 +26419,36 @@ } func (m *NidOptNonByteCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptNonByteCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n104, err104 := m.Field1.MarshalTo(dAtA[i:]) - if err104 != nil { - return 0, err104 - } - i += n104 if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + { + size := m.Field1.Size() + i -= size + if _, err := m.Field1.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *NinOptNonByteCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25966,30 +26456,38 @@ } func (m *NinOptNonByteCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptNonByteCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Field1 != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n105, err105 := m.Field1.MarshalTo(dAtA[i:]) - if err105 != nil { - return 0, err105 + { + size := m.Field1.Size() + i -= size + if _, err := m.Field1.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n105 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepNonByteCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25997,32 +26495,40 @@ } func (m *NidRepNonByteCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepNonByteCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Field1) > 0 { - for _, msg := range m.Field1 { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Field1[iNdEx].Size() + i -= size + if _, err := m.Field1[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepNonByteCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -26030,32 +26536,40 @@ } func (m *NinRepNonByteCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepNonByteCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Field1) > 0 { - for _, msg := range m.Field1 { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Field1[iNdEx].Size() + i -= size + if _, err := m.Field1[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *ProtoType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -26063,30 +26577,39 @@ } func (m *ProtoType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ProtoType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Field2 != nil { - dAtA[i] = 0xa - i++ + i -= len(*m.Field2) + copy(dAtA[i:], *m.Field2) i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field2))) - i += copy(dAtA[i:], *m.Field2) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintThetest(dAtA []byte, offset int, v uint64) int { + offset -= sovThetest(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedNidOptNative(r randyThetest, easy bool) *NidOptNative { this := &NidOptNative{} @@ -26141,87 +26664,87 @@ func NewPopulatedNinOptNative(r randyThetest, easy bool) *NinOptNative { this := &NinOptNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := float64(r.Float64()) if r.Intn(2) == 0 { v2 *= -1 } this.Field1 = &v2 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := float32(r.Float32()) if r.Intn(2) == 0 { v3 *= -1 } this.Field2 = &v3 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := int32(r.Int31()) if r.Intn(2) == 0 { v4 *= -1 } this.Field3 = &v4 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := int64(r.Int63()) if r.Intn(2) == 0 { v5 *= -1 } this.Field4 = &v5 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := uint32(r.Uint32()) this.Field5 = &v6 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := uint64(uint64(r.Uint32())) this.Field6 = &v7 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := int32(r.Int31()) if r.Intn(2) == 0 { v8 *= -1 } this.Field7 = &v8 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := int64(r.Int63()) if r.Intn(2) == 0 { v9 *= -1 } this.Field8 = &v9 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := uint32(r.Uint32()) this.Field9 = &v10 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := int32(r.Int31()) if r.Intn(2) == 0 { v11 *= -1 } this.Field10 = &v11 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := uint64(uint64(r.Uint32())) this.Field11 = &v12 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := int64(r.Int63()) if r.Intn(2) == 0 { v13 *= -1 } this.Field12 = &v13 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v14 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := string(randStringThetest(r)) this.Field14 = &v15 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(100) this.Field15 = make([]byte, v16) for i := 0; i < v16; i++ { @@ -26236,7 +26759,7 @@ func NewPopulatedNidRepNative(r randyThetest, easy bool) *NidRepNative { this := &NidRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := r.Intn(10) this.Field1 = make([]float64, v17) for i := 0; i < v17; i++ { @@ -26246,7 +26769,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(10) this.Field2 = make([]float32, v18) for i := 0; i < v18; i++ { @@ -26256,7 +26779,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := r.Intn(10) this.Field3 = make([]int32, v19) for i := 0; i < v19; i++ { @@ -26266,7 +26789,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(10) this.Field4 = make([]int64, v20) for i := 0; i < v20; i++ { @@ -26276,21 +26799,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(10) this.Field5 = make([]uint32, v21) for i := 0; i < v21; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := r.Intn(10) this.Field6 = make([]uint64, v22) for i := 0; i < v22; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(10) this.Field7 = make([]int32, v23) for i := 0; i < v23; i++ { @@ -26300,7 +26823,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(10) this.Field8 = make([]int64, v24) for i := 0; i < v24; i++ { @@ -26310,14 +26833,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(10) this.Field9 = make([]uint32, v25) for i := 0; i < v25; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v26 := r.Intn(10) this.Field10 = make([]int32, v26) for i := 0; i < v26; i++ { @@ -26327,14 +26850,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(10) this.Field11 = make([]uint64, v27) for i := 0; i < v27; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v28 := r.Intn(10) this.Field12 = make([]int64, v28) for i := 0; i < v28; i++ { @@ -26344,21 +26867,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(10) this.Field13 = make([]bool, v29) for i := 0; i < v29; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(10) this.Field14 = make([]string, v30) for i := 0; i < v30; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v31 := r.Intn(10) this.Field15 = make([][]byte, v31) for i := 0; i < v31; i++ { @@ -26377,7 +26900,7 @@ func NewPopulatedNinRepNative(r randyThetest, easy bool) *NinRepNative { this := &NinRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(10) this.Field1 = make([]float64, v33) for i := 0; i < v33; i++ { @@ -26387,7 +26910,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v34 := r.Intn(10) this.Field2 = make([]float32, v34) for i := 0; i < v34; i++ { @@ -26397,7 +26920,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(10) this.Field3 = make([]int32, v35) for i := 0; i < v35; i++ { @@ -26407,7 +26930,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.Field4 = make([]int64, v36) for i := 0; i < v36; i++ { @@ -26417,21 +26940,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.Field5 = make([]uint32, v37) for i := 0; i < v37; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(10) this.Field6 = make([]uint64, v38) for i := 0; i < v38; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(10) this.Field7 = make([]int32, v39) for i := 0; i < v39; i++ { @@ -26441,7 +26964,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v40 := r.Intn(10) this.Field8 = make([]int64, v40) for i := 0; i < v40; i++ { @@ -26451,14 +26974,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(10) this.Field9 = make([]uint32, v41) for i := 0; i < v41; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(10) this.Field10 = make([]int32, v42) for i := 0; i < v42; i++ { @@ -26468,14 +26991,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v43 := r.Intn(10) this.Field11 = make([]uint64, v43) for i := 0; i < v43; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(10) this.Field12 = make([]int64, v44) for i := 0; i < v44; i++ { @@ -26485,21 +27008,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(10) this.Field13 = make([]bool, v45) for i := 0; i < v45; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v46 := r.Intn(10) this.Field14 = make([]string, v46) for i := 0; i < v46; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(10) this.Field15 = make([][]byte, v47) for i := 0; i < v47; i++ { @@ -26518,7 +27041,7 @@ func NewPopulatedNidRepPackedNative(r randyThetest, easy bool) *NidRepPackedNative { this := &NidRepPackedNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v49 := r.Intn(10) this.Field1 = make([]float64, v49) for i := 0; i < v49; i++ { @@ -26528,7 +27051,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(10) this.Field2 = make([]float32, v50) for i := 0; i < v50; i++ { @@ -26538,7 +27061,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(10) this.Field3 = make([]int32, v51) for i := 0; i < v51; i++ { @@ -26548,7 +27071,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v52 := r.Intn(10) this.Field4 = make([]int64, v52) for i := 0; i < v52; i++ { @@ -26558,21 +27081,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(10) this.Field5 = make([]uint32, v53) for i := 0; i < v53; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(10) this.Field6 = make([]uint64, v54) for i := 0; i < v54; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v55 := r.Intn(10) this.Field7 = make([]int32, v55) for i := 0; i < v55; i++ { @@ -26582,7 +27105,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(10) this.Field8 = make([]int64, v56) for i := 0; i < v56; i++ { @@ -26592,14 +27115,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(10) this.Field9 = make([]uint32, v57) for i := 0; i < v57; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(10) this.Field10 = make([]int32, v58) for i := 0; i < v58; i++ { @@ -26609,14 +27132,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v59 := r.Intn(10) this.Field11 = make([]uint64, v59) for i := 0; i < v59; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(10) this.Field12 = make([]int64, v60) for i := 0; i < v60; i++ { @@ -26626,7 +27149,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v61 := r.Intn(10) this.Field13 = make([]bool, v61) for i := 0; i < v61; i++ { @@ -26641,7 +27164,7 @@ func NewPopulatedNinRepPackedNative(r randyThetest, easy bool) *NinRepPackedNative { this := &NinRepPackedNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(10) this.Field1 = make([]float64, v62) for i := 0; i < v62; i++ { @@ -26651,7 +27174,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(10) this.Field2 = make([]float32, v63) for i := 0; i < v63; i++ { @@ -26661,7 +27184,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.Field3 = make([]int32, v64) for i := 0; i < v64; i++ { @@ -26671,7 +27194,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(10) this.Field4 = make([]int64, v65) for i := 0; i < v65; i++ { @@ -26681,21 +27204,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v66 := r.Intn(10) this.Field5 = make([]uint32, v66) for i := 0; i < v66; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v67 := r.Intn(10) this.Field6 = make([]uint64, v67) for i := 0; i < v67; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.Field7 = make([]int32, v68) for i := 0; i < v68; i++ { @@ -26705,7 +27228,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.Field8 = make([]int64, v69) for i := 0; i < v69; i++ { @@ -26715,14 +27238,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v70 := r.Intn(10) this.Field9 = make([]uint32, v70) for i := 0; i < v70; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(10) this.Field10 = make([]int32, v71) for i := 0; i < v71; i++ { @@ -26732,14 +27255,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v72 := r.Intn(10) this.Field11 = make([]uint64, v72) for i := 0; i < v72; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v73 := r.Intn(10) this.Field12 = make([]int64, v73) for i := 0; i < v73; i++ { @@ -26749,7 +27272,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v74 := r.Intn(10) this.Field13 = make([]bool, v74) for i := 0; i < v74; i++ { @@ -26798,49 +27321,49 @@ func NewPopulatedNinOptStruct(r randyThetest, easy bool) *NinOptStruct { this := &NinOptStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v79 := float64(r.Float64()) if r.Intn(2) == 0 { v79 *= -1 } this.Field1 = &v79 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v80 := float32(r.Float32()) if r.Intn(2) == 0 { v80 *= -1 } this.Field2 = &v80 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field3 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field4 = NewPopulatedNinOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v81 := uint64(uint64(r.Uint32())) this.Field6 = &v81 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v82 := int32(r.Int31()) if r.Intn(2) == 0 { v82 *= -1 } this.Field7 = &v82 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field8 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v83 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v83 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v84 := string(randStringThetest(r)) this.Field14 = &v84 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v85 := r.Intn(100) this.Field15 = make([]byte, v85) for i := 0; i < v85; i++ { @@ -26855,7 +27378,7 @@ func NewPopulatedNidRepStruct(r randyThetest, easy bool) *NidRepStruct { this := &NidRepStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v86 := r.Intn(10) this.Field1 = make([]float64, v86) for i := 0; i < v86; i++ { @@ -26865,7 +27388,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v87 := r.Intn(10) this.Field2 = make([]float32, v87) for i := 0; i < v87; i++ { @@ -26875,7 +27398,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v88 := r.Intn(5) this.Field3 = make([]NidOptNative, v88) for i := 0; i < v88; i++ { @@ -26883,7 +27406,7 @@ this.Field3[i] = *v89 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v90 := r.Intn(5) this.Field4 = make([]NinOptNative, v90) for i := 0; i < v90; i++ { @@ -26891,14 +27414,14 @@ this.Field4[i] = *v91 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v92 := r.Intn(10) this.Field6 = make([]uint64, v92) for i := 0; i < v92; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v93 := r.Intn(10) this.Field7 = make([]int32, v93) for i := 0; i < v93; i++ { @@ -26908,7 +27431,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v94 := r.Intn(5) this.Field8 = make([]NidOptNative, v94) for i := 0; i < v94; i++ { @@ -26916,21 +27439,21 @@ this.Field8[i] = *v95 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v96 := r.Intn(10) this.Field13 = make([]bool, v96) for i := 0; i < v96; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v97 := r.Intn(10) this.Field14 = make([]string, v97) for i := 0; i < v97; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v98 := r.Intn(10) this.Field15 = make([][]byte, v98) for i := 0; i < v98; i++ { @@ -26949,7 +27472,7 @@ func NewPopulatedNinRepStruct(r randyThetest, easy bool) *NinRepStruct { this := &NinRepStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v100 := r.Intn(10) this.Field1 = make([]float64, v100) for i := 0; i < v100; i++ { @@ -26959,7 +27482,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v101 := r.Intn(10) this.Field2 = make([]float32, v101) for i := 0; i < v101; i++ { @@ -26969,28 +27492,28 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v102 := r.Intn(5) this.Field3 = make([]*NidOptNative, v102) for i := 0; i < v102; i++ { this.Field3[i] = NewPopulatedNidOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v103 := r.Intn(5) this.Field4 = make([]*NinOptNative, v103) for i := 0; i < v103; i++ { this.Field4[i] = NewPopulatedNinOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v104 := r.Intn(10) this.Field6 = make([]uint64, v104) for i := 0; i < v104; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v105 := r.Intn(10) this.Field7 = make([]int32, v105) for i := 0; i < v105; i++ { @@ -27000,28 +27523,28 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v106 := r.Intn(5) this.Field8 = make([]*NidOptNative, v106) for i := 0; i < v106; i++ { this.Field8[i] = NewPopulatedNidOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v107 := r.Intn(10) this.Field13 = make([]bool, v107) for i := 0; i < v107; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v108 := r.Intn(10) this.Field14 = make([]string, v108) for i := 0; i < v108; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v109 := r.Intn(10) this.Field15 = make([][]byte, v109) for i := 0; i < v109; i++ { @@ -27040,7 +27563,7 @@ func NewPopulatedNidEmbeddedStruct(r randyThetest, easy bool) *NidEmbeddedStruct { this := &NidEmbeddedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NidOptNative = NewPopulatedNidOptNative(r, easy) } v111 := NewPopulatedNidOptNative(r, easy) @@ -27054,13 +27577,13 @@ func NewPopulatedNinEmbeddedStruct(r randyThetest, easy bool) *NinEmbeddedStruct { this := &NinEmbeddedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NidOptNative = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field200 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v112 := bool(bool(r.Intn(2) == 0)) this.Field210 = &v112 } @@ -27074,7 +27597,7 @@ this := &NidNestedStruct{} v113 := NewPopulatedNidOptStruct(r, easy) this.Field1 = *v113 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v114 := r.Intn(5) this.Field2 = make([]NidRepStruct, v114) for i := 0; i < v114; i++ { @@ -27090,10 +27613,10 @@ func NewPopulatedNinNestedStruct(r randyThetest, easy bool) *NinNestedStruct { this := &NinNestedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedNinOptStruct(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v116 := r.Intn(5) this.Field2 = make([]*NinRepStruct, v116) for i := 0; i < v116; i++ { @@ -27120,7 +27643,7 @@ func NewPopulatedCustomDash(r randyThetest, easy bool) *CustomDash { this := &CustomDash{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Value = github_com_gogo_protobuf_test_custom_dash_type.NewPopulatedBytes(r) } if !easy && r.Intn(10) != 0 { @@ -27131,10 +27654,10 @@ func NewPopulatedNinOptCustom(r randyThetest, easy bool) *NinOptCustom { this := &NinOptCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Id = NewPopulatedUuid(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Value = github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r) } if !easy && r.Intn(10) != 0 { @@ -27145,7 +27668,7 @@ func NewPopulatedNidRepCustom(r randyThetest, easy bool) *NidRepCustom { this := &NidRepCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v119 := r.Intn(10) this.Id = make([]Uuid, v119) for i := 0; i < v119; i++ { @@ -27153,7 +27676,7 @@ this.Id[i] = *v120 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v121 := r.Intn(10) this.Value = make([]github_com_gogo_protobuf_test_custom.Uint128, v121) for i := 0; i < v121; i++ { @@ -27169,7 +27692,7 @@ func NewPopulatedNinRepCustom(r randyThetest, easy bool) *NinRepCustom { this := &NinRepCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v123 := r.Intn(10) this.Id = make([]Uuid, v123) for i := 0; i < v123; i++ { @@ -27177,7 +27700,7 @@ this.Id[i] = *v124 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v125 := r.Intn(10) this.Value = make([]github_com_gogo_protobuf_test_custom.Uint128, v125) for i := 0; i < v125; i++ { @@ -27431,15 +27954,15 @@ func NewPopulatedNinOptEnum(r randyThetest, easy bool) *NinOptEnum { this := &NinOptEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v152 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.Field1 = &v152 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v153 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v153 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v154 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v154 } @@ -27451,21 +27974,21 @@ func NewPopulatedNidRepEnum(r randyThetest, easy bool) *NidRepEnum { this := &NidRepEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v155 := r.Intn(10) this.Field1 = make([]TheTestEnum, v155) for i := 0; i < v155; i++ { this.Field1[i] = TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v156 := r.Intn(10) this.Field2 = make([]YetAnotherTestEnum, v156) for i := 0; i < v156; i++ { this.Field2[i] = YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v157 := r.Intn(10) this.Field3 = make([]YetYetAnotherTestEnum, v157) for i := 0; i < v157; i++ { @@ -27480,21 +28003,21 @@ func NewPopulatedNinRepEnum(r randyThetest, easy bool) *NinRepEnum { this := &NinRepEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v158 := r.Intn(10) this.Field1 = make([]TheTestEnum, v158) for i := 0; i < v158; i++ { this.Field1[i] = TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v159 := r.Intn(10) this.Field2 = make([]YetAnotherTestEnum, v159) for i := 0; i < v159; i++ { this.Field2[i] = YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v160 := r.Intn(10) this.Field3 = make([]YetYetAnotherTestEnum, v160) for i := 0; i < v160; i++ { @@ -27509,15 +28032,15 @@ func NewPopulatedNinOptEnumDefault(r randyThetest, easy bool) *NinOptEnumDefault { this := &NinOptEnumDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v161 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.Field1 = &v161 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v162 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v162 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v163 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v163 } @@ -27529,15 +28052,15 @@ func NewPopulatedAnotherNinOptEnum(r randyThetest, easy bool) *AnotherNinOptEnum { this := &AnotherNinOptEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v164 := AnotherTestEnum([]int32{10, 11}[r.Intn(2)]) this.Field1 = &v164 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v165 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v165 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v166 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v166 } @@ -27549,15 +28072,15 @@ func NewPopulatedAnotherNinOptEnumDefault(r randyThetest, easy bool) *AnotherNinOptEnumDefault { this := &AnotherNinOptEnumDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v167 := AnotherTestEnum([]int32{10, 11}[r.Intn(2)]) this.Field1 = &v167 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v168 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v168 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v169 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v169 } @@ -27590,7 +28113,7 @@ func NewPopulatedMyExtendable(r randyThetest, easy bool) *MyExtendable { this := &MyExtendable{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v171 := int64(r.Int63()) if r.Intn(2) == 0 { v171 *= -1 @@ -27617,17 +28140,17 @@ func NewPopulatedOtherExtenable(r randyThetest, easy bool) *OtherExtenable { this := &OtherExtenable{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.M = NewPopulatedMyExtendable(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v172 := int64(r.Int63()) if r.Intn(2) == 0 { v172 *= -1 } this.Field2 = &v172 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v173 := int64(r.Int63()) if r.Intn(2) == 0 { v173 *= -1 @@ -27661,21 +28184,21 @@ func NewPopulatedNestedDefinition(r randyThetest, easy bool) *NestedDefinition { this := &NestedDefinition{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v174 := int64(r.Int63()) if r.Intn(2) == 0 { v174 *= -1 } this.Field1 = &v174 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v175 := NestedDefinition_NestedEnum([]int32{1}[r.Intn(1)]) this.EnumField = &v175 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NNM = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NM = NewPopulatedNestedDefinition_NestedMessage(r, easy) } if !easy && r.Intn(10) != 0 { @@ -27686,11 +28209,11 @@ func NewPopulatedNestedDefinition_NestedMessage(r randyThetest, easy bool) *NestedDefinition_NestedMessage { this := &NestedDefinition_NestedMessage{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v176 := uint64(uint64(r.Uint32())) this.NestedField1 = &v176 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NNM = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } if !easy && r.Intn(10) != 0 { @@ -27701,7 +28224,7 @@ func NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r randyThetest, easy bool) *NestedDefinition_NestedMessage_NestedNestedMsg { this := &NestedDefinition_NestedMessage_NestedNestedMsg{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v177 := string(randStringThetest(r)) this.NestedNestedField1 = &v177 } @@ -27713,14 +28236,14 @@ func NewPopulatedNestedScope(r randyThetest, easy bool) *NestedScope { this := &NestedScope{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.A = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v178 := NestedDefinition_NestedEnum([]int32{1}[r.Intn(1)]) this.B = &v178 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.C = NewPopulatedNestedDefinition_NestedMessage(r, easy) } if !easy && r.Intn(10) != 0 { @@ -27731,87 +28254,87 @@ func NewPopulatedNinOptNativeDefault(r randyThetest, easy bool) *NinOptNativeDefault { this := &NinOptNativeDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v179 := float64(r.Float64()) if r.Intn(2) == 0 { v179 *= -1 } this.Field1 = &v179 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v180 := float32(r.Float32()) if r.Intn(2) == 0 { v180 *= -1 } this.Field2 = &v180 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v181 := int32(r.Int31()) if r.Intn(2) == 0 { v181 *= -1 } this.Field3 = &v181 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v182 := int64(r.Int63()) if r.Intn(2) == 0 { v182 *= -1 } this.Field4 = &v182 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v183 := uint32(r.Uint32()) this.Field5 = &v183 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v184 := uint64(uint64(r.Uint32())) this.Field6 = &v184 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v185 := int32(r.Int31()) if r.Intn(2) == 0 { v185 *= -1 } this.Field7 = &v185 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v186 := int64(r.Int63()) if r.Intn(2) == 0 { v186 *= -1 } this.Field8 = &v186 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v187 := uint32(r.Uint32()) this.Field9 = &v187 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v188 := int32(r.Int31()) if r.Intn(2) == 0 { v188 *= -1 } this.Field10 = &v188 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v189 := uint64(uint64(r.Uint32())) this.Field11 = &v189 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v190 := int64(r.Int63()) if r.Intn(2) == 0 { v190 *= -1 } this.Field12 = &v190 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v191 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v191 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v192 := string(randStringThetest(r)) this.Field14 = &v192 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v193 := r.Intn(100) this.Field15 = make([]byte, v193) for i := 0; i < v193; i++ { @@ -27887,87 +28410,87 @@ func NewPopulatedCustomNameNinOptNative(r randyThetest, easy bool) *CustomNameNinOptNative { this := &CustomNameNinOptNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v196 := float64(r.Float64()) if r.Intn(2) == 0 { v196 *= -1 } this.FieldA = &v196 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v197 := float32(r.Float32()) if r.Intn(2) == 0 { v197 *= -1 } this.FieldB = &v197 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v198 := int32(r.Int31()) if r.Intn(2) == 0 { v198 *= -1 } this.FieldC = &v198 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v199 := int64(r.Int63()) if r.Intn(2) == 0 { v199 *= -1 } this.FieldD = &v199 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v200 := uint32(r.Uint32()) this.FieldE = &v200 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v201 := uint64(uint64(r.Uint32())) this.FieldF = &v201 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v202 := int32(r.Int31()) if r.Intn(2) == 0 { v202 *= -1 } this.FieldG = &v202 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v203 := int64(r.Int63()) if r.Intn(2) == 0 { v203 *= -1 } this.FieldH = &v203 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v204 := uint32(r.Uint32()) this.FieldI = &v204 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v205 := int32(r.Int31()) if r.Intn(2) == 0 { v205 *= -1 } this.FieldJ = &v205 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v206 := uint64(uint64(r.Uint32())) this.FieldK = &v206 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v207 := int64(r.Int63()) if r.Intn(2) == 0 { v207 *= -1 } this.FielL = &v207 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v208 := bool(bool(r.Intn(2) == 0)) this.FieldM = &v208 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v209 := string(randStringThetest(r)) this.FieldN = &v209 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v210 := r.Intn(100) this.FieldO = make([]byte, v210) for i := 0; i < v210; i++ { @@ -27982,7 +28505,7 @@ func NewPopulatedCustomNameNinRepNative(r randyThetest, easy bool) *CustomNameNinRepNative { this := &CustomNameNinRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v211 := r.Intn(10) this.FieldA = make([]float64, v211) for i := 0; i < v211; i++ { @@ -27992,7 +28515,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v212 := r.Intn(10) this.FieldB = make([]float32, v212) for i := 0; i < v212; i++ { @@ -28002,7 +28525,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v213 := r.Intn(10) this.FieldC = make([]int32, v213) for i := 0; i < v213; i++ { @@ -28012,7 +28535,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v214 := r.Intn(10) this.FieldD = make([]int64, v214) for i := 0; i < v214; i++ { @@ -28022,21 +28545,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v215 := r.Intn(10) this.FieldE = make([]uint32, v215) for i := 0; i < v215; i++ { this.FieldE[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v216 := r.Intn(10) this.FieldF = make([]uint64, v216) for i := 0; i < v216; i++ { this.FieldF[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v217 := r.Intn(10) this.FieldG = make([]int32, v217) for i := 0; i < v217; i++ { @@ -28046,7 +28569,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v218 := r.Intn(10) this.FieldH = make([]int64, v218) for i := 0; i < v218; i++ { @@ -28056,14 +28579,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v219 := r.Intn(10) this.FieldI = make([]uint32, v219) for i := 0; i < v219; i++ { this.FieldI[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v220 := r.Intn(10) this.FieldJ = make([]int32, v220) for i := 0; i < v220; i++ { @@ -28073,14 +28596,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v221 := r.Intn(10) this.FieldK = make([]uint64, v221) for i := 0; i < v221; i++ { this.FieldK[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v222 := r.Intn(10) this.FieldL = make([]int64, v222) for i := 0; i < v222; i++ { @@ -28090,21 +28613,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v223 := r.Intn(10) this.FieldM = make([]bool, v223) for i := 0; i < v223; i++ { this.FieldM[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v224 := r.Intn(10) this.FieldN = make([]string, v224) for i := 0; i < v224; i++ { this.FieldN[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v225 := r.Intn(10) this.FieldO = make([][]byte, v225) for i := 0; i < v225; i++ { @@ -28123,53 +28646,53 @@ func NewPopulatedCustomNameNinStruct(r randyThetest, easy bool) *CustomNameNinStruct { this := &CustomNameNinStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v227 := float64(r.Float64()) if r.Intn(2) == 0 { v227 *= -1 } this.FieldA = &v227 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v228 := float32(r.Float32()) if r.Intn(2) == 0 { v228 *= -1 } this.FieldB = &v228 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldC = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v229 := r.Intn(5) this.FieldD = make([]*NinOptNative, v229) for i := 0; i < v229; i++ { this.FieldD[i] = NewPopulatedNinOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v230 := uint64(uint64(r.Uint32())) this.FieldE = &v230 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v231 := int32(r.Int31()) if r.Intn(2) == 0 { v231 *= -1 } this.FieldF = &v231 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldG = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v232 := bool(bool(r.Intn(2) == 0)) this.FieldH = &v232 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v233 := string(randStringThetest(r)) this.FieldI = &v233 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v234 := r.Intn(100) this.FieldJ = make([]byte, v234) for i := 0; i < v234; i++ { @@ -28184,13 +28707,13 @@ func NewPopulatedCustomNameCustomType(r randyThetest, easy bool) *CustomNameCustomType { this := &CustomNameCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldA = NewPopulatedUuid(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldB = github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v235 := r.Intn(10) this.FieldC = make([]Uuid, v235) for i := 0; i < v235; i++ { @@ -28198,7 +28721,7 @@ this.FieldC[i] = *v236 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v237 := r.Intn(10) this.FieldD = make([]github_com_gogo_protobuf_test_custom.Uint128, v237) for i := 0; i < v237; i++ { @@ -28229,11 +28752,11 @@ func NewPopulatedCustomNameEnum(r randyThetest, easy bool) *CustomNameEnum { this := &CustomNameEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v240 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.FieldA = &v240 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v241 := r.Intn(10) this.FieldB = make([]TheTestEnum, v241) for i := 0; i < v241; i++ { @@ -28248,7 +28771,7 @@ func NewPopulatedNoExtensionsMap(r randyThetest, easy bool) *NoExtensionsMap { this := &NoExtensionsMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v242 := int64(r.Int63()) if r.Intn(2) == 0 { v242 *= -1 @@ -28275,7 +28798,7 @@ func NewPopulatedUnrecognized(r randyThetest, easy bool) *Unrecognized { this := &Unrecognized{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v243 := string(randStringThetest(r)) this.Field1 = &v243 } @@ -28286,14 +28809,14 @@ func NewPopulatedUnrecognizedWithInner(r randyThetest, easy bool) *UnrecognizedWithInner { this := &UnrecognizedWithInner{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v244 := r.Intn(5) this.Embedded = make([]*UnrecognizedWithInner_Inner, v244) for i := 0; i < v244; i++ { this.Embedded[i] = NewPopulatedUnrecognizedWithInner_Inner(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v245 := string(randStringThetest(r)) this.Field2 = &v245 } @@ -28305,7 +28828,7 @@ func NewPopulatedUnrecognizedWithInner_Inner(r randyThetest, easy bool) *UnrecognizedWithInner_Inner { this := &UnrecognizedWithInner_Inner{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v246 := uint32(r.Uint32()) this.Field1 = &v246 } @@ -28318,7 +28841,7 @@ this := &UnrecognizedWithEmbed{} v247 := NewPopulatedUnrecognizedWithEmbed_Embedded(r, easy) this.UnrecognizedWithEmbed_Embedded = *v247 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v248 := string(randStringThetest(r)) this.Field2 = &v248 } @@ -28330,7 +28853,7 @@ func NewPopulatedUnrecognizedWithEmbed_Embedded(r randyThetest, easy bool) *UnrecognizedWithEmbed_Embedded { this := &UnrecognizedWithEmbed_Embedded{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v249 := uint32(r.Uint32()) this.Field1 = &v249 } @@ -28341,11 +28864,11 @@ func NewPopulatedNode(r randyThetest, easy bool) *Node { this := &Node{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v250 := string(randStringThetest(r)) this.Label = &v250 } - if r.Intn(10) == 0 { + if r.Intn(5) == 0 { v251 := r.Intn(5) this.Children = make([]*Node, v251) for i := 0; i < v251; i++ { @@ -28360,7 +28883,7 @@ func NewPopulatedNonByteCustomType(r randyThetest, easy bool) *NonByteCustomType { this := &NonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedT(r) } if !easy && r.Intn(10) != 0 { @@ -28381,7 +28904,7 @@ func NewPopulatedNinOptNonByteCustomType(r randyThetest, easy bool) *NinOptNonByteCustomType { this := &NinOptNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedT(r) } if !easy && r.Intn(10) != 0 { @@ -28392,7 +28915,7 @@ func NewPopulatedNidRepNonByteCustomType(r randyThetest, easy bool) *NidRepNonByteCustomType { this := &NidRepNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v253 := r.Intn(10) this.Field1 = make([]T, v253) for i := 0; i < v253; i++ { @@ -28408,7 +28931,7 @@ func NewPopulatedNinRepNonByteCustomType(r randyThetest, easy bool) *NinRepNonByteCustomType { this := &NinRepNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v255 := r.Intn(10) this.Field1 = make([]T, v255) for i := 0; i < v255; i++ { @@ -28424,7 +28947,7 @@ func NewPopulatedProtoType(r randyThetest, easy bool) *ProtoType { this := &ProtoType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v257 := string(randStringThetest(r)) this.Field2 = &v257 } @@ -46799,6 +47322,7 @@ func skipThetest(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -46830,10 +47354,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -46854,55 +47376,30 @@ return 0, ErrInvalidLengthThetest } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthThetest - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowThetest - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipThetest(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthThetest - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupThetest + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthThetest + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthThetest = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowThetest = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthThetest = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowThetest = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupThetest = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/combos/marshaler/thetest.pb.go golang-gogoprotobuf-1.3.1/test/combos/marshaler/thetest.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/combos/marshaler/thetest.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/combos/marshaler/thetest.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -33,7 +33,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type TheTestEnum int32 @@ -273,7 +273,7 @@ return xxx_messageInfo_NidOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -326,7 +326,7 @@ return xxx_messageInfo_NinOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -379,7 +379,7 @@ return xxx_messageInfo_NidRepNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -432,7 +432,7 @@ return xxx_messageInfo_NinRepNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -483,7 +483,7 @@ return xxx_messageInfo_NidRepPackedNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -534,7 +534,7 @@ return xxx_messageInfo_NinRepPackedNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -582,7 +582,7 @@ return xxx_messageInfo_NidOptStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -630,7 +630,7 @@ return xxx_messageInfo_NinOptStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -678,7 +678,7 @@ return xxx_messageInfo_NidRepStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -726,7 +726,7 @@ return xxx_messageInfo_NinRepStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -767,7 +767,7 @@ return xxx_messageInfo_NidEmbeddedStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -808,7 +808,7 @@ return xxx_messageInfo_NinEmbeddedStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -848,7 +848,7 @@ return xxx_messageInfo_NidNestedStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -888,7 +888,7 @@ return xxx_messageInfo_NinNestedStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -928,7 +928,7 @@ return xxx_messageInfo_NidOptCustom.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -967,7 +967,7 @@ return xxx_messageInfo_CustomDash.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1007,7 +1007,7 @@ return xxx_messageInfo_NinOptCustom.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1047,7 +1047,7 @@ return xxx_messageInfo_NidRepCustom.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1087,7 +1087,7 @@ return xxx_messageInfo_NinRepCustom.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1134,7 +1134,7 @@ return xxx_messageInfo_NinOptNativeUnion.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1181,7 +1181,7 @@ return xxx_messageInfo_NinOptStructUnion.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1222,7 +1222,7 @@ return xxx_messageInfo_NinEmbeddedStructUnion.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1263,7 +1263,7 @@ return xxx_messageInfo_NinNestedStructUnion.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1304,7 +1304,7 @@ return xxx_messageInfo_Tree.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1344,7 +1344,7 @@ return xxx_messageInfo_OrBranch.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1384,7 +1384,7 @@ return xxx_messageInfo_AndBranch.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1424,7 +1424,7 @@ return xxx_messageInfo_Leaf.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1465,7 +1465,7 @@ return xxx_messageInfo_DeepTree.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1504,7 +1504,7 @@ return xxx_messageInfo_ADeepBranch.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1544,7 +1544,7 @@ return xxx_messageInfo_AndDeepBranch.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1583,7 +1583,7 @@ return xxx_messageInfo_DeepLeaf.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1621,7 +1621,7 @@ return xxx_messageInfo_Nil.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1660,7 +1660,7 @@ return xxx_messageInfo_NidOptEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1701,7 +1701,7 @@ return xxx_messageInfo_NinOptEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1742,7 +1742,7 @@ return xxx_messageInfo_NidRepEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1783,7 +1783,7 @@ return xxx_messageInfo_NinRepEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1824,7 +1824,7 @@ return xxx_messageInfo_NinOptEnumDefault.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1890,7 +1890,7 @@ return xxx_messageInfo_AnotherNinOptEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1931,7 +1931,7 @@ return xxx_messageInfo_AnotherNinOptEnumDefault.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1997,7 +1997,7 @@ return xxx_messageInfo_Timer.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2046,7 +2046,7 @@ return xxx_messageInfo_MyExtendable.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2098,7 +2098,7 @@ return xxx_messageInfo_OtherExtenable.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2140,7 +2140,7 @@ return xxx_messageInfo_NestedDefinition.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2180,7 +2180,7 @@ return xxx_messageInfo_NestedDefinition_NestedMessage.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2221,7 +2221,7 @@ return xxx_messageInfo_NestedDefinition_NestedMessage_NestedNestedMsg.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2262,7 +2262,7 @@ return xxx_messageInfo_NestedScope.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2315,7 +2315,7 @@ return xxx_messageInfo_NinOptNativeDefault.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2474,7 +2474,7 @@ return xxx_messageInfo_CustomContainer.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2527,7 +2527,7 @@ return xxx_messageInfo_CustomNameNidOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2580,7 +2580,7 @@ return xxx_messageInfo_CustomNameNinOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2633,7 +2633,7 @@ return xxx_messageInfo_CustomNameNinRepNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2681,7 +2681,7 @@ return xxx_messageInfo_CustomNameNinStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2723,7 +2723,7 @@ return xxx_messageInfo_CustomNameCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2764,7 +2764,7 @@ return xxx_messageInfo_CustomNameNinEmbeddedStructUnion.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2804,7 +2804,7 @@ return xxx_messageInfo_CustomNameEnum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2859,7 +2859,7 @@ return xxx_messageInfo_NoExtensionsMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2897,7 +2897,7 @@ return xxx_messageInfo_Unrecognized.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2937,7 +2937,7 @@ return xxx_messageInfo_UnrecognizedWithInner.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2975,7 +2975,7 @@ return xxx_messageInfo_UnrecognizedWithInner_Inner.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3015,7 +3015,7 @@ return xxx_messageInfo_UnrecognizedWithEmbed.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3053,7 +3053,7 @@ return xxx_messageInfo_UnrecognizedWithEmbed_Embedded.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3093,7 +3093,7 @@ return xxx_messageInfo_Node.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3132,7 +3132,7 @@ return xxx_messageInfo_NonByteCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3171,7 +3171,7 @@ return xxx_messageInfo_NidOptNonByteCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3210,7 +3210,7 @@ return xxx_messageInfo_NinOptNonByteCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3249,7 +3249,7 @@ return xxx_messageInfo_NidRepNonByteCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3288,7 +3288,7 @@ return xxx_messageInfo_NinRepNonByteCustomType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3327,7 +3327,7 @@ return xxx_messageInfo_ProtoType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -20798,16 +20798,16 @@ s = append(s, "Field2: "+fmt.Sprintf("%#v", this.Field2)+",\n") } if this.Field3 != nil { - vs := make([]*NidOptNative, len(this.Field3)) + vs := make([]NidOptNative, len(this.Field3)) for i := range vs { - vs[i] = &this.Field3[i] + vs[i] = this.Field3[i] } s = append(s, "Field3: "+fmt.Sprintf("%#v", vs)+",\n") } if this.Field4 != nil { - vs := make([]*NinOptNative, len(this.Field4)) + vs := make([]NinOptNative, len(this.Field4)) for i := range vs { - vs[i] = &this.Field4[i] + vs[i] = this.Field4[i] } s = append(s, "Field4: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -20818,9 +20818,9 @@ s = append(s, "Field7: "+fmt.Sprintf("%#v", this.Field7)+",\n") } if this.Field8 != nil { - vs := make([]*NidOptNative, len(this.Field8)) + vs := make([]NidOptNative, len(this.Field8)) for i := range vs { - vs[i] = &this.Field8[i] + vs[i] = this.Field8[i] } s = append(s, "Field8: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -20927,9 +20927,9 @@ s = append(s, "&test.NidNestedStruct{") s = append(s, "Field1: "+strings.Replace(this.Field1.GoString(), `&`, ``, 1)+",\n") if this.Field2 != nil { - vs := make([]*NidRepStruct, len(this.Field2)) + vs := make([]NidRepStruct, len(this.Field2)) for i := range vs { - vs[i] = &this.Field2[i] + vs[i] = this.Field2[i] } s = append(s, "Field2: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -22105,7 +22105,7 @@ func (m *NidOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22113,80 +22113,88 @@ } func (m *NidOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field3)) - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field4)) - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field5)) - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field6)) - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) - dAtA[i] = 0x40 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint64(m.Field8)<<1)^uint64((m.Field8>>63)))) - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9)) - i += 4 - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10)) - i += 4 - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11)) - i += 8 - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12)) - i += 8 - dAtA[i] = 0x68 - i++ - if m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i++ - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14))) - i += copy(dAtA[i:], m.Field14) if m.Field15 != nil { - dAtA[i] = 0x7a - i++ + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + i-- + dAtA[i] = 0x7a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.Field14) + copy(dAtA[i:], m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14))) + i-- + dAtA[i] = 0x72 + i-- + if m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - return i, nil + i-- + dAtA[i] = 0x68 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12)) + i-- + dAtA[i] = 0x61 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11)) + i-- + dAtA[i] = 0x59 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10)) + i-- + dAtA[i] = 0x55 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9)) + i-- + dAtA[i] = 0x4d + i = encodeVarintThetest(dAtA, i, uint64((uint64(m.Field8)<<1)^uint64((m.Field8>>63)))) + i-- + dAtA[i] = 0x40 + i = encodeVarintThetest(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) + i-- + dAtA[i] = 0x38 + i = encodeVarintThetest(dAtA, i, uint64(m.Field6)) + i-- + dAtA[i] = 0x30 + i = encodeVarintThetest(dAtA, i, uint64(m.Field5)) + i-- + dAtA[i] = 0x28 + i = encodeVarintThetest(dAtA, i, uint64(m.Field4)) + i-- + dAtA[i] = 0x20 + i = encodeVarintThetest(dAtA, i, uint64(m.Field3)) + i-- + dAtA[i] = 0x18 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) + i-- + dAtA[i] = 0x15 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *NinOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22194,108 +22202,116 @@ } func (m *NinOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 - } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field3 != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field4 != nil { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } - if m.Field5 != nil { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + if m.Field13 != nil { + i-- + if *m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + if m.Field12 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) + i-- + dAtA[i] = 0x61 } - if m.Field7 != nil { - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + if m.Field11 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) + i-- + dAtA[i] = 0x59 } - if m.Field8 != nil { - dAtA[i] = 0x40 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + if m.Field10 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) + i-- + dAtA[i] = 0x55 } if m.Field9 != nil { - dAtA[i] = 0x4d - i++ + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field9)) - i += 4 + i-- + dAtA[i] = 0x4d } - if m.Field10 != nil { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) - i += 4 + if m.Field8 != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + i-- + dAtA[i] = 0x40 } - if m.Field11 != nil { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) - i += 8 + if m.Field7 != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field12 != nil { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) - i += 8 + if m.Field6 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field13 != nil { - dAtA[i] = 0x68 - i++ - if *m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if m.Field5 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + i-- + dAtA[i] = 0x28 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field4 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + i-- + dAtA[i] = 0x20 } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field3 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 + } + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22303,161 +22319,150 @@ } func (m *NidRepNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x9 - i++ - f1 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f1)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field15) > 0 { + for iNdEx := len(m.Field15) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field15[iNdEx]) + copy(dAtA[i:], m.Field15[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15[iNdEx]))) + i-- + dAtA[i] = 0x7a } } - if len(m.Field2) > 0 { - for _, num := range m.Field2 { - dAtA[i] = 0x15 - i++ - f2 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f2)) - i += 4 + if len(m.Field14) > 0 { + for iNdEx := len(m.Field14) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field14[iNdEx]) + copy(dAtA[i:], m.Field14[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14[iNdEx]))) + i-- + dAtA[i] = 0x72 } } - if len(m.Field3) > 0 { - for _, num := range m.Field3 { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } } - if len(m.Field4) > 0 { - for _, num := range m.Field4 { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field12) > 0 { + for iNdEx := len(m.Field12) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12[iNdEx])) + i-- + dAtA[i] = 0x61 } } - if len(m.Field5) > 0 { - for _, num := range m.Field5 { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field11) > 0 { + for iNdEx := len(m.Field11) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11[iNdEx])) + i-- + dAtA[i] = 0x59 } } - if len(m.Field6) > 0 { - for _, num := range m.Field6 { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field10) > 0 { + for iNdEx := len(m.Field10) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10[iNdEx])) + i-- + dAtA[i] = 0x55 } } - if len(m.Field7) > 0 { - for _, num := range m.Field7 { - dAtA[i] = 0x38 - i++ - x3 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x3 >= 1<<7 { - dAtA[i] = uint8(uint64(x3)&0x7f | 0x80) - x3 >>= 7 - i++ - } - dAtA[i] = uint8(x3) - i++ + if len(m.Field9) > 0 { + for iNdEx := len(m.Field9) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9[iNdEx])) + i-- + dAtA[i] = 0x4d } } if len(m.Field8) > 0 { - for _, num := range m.Field8 { + for iNdEx := len(m.Field8) - 1; iNdEx >= 0; iNdEx-- { + x1 := (uint64(m.Field8[iNdEx]) << 1) ^ uint64((m.Field8[iNdEx] >> 63)) + i = encodeVarintThetest(dAtA, i, uint64(x1)) + i-- dAtA[i] = 0x40 - i++ - x4 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x4 >= 1<<7 { - dAtA[i] = uint8(uint64(x4)&0x7f | 0x80) - x4 >>= 7 - i++ - } - dAtA[i] = uint8(x4) - i++ } } - if len(m.Field9) > 0 { - for _, num := range m.Field9 { - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.Field7) > 0 { + for iNdEx := len(m.Field7) - 1; iNdEx >= 0; iNdEx-- { + x2 := (uint32(m.Field7[iNdEx]) << 1) ^ uint32((m.Field7[iNdEx] >> 31)) + i = encodeVarintThetest(dAtA, i, uint64(x2)) + i-- + dAtA[i] = 0x38 } } - if len(m.Field10) > 0 { - for _, num := range m.Field10 { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.Field6) > 0 { + for iNdEx := len(m.Field6) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field6[iNdEx])) + i-- + dAtA[i] = 0x30 } } - if len(m.Field11) > 0 { - for _, num := range m.Field11 { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field5) > 0 { + for iNdEx := len(m.Field5) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field5[iNdEx])) + i-- + dAtA[i] = 0x28 } } - if len(m.Field12) > 0 { - for _, num := range m.Field12 { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field4) > 0 { + for iNdEx := len(m.Field4) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field4[iNdEx])) + i-- + dAtA[i] = 0x20 } } - if len(m.Field13) > 0 { - for _, b := range m.Field13 { - dAtA[i] = 0x68 - i++ - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field3[iNdEx])) + i-- + dAtA[i] = 0x18 } } - if len(m.Field14) > 0 { - for _, s := range m.Field14 { - dAtA[i] = 0x72 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f3 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f3)) + i-- + dAtA[i] = 0x15 } } - if len(m.Field15) > 0 { - for _, b := range m.Field15 { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f4 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f4)) + i-- + dAtA[i] = 0x9 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22465,161 +22470,150 @@ } func (m *NinRepNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x9 - i++ - f5 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f5)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field15) > 0 { + for iNdEx := len(m.Field15) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field15[iNdEx]) + copy(dAtA[i:], m.Field15[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15[iNdEx]))) + i-- + dAtA[i] = 0x7a } } - if len(m.Field2) > 0 { - for _, num := range m.Field2 { - dAtA[i] = 0x15 - i++ - f6 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f6)) - i += 4 + if len(m.Field14) > 0 { + for iNdEx := len(m.Field14) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field14[iNdEx]) + copy(dAtA[i:], m.Field14[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14[iNdEx]))) + i-- + dAtA[i] = 0x72 } } - if len(m.Field3) > 0 { - for _, num := range m.Field3 { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } } - if len(m.Field4) > 0 { - for _, num := range m.Field4 { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field12) > 0 { + for iNdEx := len(m.Field12) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12[iNdEx])) + i-- + dAtA[i] = 0x61 } } - if len(m.Field5) > 0 { - for _, num := range m.Field5 { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field11) > 0 { + for iNdEx := len(m.Field11) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11[iNdEx])) + i-- + dAtA[i] = 0x59 } } - if len(m.Field6) > 0 { - for _, num := range m.Field6 { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field10) > 0 { + for iNdEx := len(m.Field10) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10[iNdEx])) + i-- + dAtA[i] = 0x55 } } - if len(m.Field7) > 0 { - for _, num := range m.Field7 { - dAtA[i] = 0x38 - i++ - x7 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x7 >= 1<<7 { - dAtA[i] = uint8(uint64(x7)&0x7f | 0x80) - x7 >>= 7 - i++ - } - dAtA[i] = uint8(x7) - i++ + if len(m.Field9) > 0 { + for iNdEx := len(m.Field9) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9[iNdEx])) + i-- + dAtA[i] = 0x4d } } if len(m.Field8) > 0 { - for _, num := range m.Field8 { + for iNdEx := len(m.Field8) - 1; iNdEx >= 0; iNdEx-- { + x5 := (uint64(m.Field8[iNdEx]) << 1) ^ uint64((m.Field8[iNdEx] >> 63)) + i = encodeVarintThetest(dAtA, i, uint64(x5)) + i-- dAtA[i] = 0x40 - i++ - x8 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x8 >= 1<<7 { - dAtA[i] = uint8(uint64(x8)&0x7f | 0x80) - x8 >>= 7 - i++ - } - dAtA[i] = uint8(x8) - i++ } } - if len(m.Field9) > 0 { - for _, num := range m.Field9 { - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.Field7) > 0 { + for iNdEx := len(m.Field7) - 1; iNdEx >= 0; iNdEx-- { + x6 := (uint32(m.Field7[iNdEx]) << 1) ^ uint32((m.Field7[iNdEx] >> 31)) + i = encodeVarintThetest(dAtA, i, uint64(x6)) + i-- + dAtA[i] = 0x38 } } - if len(m.Field10) > 0 { - for _, num := range m.Field10 { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.Field6) > 0 { + for iNdEx := len(m.Field6) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field6[iNdEx])) + i-- + dAtA[i] = 0x30 } } - if len(m.Field11) > 0 { - for _, num := range m.Field11 { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field5) > 0 { + for iNdEx := len(m.Field5) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field5[iNdEx])) + i-- + dAtA[i] = 0x28 } } - if len(m.Field12) > 0 { - for _, num := range m.Field12 { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field4) > 0 { + for iNdEx := len(m.Field4) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field4[iNdEx])) + i-- + dAtA[i] = 0x20 } } - if len(m.Field13) > 0 { - for _, b := range m.Field13 { - dAtA[i] = 0x68 - i++ - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field3[iNdEx])) + i-- + dAtA[i] = 0x18 } } - if len(m.Field14) > 0 { - for _, s := range m.Field14 { - dAtA[i] = 0x72 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f7 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f7)) + i-- + dAtA[i] = 0x15 } } - if len(m.Field15) > 0 { - for _, b := range m.Field15 { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f8 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f8)) + i-- + dAtA[i] = 0x9 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepPackedNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22627,70 +22621,110 @@ } func (m *NidRepPackedNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepPackedNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field1)*8)) - for _, num := range m.Field1 { - f9 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f9)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field13))) + i-- + dAtA[i] = 0x6a } - if len(m.Field2) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field2)*4)) - for _, num := range m.Field2 { - f10 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f10)) - i += 4 + if len(m.Field12) > 0 { + for iNdEx := len(m.Field12) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12[iNdEx])) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field12)*8)) + i-- + dAtA[i] = 0x62 } - if len(m.Field3) > 0 { - dAtA12 := make([]byte, len(m.Field3)*10) - var j11 int - for _, num1 := range m.Field3 { - num := uint64(num1) - for num >= 1<<7 { - dAtA12[j11] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 - j11++ - } - dAtA12[j11] = uint8(num) - j11++ + if len(m.Field11) > 0 { + for iNdEx := len(m.Field11) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11[iNdEx])) } - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(j11)) - i += copy(dAtA[i:], dAtA12[:j11]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field11)*8)) + i-- + dAtA[i] = 0x5a } - if len(m.Field4) > 0 { - dAtA14 := make([]byte, len(m.Field4)*10) + if len(m.Field10) > 0 { + for iNdEx := len(m.Field10) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10[iNdEx])) + } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field10)*4)) + i-- + dAtA[i] = 0x52 + } + if len(m.Field9) > 0 { + for iNdEx := len(m.Field9) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9[iNdEx])) + } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field9)*4)) + i-- + dAtA[i] = 0x4a + } + if len(m.Field8) > 0 { + var j9 int + dAtA11 := make([]byte, len(m.Field8)*10) + for _, num := range m.Field8 { + x10 := (uint64(num) << 1) ^ uint64((num >> 63)) + for x10 >= 1<<7 { + dAtA11[j9] = uint8(uint64(x10)&0x7f | 0x80) + j9++ + x10 >>= 7 + } + dAtA11[j9] = uint8(x10) + j9++ + } + i -= j9 + copy(dAtA[i:], dAtA11[:j9]) + i = encodeVarintThetest(dAtA, i, uint64(j9)) + i-- + dAtA[i] = 0x42 + } + if len(m.Field7) > 0 { + dAtA12 := make([]byte, len(m.Field7)*5) var j13 int - for _, num1 := range m.Field4 { - num := uint64(num1) - for num >= 1<<7 { - dAtA14[j13] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 + for _, num := range m.Field7 { + x14 := (uint32(num) << 1) ^ uint32((num >> 31)) + for x14 >= 1<<7 { + dAtA12[j13] = uint8(uint64(x14)&0x7f | 0x80) j13++ + x14 >>= 7 } - dAtA14[j13] = uint8(num) + dAtA12[j13] = uint8(x14) j13++ } - dAtA[i] = 0x22 - i++ + i -= j13 + copy(dAtA[i:], dAtA12[:j13]) i = encodeVarintThetest(dAtA, i, uint64(j13)) - i += copy(dAtA[i:], dAtA14[:j13]) + i-- + dAtA[i] = 0x3a } - if len(m.Field5) > 0 { - dAtA16 := make([]byte, len(m.Field5)*10) + if len(m.Field6) > 0 { + dAtA16 := make([]byte, len(m.Field6)*10) var j15 int - for _, num := range m.Field5 { + for _, num := range m.Field6 { for num >= 1<<7 { dAtA16[j15] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 @@ -22699,15 +22733,16 @@ dAtA16[j15] = uint8(num) j15++ } - dAtA[i] = 0x2a - i++ + i -= j15 + copy(dAtA[i:], dAtA16[:j15]) i = encodeVarintThetest(dAtA, i, uint64(j15)) - i += copy(dAtA[i:], dAtA16[:j15]) + i-- + dAtA[i] = 0x32 } - if len(m.Field6) > 0 { - dAtA18 := make([]byte, len(m.Field6)*10) + if len(m.Field5) > 0 { + dAtA18 := make([]byte, len(m.Field5)*10) var j17 int - for _, num := range m.Field6 { + for _, num := range m.Field5 { for num >= 1<<7 { dAtA18[j17] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 @@ -22716,106 +22751,77 @@ dAtA18[j17] = uint8(num) j17++ } - dAtA[i] = 0x32 - i++ + i -= j17 + copy(dAtA[i:], dAtA18[:j17]) i = encodeVarintThetest(dAtA, i, uint64(j17)) - i += copy(dAtA[i:], dAtA18[:j17]) + i-- + dAtA[i] = 0x2a } - if len(m.Field7) > 0 { - dAtA19 := make([]byte, len(m.Field7)*5) - var j20 int - for _, num := range m.Field7 { - x21 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x21 >= 1<<7 { - dAtA19[j20] = uint8(uint64(x21)&0x7f | 0x80) - j20++ - x21 >>= 7 + if len(m.Field4) > 0 { + dAtA20 := make([]byte, len(m.Field4)*10) + var j19 int + for _, num1 := range m.Field4 { + num := uint64(num1) + for num >= 1<<7 { + dAtA20[j19] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j19++ } - dAtA19[j20] = uint8(x21) - j20++ + dAtA20[j19] = uint8(num) + j19++ } - dAtA[i] = 0x3a - i++ - i = encodeVarintThetest(dAtA, i, uint64(j20)) - i += copy(dAtA[i:], dAtA19[:j20]) + i -= j19 + copy(dAtA[i:], dAtA20[:j19]) + i = encodeVarintThetest(dAtA, i, uint64(j19)) + i-- + dAtA[i] = 0x22 } - if len(m.Field8) > 0 { - var j22 int - dAtA24 := make([]byte, len(m.Field8)*10) - for _, num := range m.Field8 { - x23 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x23 >= 1<<7 { - dAtA24[j22] = uint8(uint64(x23)&0x7f | 0x80) - j22++ - x23 >>= 7 + if len(m.Field3) > 0 { + dAtA22 := make([]byte, len(m.Field3)*10) + var j21 int + for _, num1 := range m.Field3 { + num := uint64(num1) + for num >= 1<<7 { + dAtA22[j21] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j21++ } - dAtA24[j22] = uint8(x23) - j22++ - } - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(j22)) - i += copy(dAtA[i:], dAtA24[:j22]) - } - if len(m.Field9) > 0 { - dAtA[i] = 0x4a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field9)*4)) - for _, num := range m.Field9 { - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 - } - } - if len(m.Field10) > 0 { - dAtA[i] = 0x52 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field10)*4)) - for _, num := range m.Field10 { - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 - } - } - if len(m.Field11) > 0 { - dAtA[i] = 0x5a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field11)*8)) - for _, num := range m.Field11 { - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + dAtA22[j21] = uint8(num) + j21++ } + i -= j21 + copy(dAtA[i:], dAtA22[:j21]) + i = encodeVarintThetest(dAtA, i, uint64(j21)) + i-- + dAtA[i] = 0x1a } - if len(m.Field12) > 0 { - dAtA[i] = 0x62 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field12)*8)) - for _, num := range m.Field12 { - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f23 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f23)) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field2)*4)) + i-- + dAtA[i] = 0x12 } - if len(m.Field13) > 0 { - dAtA[i] = 0x6a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field13))) - for _, b := range m.Field13 { - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f24 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f24)) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field1)*8)) + i-- + dAtA[i] = 0xa } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepPackedNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -22823,70 +22829,110 @@ } func (m *NinRepPackedNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepPackedNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field1)*8)) - for _, num := range m.Field1 { - f25 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f25)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field13))) + i-- + dAtA[i] = 0x6a } - if len(m.Field2) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field2)*4)) - for _, num := range m.Field2 { - f26 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f26)) - i += 4 + if len(m.Field12) > 0 { + for iNdEx := len(m.Field12) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12[iNdEx])) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field12)*8)) + i-- + dAtA[i] = 0x62 } - if len(m.Field3) > 0 { - dAtA28 := make([]byte, len(m.Field3)*10) - var j27 int - for _, num1 := range m.Field3 { - num := uint64(num1) - for num >= 1<<7 { - dAtA28[j27] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 - j27++ - } - dAtA28[j27] = uint8(num) - j27++ + if len(m.Field11) > 0 { + for iNdEx := len(m.Field11) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11[iNdEx])) } - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(j27)) - i += copy(dAtA[i:], dAtA28[:j27]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field11)*8)) + i-- + dAtA[i] = 0x5a } - if len(m.Field4) > 0 { - dAtA30 := make([]byte, len(m.Field4)*10) + if len(m.Field10) > 0 { + for iNdEx := len(m.Field10) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10[iNdEx])) + } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field10)*4)) + i-- + dAtA[i] = 0x52 + } + if len(m.Field9) > 0 { + for iNdEx := len(m.Field9) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9[iNdEx])) + } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field9)*4)) + i-- + dAtA[i] = 0x4a + } + if len(m.Field8) > 0 { + var j25 int + dAtA27 := make([]byte, len(m.Field8)*10) + for _, num := range m.Field8 { + x26 := (uint64(num) << 1) ^ uint64((num >> 63)) + for x26 >= 1<<7 { + dAtA27[j25] = uint8(uint64(x26)&0x7f | 0x80) + j25++ + x26 >>= 7 + } + dAtA27[j25] = uint8(x26) + j25++ + } + i -= j25 + copy(dAtA[i:], dAtA27[:j25]) + i = encodeVarintThetest(dAtA, i, uint64(j25)) + i-- + dAtA[i] = 0x42 + } + if len(m.Field7) > 0 { + dAtA28 := make([]byte, len(m.Field7)*5) var j29 int - for _, num1 := range m.Field4 { - num := uint64(num1) - for num >= 1<<7 { - dAtA30[j29] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 + for _, num := range m.Field7 { + x30 := (uint32(num) << 1) ^ uint32((num >> 31)) + for x30 >= 1<<7 { + dAtA28[j29] = uint8(uint64(x30)&0x7f | 0x80) j29++ + x30 >>= 7 } - dAtA30[j29] = uint8(num) + dAtA28[j29] = uint8(x30) j29++ } - dAtA[i] = 0x22 - i++ + i -= j29 + copy(dAtA[i:], dAtA28[:j29]) i = encodeVarintThetest(dAtA, i, uint64(j29)) - i += copy(dAtA[i:], dAtA30[:j29]) + i-- + dAtA[i] = 0x3a } - if len(m.Field5) > 0 { - dAtA32 := make([]byte, len(m.Field5)*10) + if len(m.Field6) > 0 { + dAtA32 := make([]byte, len(m.Field6)*10) var j31 int - for _, num := range m.Field5 { + for _, num := range m.Field6 { for num >= 1<<7 { dAtA32[j31] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 @@ -22895,15 +22941,16 @@ dAtA32[j31] = uint8(num) j31++ } - dAtA[i] = 0x2a - i++ + i -= j31 + copy(dAtA[i:], dAtA32[:j31]) i = encodeVarintThetest(dAtA, i, uint64(j31)) - i += copy(dAtA[i:], dAtA32[:j31]) + i-- + dAtA[i] = 0x32 } - if len(m.Field6) > 0 { - dAtA34 := make([]byte, len(m.Field6)*10) + if len(m.Field5) > 0 { + dAtA34 := make([]byte, len(m.Field5)*10) var j33 int - for _, num := range m.Field6 { + for _, num := range m.Field5 { for num >= 1<<7 { dAtA34[j33] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 @@ -22912,106 +22959,77 @@ dAtA34[j33] = uint8(num) j33++ } - dAtA[i] = 0x32 - i++ + i -= j33 + copy(dAtA[i:], dAtA34[:j33]) i = encodeVarintThetest(dAtA, i, uint64(j33)) - i += copy(dAtA[i:], dAtA34[:j33]) + i-- + dAtA[i] = 0x2a } - if len(m.Field7) > 0 { - dAtA35 := make([]byte, len(m.Field7)*5) - var j36 int - for _, num := range m.Field7 { - x37 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x37 >= 1<<7 { - dAtA35[j36] = uint8(uint64(x37)&0x7f | 0x80) - j36++ - x37 >>= 7 - } - dAtA35[j36] = uint8(x37) - j36++ - } - dAtA[i] = 0x3a - i++ - i = encodeVarintThetest(dAtA, i, uint64(j36)) - i += copy(dAtA[i:], dAtA35[:j36]) - } - if len(m.Field8) > 0 { - var j38 int - dAtA40 := make([]byte, len(m.Field8)*10) - for _, num := range m.Field8 { - x39 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x39 >= 1<<7 { - dAtA40[j38] = uint8(uint64(x39)&0x7f | 0x80) - j38++ - x39 >>= 7 + if len(m.Field4) > 0 { + dAtA36 := make([]byte, len(m.Field4)*10) + var j35 int + for _, num1 := range m.Field4 { + num := uint64(num1) + for num >= 1<<7 { + dAtA36[j35] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j35++ } - dAtA40[j38] = uint8(x39) - j38++ - } - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(j38)) - i += copy(dAtA[i:], dAtA40[:j38]) - } - if len(m.Field9) > 0 { - dAtA[i] = 0x4a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field9)*4)) - for _, num := range m.Field9 { - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 - } - } - if len(m.Field10) > 0 { - dAtA[i] = 0x52 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field10)*4)) - for _, num := range m.Field10 { - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + dAtA36[j35] = uint8(num) + j35++ } + i -= j35 + copy(dAtA[i:], dAtA36[:j35]) + i = encodeVarintThetest(dAtA, i, uint64(j35)) + i-- + dAtA[i] = 0x22 } - if len(m.Field11) > 0 { - dAtA[i] = 0x5a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field11)*8)) - for _, num := range m.Field11 { - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field3) > 0 { + dAtA38 := make([]byte, len(m.Field3)*10) + var j37 int + for _, num1 := range m.Field3 { + num := uint64(num1) + for num >= 1<<7 { + dAtA38[j37] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j37++ + } + dAtA38[j37] = uint8(num) + j37++ } + i -= j37 + copy(dAtA[i:], dAtA38[:j37]) + i = encodeVarintThetest(dAtA, i, uint64(j37)) + i-- + dAtA[i] = 0x1a } - if len(m.Field12) > 0 { - dAtA[i] = 0x62 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field12)*8)) - for _, num := range m.Field12 { - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f39 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f39)) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field2)*4)) + i-- + dAtA[i] = 0x12 } - if len(m.Field13) > 0 { - dAtA[i] = 0x6a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field13))) - for _, b := range m.Field13 { - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f40 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f40)) } + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field1)*8)) + i-- + dAtA[i] = 0xa } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NidOptStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23019,76 +23037,90 @@ } func (m *NidOptStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field3.Size())) - n41, err41 := m.Field3.MarshalTo(dAtA[i:]) - if err41 != nil { - return 0, err41 - } - i += n41 - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field4.Size())) - n42, err42 := m.Field4.MarshalTo(dAtA[i:]) - if err42 != nil { - return 0, err42 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n42 - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field6)) - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field8.Size())) - n43, err43 := m.Field8.MarshalTo(dAtA[i:]) - if err43 != nil { - return 0, err43 + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - i += n43 - dAtA[i] = 0x68 - i++ + i -= len(m.Field14) + copy(dAtA[i:], m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14))) + i-- + dAtA[i] = 0x72 + i-- if m.Field13 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14))) - i += copy(dAtA[i:], m.Field14) - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + i-- + dAtA[i] = 0x68 + { + size, err := m.Field8.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x42 + i = encodeVarintThetest(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) + i-- + dAtA[i] = 0x38 + i = encodeVarintThetest(dAtA, i, uint64(m.Field6)) + i-- + dAtA[i] = 0x30 + { + size, err := m.Field4.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + { + size, err := m.Field3.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0x1a + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) + i-- + dAtA[i] = 0x15 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *NinOptStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23096,94 +23128,108 @@ } func (m *NinOptStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field3 != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field3.Size())) - n44, err44 := m.Field3.MarshalTo(dAtA[i:]) - if err44 != nil { - return 0, err44 - } - i += n44 + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } - if m.Field4 != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field4.Size())) - n45, err45 := m.Field4.MarshalTo(dAtA[i:]) - if err45 != nil { - return 0, err45 + if m.Field13 != nil { + i-- + if *m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - i += n45 + i-- + dAtA[i] = 0x68 } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + if m.Field8 != nil { + { + size, err := m.Field8.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 } if m.Field7 != nil { - dAtA[i] = 0x38 - i++ i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field8 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field8.Size())) - n46, err46 := m.Field8.MarshalTo(dAtA[i:]) - if err46 != nil { - return 0, err46 - } - i += n46 + if m.Field6 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field13 != nil { - dAtA[i] = 0x68 - i++ - if *m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.Field4 != nil { + { + size, err := m.Field4.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i++ + i-- + dAtA[i] = 0x22 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field3 != nil { + { + size, err := m.Field3.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23191,130 +23237,131 @@ } func (m *NidRepStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x9 - i++ - f47 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f47)) - i += 8 - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Field2) > 0 { - for _, num := range m.Field2 { - dAtA[i] = 0x15 - i++ - f48 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f48)) - i += 4 + if len(m.Field15) > 0 { + for iNdEx := len(m.Field15) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field15[iNdEx]) + copy(dAtA[i:], m.Field15[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15[iNdEx]))) + i-- + dAtA[i] = 0x7a } } - if len(m.Field3) > 0 { - for _, msg := range m.Field3 { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n + if len(m.Field14) > 0 { + for iNdEx := len(m.Field14) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field14[iNdEx]) + copy(dAtA[i:], m.Field14[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14[iNdEx]))) + i-- + dAtA[i] = 0x72 } } - if len(m.Field4) > 0 { - for _, msg := range m.Field4 { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - i += n + i-- + dAtA[i] = 0x68 } } - if len(m.Field6) > 0 { - for _, num := range m.Field6 { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field8) > 0 { + for iNdEx := len(m.Field8) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field8[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 } } if len(m.Field7) > 0 { - for _, num := range m.Field7 { + for iNdEx := len(m.Field7) - 1; iNdEx >= 0; iNdEx-- { + x47 := (uint32(m.Field7[iNdEx]) << 1) ^ uint32((m.Field7[iNdEx] >> 31)) + i = encodeVarintThetest(dAtA, i, uint64(x47)) + i-- dAtA[i] = 0x38 - i++ - x49 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x49 >= 1<<7 { - dAtA[i] = uint8(uint64(x49)&0x7f | 0x80) - x49 >>= 7 - i++ - } - dAtA[i] = uint8(x49) - i++ } } - if len(m.Field8) > 0 { - for _, msg := range m.Field8 { - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n + if len(m.Field6) > 0 { + for iNdEx := len(m.Field6) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field6[iNdEx])) + i-- + dAtA[i] = 0x30 } } - if len(m.Field13) > 0 { - for _, b := range m.Field13 { - dAtA[i] = 0x68 - i++ - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if len(m.Field4) > 0 { + for iNdEx := len(m.Field4) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field4[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i++ + i-- + dAtA[i] = 0x22 } } - if len(m.Field14) > 0 { - for _, s := range m.Field14 { - dAtA[i] = 0x72 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field3[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } } - if len(m.Field15) > 0 { - for _, b := range m.Field15 { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f48 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f48)) + i-- + dAtA[i] = 0x15 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f49 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f49)) + i-- + dAtA[i] = 0x9 + } } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23322,130 +23369,131 @@ } func (m *NinRepStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x9 - i++ - f50 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f50)) - i += 8 - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Field2) > 0 { - for _, num := range m.Field2 { - dAtA[i] = 0x15 - i++ - f51 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f51)) - i += 4 + if len(m.Field15) > 0 { + for iNdEx := len(m.Field15) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field15[iNdEx]) + copy(dAtA[i:], m.Field15[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15[iNdEx]))) + i-- + dAtA[i] = 0x7a } } - if len(m.Field3) > 0 { - for _, msg := range m.Field3 { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n + if len(m.Field14) > 0 { + for iNdEx := len(m.Field14) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field14[iNdEx]) + copy(dAtA[i:], m.Field14[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field14[iNdEx]))) + i-- + dAtA[i] = 0x72 } } - if len(m.Field4) > 0 { - for _, msg := range m.Field4 { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - i += n + i-- + dAtA[i] = 0x68 } } - if len(m.Field6) > 0 { - for _, num := range m.Field6 { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field8) > 0 { + for iNdEx := len(m.Field8) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field8[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 } } if len(m.Field7) > 0 { - for _, num := range m.Field7 { + for iNdEx := len(m.Field7) - 1; iNdEx >= 0; iNdEx-- { + x50 := (uint32(m.Field7[iNdEx]) << 1) ^ uint32((m.Field7[iNdEx] >> 31)) + i = encodeVarintThetest(dAtA, i, uint64(x50)) + i-- dAtA[i] = 0x38 - i++ - x52 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x52 >= 1<<7 { - dAtA[i] = uint8(uint64(x52)&0x7f | 0x80) - x52 >>= 7 - i++ - } - dAtA[i] = uint8(x52) - i++ } } - if len(m.Field8) > 0 { - for _, msg := range m.Field8 { - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n + if len(m.Field6) > 0 { + for iNdEx := len(m.Field6) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field6[iNdEx])) + i-- + dAtA[i] = 0x30 } } - if len(m.Field13) > 0 { - for _, b := range m.Field13 { - dAtA[i] = 0x68 - i++ - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if len(m.Field4) > 0 { + for iNdEx := len(m.Field4) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field4[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i++ + i-- + dAtA[i] = 0x22 } } - if len(m.Field14) > 0 { - for _, s := range m.Field14 { - dAtA[i] = 0x72 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field3[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } } - if len(m.Field15) > 0 { - for _, b := range m.Field15 { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f51 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f51)) + i-- + dAtA[i] = 0x15 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f52 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f52)) + i-- + dAtA[i] = 0x9 + } } - return i, nil + return len(dAtA) - i, nil } func (m *NidEmbeddedStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23453,50 +23501,60 @@ } func (m *NidEmbeddedStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidEmbeddedStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NidOptNative != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NidOptNative.Size())) - n53, err53 := m.NidOptNative.MarshalTo(dAtA[i:]) - if err53 != nil { - return 0, err53 - } - i += n53 - } - dAtA[i] = 0xc2 - i++ - dAtA[i] = 0xc - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field200.Size())) - n54, err54 := m.Field200.MarshalTo(dAtA[i:]) - if err54 != nil { - return 0, err54 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n54 - dAtA[i] = 0x90 - i++ - dAtA[i] = 0xd - i++ + i-- if m.Field210 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xd + i-- + dAtA[i] = 0x90 + { + size, err := m.Field200.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xc + i-- + dAtA[i] = 0xc2 + if m.NidOptNative != nil { + { + size, err := m.NidOptNative.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func (m *NinEmbeddedStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23504,54 +23562,64 @@ } func (m *NinEmbeddedStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinEmbeddedStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NidOptNative != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NidOptNative.Size())) - n55, err55 := m.NidOptNative.MarshalTo(dAtA[i:]) - if err55 != nil { - return 0, err55 - } - i += n55 - } - if m.Field200 != nil { - dAtA[i] = 0xc2 - i++ - dAtA[i] = 0xc - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field200.Size())) - n56, err56 := m.Field200.MarshalTo(dAtA[i:]) - if err56 != nil { - return 0, err56 - } - i += n56 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field210 != nil { - dAtA[i] = 0x90 - i++ - dAtA[i] = 0xd - i++ + i-- if *m.Field210 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0xd + i-- + dAtA[i] = 0x90 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field200 != nil { + { + size, err := m.Field200.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xc + i-- + dAtA[i] = 0xc2 + } + if m.NidOptNative != nil { + { + size, err := m.NidOptNative.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NidNestedStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23559,40 +23627,50 @@ } func (m *NidNestedStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidNestedStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n57, err57 := m.Field1.MarshalTo(dAtA[i:]) - if err57 != nil { - return 0, err57 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n57 if len(m.Field2) > 0 { - for _, msg := range m.Field2 { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field2[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + { + size, err := m.Field1.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *NinNestedStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23600,42 +23678,52 @@ } func (m *NinNestedStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinNestedStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n58, err58 := m.Field1.MarshalTo(dAtA[i:]) - if err58 != nil { - return 0, err58 - } - i += n58 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Field2) > 0 { - for _, msg := range m.Field2 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Field2[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) + } + } + if m.Field1 != nil { + { + size, err := m.Field1.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } - i += n + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NidOptCustom) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23643,36 +23731,46 @@ } func (m *NidOptCustom) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptCustom) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Id.Size())) - n59, err59 := m.Id.MarshalTo(dAtA[i:]) - if err59 != nil { - return 0, err59 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n59 - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Value.Size())) - n60, err60 := m.Value.MarshalTo(dAtA[i:]) - if err60 != nil { - return 0, err60 + { + size := m.Value.Size() + i -= size + if _, err := m.Value.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n60 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x12 + { + size := m.Id.Size() + i -= size + if _, err := m.Id.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *CustomDash) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23680,30 +23778,38 @@ } func (m *CustomDash) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomDash) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Value != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Value.Size())) - n61, err61 := m.Value.MarshalTo(dAtA[i:]) - if err61 != nil { - return 0, err61 + { + size := m.Value.Size() + i -= size + if _, err := m.Value.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n61 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptCustom) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23711,40 +23817,50 @@ } func (m *NinOptCustom) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptCustom) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Id != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Id.Size())) - n62, err62 := m.Id.MarshalTo(dAtA[i:]) - if err62 != nil { - return 0, err62 - } - i += n62 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Value != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Value.Size())) - n63, err63 := m.Value.MarshalTo(dAtA[i:]) - if err63 != nil { - return 0, err63 + { + size := m.Value.Size() + i -= size + if _, err := m.Value.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n63 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Id != nil { + { + size := m.Id.Size() + i -= size + if _, err := m.Id.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepCustom) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23752,44 +23868,54 @@ } func (m *NidRepCustom) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepCustom) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Id) > 0 { - for _, msg := range m.Id { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Value) > 0 { - for _, msg := range m.Value { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Value) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Value[iNdEx].Size() + i -= size + if _, err := m.Value[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Id) > 0 { + for iNdEx := len(m.Id) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Id[iNdEx].Size() + i -= size + if _, err := m.Id[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepCustom) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23797,44 +23923,54 @@ } func (m *NinRepCustom) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepCustom) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Id) > 0 { - for _, msg := range m.Id { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Value) > 0 { - for _, msg := range m.Value { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Value) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Value[iNdEx].Size() + i -= size + if _, err := m.Value[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Id) > 0 { + for iNdEx := len(m.Id) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Id[iNdEx].Size() + i -= size + if _, err := m.Id[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptNativeUnion) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23842,74 +23978,82 @@ } func (m *NinOptNativeUnion) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptNativeUnion) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 - } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 - } - if m.Field3 != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) - } - if m.Field4 != nil { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field5 != nil { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } if m.Field13 != nil { - dAtA[i] = 0x68 - i++ + i-- if *m.Field13 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x68 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field6 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field5 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + i-- + dAtA[i] = 0x28 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field4 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + i-- + dAtA[i] = 0x20 + } + if m.Field3 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 + } + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 + } + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptStructUnion) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -23917,84 +24061,96 @@ } func (m *NinOptStructUnion) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptStructUnion) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 - } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 - } - if m.Field3 != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field3.Size())) - n64, err64 := m.Field3.MarshalTo(dAtA[i:]) - if err64 != nil { - return 0, err64 - } - i += n64 - } - if m.Field4 != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field4.Size())) - n65, err65 := m.Field4.MarshalTo(dAtA[i:]) - if err65 != nil { - return 0, err65 - } - i += n65 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field7 != nil { - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } if m.Field13 != nil { - dAtA[i] = 0x68 - i++ + i-- if *m.Field13 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x68 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field7 != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field6 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field4 != nil { + { + size, err := m.Field4.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if m.Field3 != nil { + { + size, err := m.Field3.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 + } + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NinEmbeddedStructUnion) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24002,54 +24158,64 @@ } func (m *NinEmbeddedStructUnion) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinEmbeddedStructUnion) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NidOptNative != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NidOptNative.Size())) - n66, err66 := m.NidOptNative.MarshalTo(dAtA[i:]) - if err66 != nil { - return 0, err66 - } - i += n66 - } - if m.Field200 != nil { - dAtA[i] = 0xc2 - i++ - dAtA[i] = 0xc - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field200.Size())) - n67, err67 := m.Field200.MarshalTo(dAtA[i:]) - if err67 != nil { - return 0, err67 - } - i += n67 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field210 != nil { - dAtA[i] = 0x90 - i++ - dAtA[i] = 0xd - i++ + i-- if *m.Field210 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0xd + i-- + dAtA[i] = 0x90 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field200 != nil { + { + size, err := m.Field200.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xc + i-- + dAtA[i] = 0xc2 + } + if m.NidOptNative != nil { + { + size, err := m.NidOptNative.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NinNestedStructUnion) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24057,50 +24223,62 @@ } func (m *NinNestedStructUnion) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinNestedStructUnion) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n68, err68 := m.Field1.MarshalTo(dAtA[i:]) - if err68 != nil { - return 0, err68 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Field3 != nil { + { + size, err := m.Field3.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n68 + i-- + dAtA[i] = 0x1a } if m.Field2 != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field2.Size())) - n69, err69 := m.Field2.MarshalTo(dAtA[i:]) - if err69 != nil { - return 0, err69 + { + size, err := m.Field2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n69 + i-- + dAtA[i] = 0x12 } - if m.Field3 != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field3.Size())) - n70, err70 := m.Field3.MarshalTo(dAtA[i:]) - if err70 != nil { - return 0, err70 + if m.Field1 != nil { + { + size, err := m.Field1.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n70 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *Tree) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24108,50 +24286,62 @@ } func (m *Tree) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Tree) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Or != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Or.Size())) - n71, err71 := m.Or.MarshalTo(dAtA[i:]) - if err71 != nil { - return 0, err71 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Leaf != nil { + { + size, err := m.Leaf.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n71 + i-- + dAtA[i] = 0x1a } if m.And != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.And.Size())) - n72, err72 := m.And.MarshalTo(dAtA[i:]) - if err72 != nil { - return 0, err72 + { + size, err := m.And.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n72 + i-- + dAtA[i] = 0x12 } - if m.Leaf != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Leaf.Size())) - n73, err73 := m.Leaf.MarshalTo(dAtA[i:]) - if err73 != nil { - return 0, err73 + if m.Or != nil { + { + size, err := m.Or.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n73 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *OrBranch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24159,36 +24349,46 @@ } func (m *OrBranch) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OrBranch) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Left.Size())) - n74, err74 := m.Left.MarshalTo(dAtA[i:]) - if err74 != nil { - return 0, err74 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n74 - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Right.Size())) - n75, err75 := m.Right.MarshalTo(dAtA[i:]) - if err75 != nil { - return 0, err75 + { + size, err := m.Right.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n75 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x12 + { + size, err := m.Left.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *AndBranch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24196,36 +24396,46 @@ } func (m *AndBranch) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AndBranch) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Left.Size())) - n76, err76 := m.Left.MarshalTo(dAtA[i:]) - if err76 != nil { - return 0, err76 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n76 - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Right.Size())) - n77, err77 := m.Right.MarshalTo(dAtA[i:]) - if err77 != nil { - return 0, err77 + { + size, err := m.Right.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n77 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x12 + { + size, err := m.Left.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *Leaf) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24233,27 +24443,34 @@ } func (m *Leaf) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Leaf) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Value)) - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.StrValue))) - i += copy(dAtA[i:], m.StrValue) if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + i -= len(m.StrValue) + copy(dAtA[i:], m.StrValue) + i = encodeVarintThetest(dAtA, i, uint64(len(m.StrValue))) + i-- + dAtA[i] = 0x12 + i = encodeVarintThetest(dAtA, i, uint64(m.Value)) + i-- + dAtA[i] = 0x8 + return len(dAtA) - i, nil } func (m *DeepTree) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24261,50 +24478,62 @@ } func (m *DeepTree) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DeepTree) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Down != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Down.Size())) - n78, err78 := m.Down.MarshalTo(dAtA[i:]) - if err78 != nil { - return 0, err78 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Leaf != nil { + { + size, err := m.Leaf.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n78 + i-- + dAtA[i] = 0x1a } if m.And != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.And.Size())) - n79, err79 := m.And.MarshalTo(dAtA[i:]) - if err79 != nil { - return 0, err79 + { + size, err := m.And.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n79 + i-- + dAtA[i] = 0x12 } - if m.Leaf != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Leaf.Size())) - n80, err80 := m.Leaf.MarshalTo(dAtA[i:]) - if err80 != nil { - return 0, err80 + if m.Down != nil { + { + size, err := m.Down.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n80 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *ADeepBranch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24312,28 +24541,36 @@ } func (m *ADeepBranch) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ADeepBranch) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Down.Size())) - n81, err81 := m.Down.MarshalTo(dAtA[i:]) - if err81 != nil { - return 0, err81 - } - i += n81 if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + { + size, err := m.Down.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0x12 + return len(dAtA) - i, nil } func (m *AndDeepBranch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24341,36 +24578,46 @@ } func (m *AndDeepBranch) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AndDeepBranch) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Left.Size())) - n82, err82 := m.Left.MarshalTo(dAtA[i:]) - if err82 != nil { - return 0, err82 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n82 - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Right.Size())) - n83, err83 := m.Right.MarshalTo(dAtA[i:]) - if err83 != nil { - return 0, err83 + { + size, err := m.Right.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n83 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x12 + { + size, err := m.Left.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *DeepLeaf) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24378,28 +24625,36 @@ } func (m *DeepLeaf) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DeepLeaf) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Tree.Size())) - n84, err84 := m.Tree.MarshalTo(dAtA[i:]) - if err84 != nil { - return 0, err84 - } - i += n84 if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + { + size, err := m.Tree.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *Nil) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24407,20 +24662,26 @@ } func (m *Nil) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Nil) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *NidOptEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24428,23 +24689,29 @@ } func (m *NidOptEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1)) if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + i = encodeVarintThetest(dAtA, i, uint64(m.Field1)) + i-- + dAtA[i] = 0x8 + return len(dAtA) - i, nil } func (m *NinOptEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24452,35 +24719,41 @@ } func (m *NinOptEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) - } - if m.Field2 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field3 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 + } + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24488,41 +24761,47 @@ } func (m *NidRepEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field3[iNdEx])) + i-- + dAtA[i] = 0x18 } } if len(m.Field2) > 0 { - for _, num := range m.Field2 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field2[iNdEx])) + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) } } - if len(m.Field3) > 0 { - for _, num := range m.Field3 { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field1[iNdEx])) + i-- + dAtA[i] = 0x8 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24530,41 +24809,47 @@ } func (m *NinRepEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - for _, num := range m.Field1 { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field3[iNdEx])) + i-- + dAtA[i] = 0x18 } } if len(m.Field2) > 0 { - for _, num := range m.Field2 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field2[iNdEx])) + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) } } - if len(m.Field3) > 0 { - for _, num := range m.Field3 { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.Field1[iNdEx])) + i-- + dAtA[i] = 0x8 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptEnumDefault) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24572,35 +24857,41 @@ } func (m *NinOptEnumDefault) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptEnumDefault) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) - } - if m.Field2 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field3 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 + } + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *AnotherNinOptEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24608,35 +24899,41 @@ } func (m *AnotherNinOptEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AnotherNinOptEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) - } - if m.Field2 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field3 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 + } + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *AnotherNinOptEnumDefault) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24644,35 +24941,41 @@ } func (m *AnotherNinOptEnumDefault) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AnotherNinOptEnumDefault) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) - } - if m.Field2 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field3 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 + } + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *Timer) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24680,34 +24983,41 @@ } func (m *Timer) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Timer) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Time1)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Time2)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Data != nil { - dAtA[i] = 0x1a - i++ + i -= len(m.Data) + copy(dAtA[i:], m.Data) i = encodeVarintThetest(dAtA, i, uint64(len(m.Data))) - i += copy(dAtA[i:], m.Data) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x1a } - return i, nil + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Time2)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Time1)) + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *MyExtendable) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24715,30 +25025,36 @@ } func (m *MyExtendable) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MyExtendable) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - n, err := github_com_gogo_protobuf_proto.EncodeInternalExtension(m, dAtA[i:]) - if err != nil { + if n, err := github_com_gogo_protobuf_proto.EncodeInternalExtensionBackwards(m, dAtA[:i]); err != nil { return 0, err + } else { + i -= n } - i += n - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *OtherExtenable) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24746,45 +25062,53 @@ } func (m *OtherExtenable) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OtherExtenable) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.M != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.M.Size())) - n85, err85 := m.M.MarshalTo(dAtA[i:]) - if err85 != nil { - return 0, err85 - } - i += n85 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field2 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + if n, err := github_com_gogo_protobuf_proto.EncodeInternalExtensionBackwards(m, dAtA[:i]); err != nil { + return 0, err + } else { + i -= n } if m.Field13 != nil { - dAtA[i] = 0x68 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field13)) + i-- + dAtA[i] = 0x68 } - n, err := github_com_gogo_protobuf_proto.EncodeInternalExtension(m, dAtA[i:]) - if err != nil { - return 0, err + if m.Field2 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 } - i += n - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.M != nil { + { + size, err := m.M.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NestedDefinition) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24792,50 +25116,60 @@ } func (m *NestedDefinition) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedDefinition) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.EnumField != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.EnumField)) + if m.NM != nil { + { + size, err := m.NM.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 } if m.NNM != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NNM.Size())) - n86, err86 := m.NNM.MarshalTo(dAtA[i:]) - if err86 != nil { - return 0, err86 + { + size, err := m.NNM.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n86 + i-- + dAtA[i] = 0x1a } - if m.NM != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NM.Size())) - n87, err87 := m.NM.MarshalTo(dAtA[i:]) - if err87 != nil { - return 0, err87 - } - i += n87 + if m.EnumField != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.EnumField)) + i-- + dAtA[i] = 0x10 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *NestedDefinition_NestedMessage) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24843,36 +25177,44 @@ } func (m *NestedDefinition_NestedMessage) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedDefinition_NestedMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NestedField1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.NestedField1)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.NNM != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NNM.Size())) - n88, err88 := m.NNM.MarshalTo(dAtA[i:]) - if err88 != nil { - return 0, err88 + { + size, err := m.NNM.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n88 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.NestedField1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.NestedField1)) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NestedDefinition_NestedMessage_NestedNestedMsg) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24880,26 +25222,33 @@ } func (m *NestedDefinition_NestedMessage_NestedNestedMsg) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedDefinition_NestedMessage_NestedNestedMsg) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.NestedNestedField1 != nil { - dAtA[i] = 0x52 - i++ + i -= len(*m.NestedNestedField1) + copy(dAtA[i:], *m.NestedNestedField1) i = encodeVarintThetest(dAtA, i, uint64(len(*m.NestedNestedField1))) - i += copy(dAtA[i:], *m.NestedNestedField1) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x52 } - return i, nil + return len(dAtA) - i, nil } func (m *NestedScope) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24907,45 +25256,55 @@ } func (m *NestedScope) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedScope) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.A != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.A.Size())) - n89, err89 := m.A.MarshalTo(dAtA[i:]) - if err89 != nil { - return 0, err89 - } - i += n89 - } - if m.B != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.B)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.C != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.C.Size())) - n90, err90 := m.C.MarshalTo(dAtA[i:]) - if err90 != nil { - return 0, err90 + { + size, err := m.C.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n90 + i-- + dAtA[i] = 0x1a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.B != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.B)) + i-- + dAtA[i] = 0x10 } - return i, nil + if m.A != nil { + { + size, err := m.A.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func (m *NinOptNativeDefault) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -24953,108 +25312,116 @@ } func (m *NinOptNativeDefault) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptNativeDefault) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 - } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field3 != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field4 != nil { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } - if m.Field5 != nil { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + if m.Field13 != nil { + i-- + if *m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + if m.Field12 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) + i-- + dAtA[i] = 0x61 } - if m.Field7 != nil { - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + if m.Field11 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) + i-- + dAtA[i] = 0x59 } - if m.Field8 != nil { - dAtA[i] = 0x40 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + if m.Field10 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) + i-- + dAtA[i] = 0x55 } if m.Field9 != nil { - dAtA[i] = 0x4d - i++ + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field9)) - i += 4 + i-- + dAtA[i] = 0x4d } - if m.Field10 != nil { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) - i += 4 + if m.Field8 != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + i-- + dAtA[i] = 0x40 } - if m.Field11 != nil { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) - i += 8 + if m.Field7 != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field12 != nil { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) - i += 8 + if m.Field6 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field13 != nil { - dAtA[i] = 0x68 - i++ - if *m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if m.Field5 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field5)) + i-- + dAtA[i] = 0x28 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field4 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field4)) + i-- + dAtA[i] = 0x20 } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field3 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 + } + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *CustomContainer) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25062,28 +25429,36 @@ } func (m *CustomContainer) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomContainer) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.CustomStruct.Size())) - n91, err91 := m.CustomStruct.MarshalTo(dAtA[i:]) - if err91 != nil { - return 0, err91 - } - i += n91 if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + { + size, err := m.CustomStruct.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *CustomNameNidOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25091,80 +25466,88 @@ } func (m *CustomNameNidOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameNidOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.FieldA)))) - i += 8 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.FieldB)))) - i += 4 - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldC)) - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldD)) - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldE)) - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldF)) - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(m.FieldG)<<1)^uint32((m.FieldG>>31)))) - dAtA[i] = 0x40 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint64(m.FieldH)<<1)^uint64((m.FieldH>>63)))) - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldI)) - i += 4 - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldJ)) - i += 4 - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldK)) - i += 8 - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldL)) - i += 8 - dAtA[i] = 0x68 - i++ - if m.FieldM { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i++ - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldN))) - i += copy(dAtA[i:], m.FieldN) if m.FieldO != nil { - dAtA[i] = 0x7a - i++ + i -= len(m.FieldO) + copy(dAtA[i:], m.FieldO) i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldO))) - i += copy(dAtA[i:], m.FieldO) + i-- + dAtA[i] = 0x7a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.FieldN) + copy(dAtA[i:], m.FieldN) + i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldN))) + i-- + dAtA[i] = 0x72 + i-- + if m.FieldM { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - return i, nil + i-- + dAtA[i] = 0x68 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldL)) + i-- + dAtA[i] = 0x61 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldK)) + i-- + dAtA[i] = 0x59 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldJ)) + i-- + dAtA[i] = 0x55 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldI)) + i-- + dAtA[i] = 0x4d + i = encodeVarintThetest(dAtA, i, uint64((uint64(m.FieldH)<<1)^uint64((m.FieldH>>63)))) + i-- + dAtA[i] = 0x40 + i = encodeVarintThetest(dAtA, i, uint64((uint32(m.FieldG)<<1)^uint32((m.FieldG>>31)))) + i-- + dAtA[i] = 0x38 + i = encodeVarintThetest(dAtA, i, uint64(m.FieldF)) + i-- + dAtA[i] = 0x30 + i = encodeVarintThetest(dAtA, i, uint64(m.FieldE)) + i-- + dAtA[i] = 0x28 + i = encodeVarintThetest(dAtA, i, uint64(m.FieldD)) + i-- + dAtA[i] = 0x20 + i = encodeVarintThetest(dAtA, i, uint64(m.FieldC)) + i-- + dAtA[i] = 0x18 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.FieldB)))) + i-- + dAtA[i] = 0x15 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.FieldA)))) + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *CustomNameNinOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25172,108 +25555,116 @@ } func (m *CustomNameNinOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameNinOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.FieldA != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.FieldA)))) - i += 8 - } - if m.FieldB != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.FieldB)))) - i += 4 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.FieldC != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldC)) + if m.FieldO != nil { + i -= len(m.FieldO) + copy(dAtA[i:], m.FieldO) + i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldO))) + i-- + dAtA[i] = 0x7a } - if m.FieldD != nil { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldD)) + if m.FieldN != nil { + i -= len(*m.FieldN) + copy(dAtA[i:], *m.FieldN) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.FieldN))) + i-- + dAtA[i] = 0x72 } - if m.FieldE != nil { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldE)) + if m.FieldM != nil { + i-- + if *m.FieldM { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } - if m.FieldF != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldF)) + if m.FielL != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.FielL)) + i-- + dAtA[i] = 0x61 } - if m.FieldG != nil { - dAtA[i] = 0x38 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.FieldG)<<1)^uint32((*m.FieldG>>31)))) + if m.FieldK != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.FieldK)) + i-- + dAtA[i] = 0x59 } - if m.FieldH != nil { - dAtA[i] = 0x40 - i++ - i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.FieldH)<<1)^uint64((*m.FieldH>>63)))) + if m.FieldJ != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.FieldJ)) + i-- + dAtA[i] = 0x55 } if m.FieldI != nil { - dAtA[i] = 0x4d - i++ + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.FieldI)) - i += 4 + i-- + dAtA[i] = 0x4d } - if m.FieldJ != nil { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.FieldJ)) - i += 4 + if m.FieldH != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint64(*m.FieldH)<<1)^uint64((*m.FieldH>>63)))) + i-- + dAtA[i] = 0x40 } - if m.FieldK != nil { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.FieldK)) - i += 8 + if m.FieldG != nil { + i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.FieldG)<<1)^uint32((*m.FieldG>>31)))) + i-- + dAtA[i] = 0x38 } - if m.FielL != nil { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.FielL)) - i += 8 + if m.FieldF != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldF)) + i-- + dAtA[i] = 0x30 } - if m.FieldM != nil { - dAtA[i] = 0x68 - i++ - if *m.FieldM { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if m.FieldE != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldE)) + i-- + dAtA[i] = 0x28 } - if m.FieldN != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.FieldN))) - i += copy(dAtA[i:], *m.FieldN) + if m.FieldD != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldD)) + i-- + dAtA[i] = 0x20 } - if m.FieldO != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldO))) - i += copy(dAtA[i:], m.FieldO) + if m.FieldC != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldC)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.FieldB != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.FieldB)))) + i-- + dAtA[i] = 0x15 + } + if m.FieldA != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.FieldA)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *CustomNameNinRepNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25281,161 +25672,150 @@ } func (m *CustomNameNinRepNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameNinRepNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.FieldA) > 0 { - for _, num := range m.FieldA { - dAtA[i] = 0x9 - i++ - f92 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f92)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.FieldO) > 0 { + for iNdEx := len(m.FieldO) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.FieldO[iNdEx]) + copy(dAtA[i:], m.FieldO[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldO[iNdEx]))) + i-- + dAtA[i] = 0x7a } } - if len(m.FieldB) > 0 { - for _, num := range m.FieldB { - dAtA[i] = 0x15 - i++ - f93 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f93)) - i += 4 + if len(m.FieldN) > 0 { + for iNdEx := len(m.FieldN) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.FieldN[iNdEx]) + copy(dAtA[i:], m.FieldN[iNdEx]) + i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldN[iNdEx]))) + i-- + dAtA[i] = 0x72 } } - if len(m.FieldC) > 0 { - for _, num := range m.FieldC { - dAtA[i] = 0x18 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.FieldM) > 0 { + for iNdEx := len(m.FieldM) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.FieldM[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } } - if len(m.FieldD) > 0 { - for _, num := range m.FieldD { - dAtA[i] = 0x20 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.FieldL) > 0 { + for iNdEx := len(m.FieldL) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldL[iNdEx])) + i-- + dAtA[i] = 0x61 } } - if len(m.FieldE) > 0 { - for _, num := range m.FieldE { - dAtA[i] = 0x28 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.FieldK) > 0 { + for iNdEx := len(m.FieldK) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.FieldK[iNdEx])) + i-- + dAtA[i] = 0x59 } } - if len(m.FieldF) > 0 { - for _, num := range m.FieldF { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) + if len(m.FieldJ) > 0 { + for iNdEx := len(m.FieldJ) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldJ[iNdEx])) + i-- + dAtA[i] = 0x55 } } - if len(m.FieldG) > 0 { - for _, num := range m.FieldG { - dAtA[i] = 0x38 - i++ - x94 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x94 >= 1<<7 { - dAtA[i] = uint8(uint64(x94)&0x7f | 0x80) - x94 >>= 7 - i++ - } - dAtA[i] = uint8(x94) - i++ + if len(m.FieldI) > 0 { + for iNdEx := len(m.FieldI) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.FieldI[iNdEx])) + i-- + dAtA[i] = 0x4d } } if len(m.FieldH) > 0 { - for _, num := range m.FieldH { + for iNdEx := len(m.FieldH) - 1; iNdEx >= 0; iNdEx-- { + x87 := (uint64(m.FieldH[iNdEx]) << 1) ^ uint64((m.FieldH[iNdEx] >> 63)) + i = encodeVarintThetest(dAtA, i, uint64(x87)) + i-- dAtA[i] = 0x40 - i++ - x95 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x95 >= 1<<7 { - dAtA[i] = uint8(uint64(x95)&0x7f | 0x80) - x95 >>= 7 - i++ - } - dAtA[i] = uint8(x95) - i++ } } - if len(m.FieldI) > 0 { - for _, num := range m.FieldI { - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.FieldG) > 0 { + for iNdEx := len(m.FieldG) - 1; iNdEx >= 0; iNdEx-- { + x88 := (uint32(m.FieldG[iNdEx]) << 1) ^ uint32((m.FieldG[iNdEx] >> 31)) + i = encodeVarintThetest(dAtA, i, uint64(x88)) + i-- + dAtA[i] = 0x38 } } - if len(m.FieldJ) > 0 { - for _, num := range m.FieldJ { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 + if len(m.FieldF) > 0 { + for iNdEx := len(m.FieldF) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.FieldF[iNdEx])) + i-- + dAtA[i] = 0x30 } } - if len(m.FieldK) > 0 { - for _, num := range m.FieldK { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.FieldE) > 0 { + for iNdEx := len(m.FieldE) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.FieldE[iNdEx])) + i-- + dAtA[i] = 0x28 } } - if len(m.FieldL) > 0 { - for _, num := range m.FieldL { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.FieldD) > 0 { + for iNdEx := len(m.FieldD) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.FieldD[iNdEx])) + i-- + dAtA[i] = 0x20 } } - if len(m.FieldM) > 0 { - for _, b := range m.FieldM { - dAtA[i] = 0x68 - i++ - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.FieldC) > 0 { + for iNdEx := len(m.FieldC) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.FieldC[iNdEx])) + i-- + dAtA[i] = 0x18 } } - if len(m.FieldN) > 0 { - for _, s := range m.FieldN { - dAtA[i] = 0x72 - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + if len(m.FieldB) > 0 { + for iNdEx := len(m.FieldB) - 1; iNdEx >= 0; iNdEx-- { + f89 := math.Float32bits(float32(m.FieldB[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f89)) + i-- + dAtA[i] = 0x15 } } - if len(m.FieldO) > 0 { - for _, b := range m.FieldO { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) + if len(m.FieldA) > 0 { + for iNdEx := len(m.FieldA) - 1; iNdEx >= 0; iNdEx-- { + f90 := math.Float64bits(float64(m.FieldA[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f90)) + i-- + dAtA[i] = 0x9 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *CustomNameNinStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25443,96 +25823,110 @@ } func (m *CustomNameNinStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameNinStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.FieldA != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.FieldA)))) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.FieldB != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.FieldB)))) - i += 4 + if m.FieldJ != nil { + i -= len(m.FieldJ) + copy(dAtA[i:], m.FieldJ) + i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldJ))) + i-- + dAtA[i] = 0x7a + } + if m.FieldI != nil { + i -= len(*m.FieldI) + copy(dAtA[i:], *m.FieldI) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.FieldI))) + i-- + dAtA[i] = 0x72 } - if m.FieldC != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldC.Size())) - n96, err96 := m.FieldC.MarshalTo(dAtA[i:]) - if err96 != nil { - return 0, err96 + if m.FieldH != nil { + i-- + if *m.FieldH { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - i += n96 + i-- + dAtA[i] = 0x68 } - if len(m.FieldD) > 0 { - for _, msg := range m.FieldD { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) + if m.FieldG != nil { + { + size, err := m.FieldG.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } - i += n + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - } - if m.FieldE != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldE)) + i-- + dAtA[i] = 0x42 } if m.FieldF != nil { - dAtA[i] = 0x38 - i++ i = encodeVarintThetest(dAtA, i, uint64((uint32(*m.FieldF)<<1)^uint32((*m.FieldF>>31)))) + i-- + dAtA[i] = 0x38 } - if m.FieldG != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldG.Size())) - n97, err97 := m.FieldG.MarshalTo(dAtA[i:]) - if err97 != nil { - return 0, err97 - } - i += n97 + if m.FieldE != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldE)) + i-- + dAtA[i] = 0x30 } - if m.FieldH != nil { - dAtA[i] = 0x68 - i++ - if *m.FieldH { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if len(m.FieldD) > 0 { + for iNdEx := len(m.FieldD) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.FieldD[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 } - i++ } - if m.FieldI != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.FieldI))) - i += copy(dAtA[i:], *m.FieldI) + if m.FieldC != nil { + { + size, err := m.FieldC.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } - if m.FieldJ != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(m.FieldJ))) - i += copy(dAtA[i:], m.FieldJ) + if m.FieldB != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.FieldB)))) + i-- + dAtA[i] = 0x15 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.FieldA != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.FieldA)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *CustomNameCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25540,64 +25934,78 @@ } func (m *CustomNameCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.FieldA != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldA.Size())) - n98, err98 := m.FieldA.MarshalTo(dAtA[i:]) - if err98 != nil { - return 0, err98 - } - i += n98 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.FieldB != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldB.Size())) - n99, err99 := m.FieldB.MarshalTo(dAtA[i:]) - if err99 != nil { - return 0, err99 + if len(m.FieldD) > 0 { + for iNdEx := len(m.FieldD) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.FieldD[iNdEx].Size() + i -= size + if _, err := m.FieldD[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 } - i += n99 } if len(m.FieldC) > 0 { - for _, msg := range m.FieldC { + for iNdEx := len(m.FieldC) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.FieldC[iNdEx].Size() + i -= size + if _, err := m.FieldC[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x1a - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { + } + } + if m.FieldB != nil { + { + size := m.FieldB.Size() + i -= size + if _, err := m.FieldB.MarshalTo(dAtA[i:]); err != nil { return 0, err } - i += n + i = encodeVarintThetest(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x12 } - if len(m.FieldD) > 0 { - for _, msg := range m.FieldD { - dAtA[i] = 0x22 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { + if m.FieldA != nil { + { + size := m.FieldA.Size() + i -= size + if _, err := m.FieldA.MarshalTo(dAtA[i:]); err != nil { return 0, err } - i += n + i = encodeVarintThetest(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0xa } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *CustomNameNinEmbeddedStructUnion) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25605,54 +26013,64 @@ } func (m *CustomNameNinEmbeddedStructUnion) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameNinEmbeddedStructUnion) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NidOptNative != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.NidOptNative.Size())) - n100, err100 := m.NidOptNative.MarshalTo(dAtA[i:]) - if err100 != nil { - return 0, err100 - } - i += n100 - } - if m.FieldA != nil { - dAtA[i] = 0xc2 - i++ - dAtA[i] = 0xc - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.FieldA.Size())) - n101, err101 := m.FieldA.MarshalTo(dAtA[i:]) - if err101 != nil { - return 0, err101 - } - i += n101 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.FieldB != nil { - dAtA[i] = 0x90 - i++ - dAtA[i] = 0xd - i++ + i-- if *m.FieldB { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0xd + i-- + dAtA[i] = 0x90 + } + if m.FieldA != nil { + { + size, err := m.FieldA.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xc + i-- + dAtA[i] = 0xc2 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.NidOptNative != nil { + { + size, err := m.NidOptNative.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *CustomNameEnum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25660,32 +26078,38 @@ } func (m *CustomNameEnum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomNameEnum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.FieldA != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.FieldA)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.FieldB) > 0 { - for _, num := range m.FieldB { + for iNdEx := len(m.FieldB) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintThetest(dAtA, i, uint64(m.FieldB[iNdEx])) + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintThetest(dAtA, i, uint64(num)) } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.FieldA != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.FieldA)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *NoExtensionsMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25693,28 +26117,35 @@ } func (m *NoExtensionsMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NoExtensionsMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.XXX_extensions != nil { - i += copy(dAtA[i:], m.XXX_extensions) + i -= len(m.XXX_extensions) + copy(dAtA[i:], m.XXX_extensions) } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *Unrecognized) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25722,23 +26153,29 @@ } func (m *Unrecognized) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Unrecognized) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.Field1 != nil { - dAtA[i] = 0xa - i++ + i -= len(*m.Field1) + copy(dAtA[i:], *m.Field1) i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field1))) - i += copy(dAtA[i:], *m.Field1) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *UnrecognizedWithInner) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25746,38 +26183,47 @@ } func (m *UnrecognizedWithInner) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnrecognizedWithInner) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Embedded) > 0 { - for _, msg := range m.Embedded { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Field2 != nil { - dAtA[i] = 0x12 - i++ + i -= len(*m.Field2) + copy(dAtA[i:], *m.Field2) i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field2))) - i += copy(dAtA[i:], *m.Field2) + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Embedded) > 0 { + for iNdEx := len(m.Embedded) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Embedded[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *UnrecognizedWithInner_Inner) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25785,22 +26231,27 @@ } func (m *UnrecognizedWithInner_Inner) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnrecognizedWithInner_Inner) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.Field1 != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *UnrecognizedWithEmbed) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25808,34 +26259,43 @@ } func (m *UnrecognizedWithEmbed) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnrecognizedWithEmbed) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.UnrecognizedWithEmbed_Embedded.Size())) - n102, err102 := m.UnrecognizedWithEmbed_Embedded.MarshalTo(dAtA[i:]) - if err102 != nil { - return 0, err102 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n102 if m.Field2 != nil { - dAtA[i] = 0x12 - i++ + i -= len(*m.Field2) + copy(dAtA[i:], *m.Field2) i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field2))) - i += copy(dAtA[i:], *m.Field2) + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + { + size, err := m.UnrecognizedWithEmbed_Embedded.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *UnrecognizedWithEmbed_Embedded) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25843,22 +26303,27 @@ } func (m *UnrecognizedWithEmbed_Embedded) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnrecognizedWithEmbed_Embedded) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.Field1 != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintThetest(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *Node) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25866,38 +26331,47 @@ } func (m *Node) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Node) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Label != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(len(*m.Label))) - i += copy(dAtA[i:], *m.Label) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Children) > 0 { - for _, msg := range m.Children { - dAtA[i] = 0x12 - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Children) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Children[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Label != nil { + i -= len(*m.Label) + copy(dAtA[i:], *m.Label) + i = encodeVarintThetest(dAtA, i, uint64(len(*m.Label))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NonByteCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25905,30 +26379,38 @@ } func (m *NonByteCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NonByteCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Field1 != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n103, err103 := m.Field1.MarshalTo(dAtA[i:]) - if err103 != nil { - return 0, err103 + { + size := m.Field1.Size() + i -= size + if _, err := m.Field1.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n103 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NidOptNonByteCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25936,28 +26418,36 @@ } func (m *NidOptNonByteCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptNonByteCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n104, err104 := m.Field1.MarshalTo(dAtA[i:]) - if err104 != nil { - return 0, err104 - } - i += n104 if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + { + size := m.Field1.Size() + i -= size + if _, err := m.Field1.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *NinOptNonByteCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25965,30 +26455,38 @@ } func (m *NinOptNonByteCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptNonByteCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Field1 != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(m.Field1.Size())) - n105, err105 := m.Field1.MarshalTo(dAtA[i:]) - if err105 != nil { - return 0, err105 + { + size := m.Field1.Size() + i -= size + if _, err := m.Field1.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n105 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NidRepNonByteCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -25996,32 +26494,40 @@ } func (m *NidRepNonByteCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidRepNonByteCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Field1) > 0 { - for _, msg := range m.Field1 { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Field1[iNdEx].Size() + i -= size + if _, err := m.Field1[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepNonByteCustomType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -26029,32 +26535,40 @@ } func (m *NinRepNonByteCustomType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepNonByteCustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Field1) > 0 { - for _, msg := range m.Field1 { - dAtA[i] = 0xa - i++ - i = encodeVarintThetest(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.Field1[iNdEx].Size() + i -= size + if _, err := m.Field1[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintThetest(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *ProtoType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -26062,30 +26576,39 @@ } func (m *ProtoType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ProtoType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Field2 != nil { - dAtA[i] = 0xa - i++ + i -= len(*m.Field2) + copy(dAtA[i:], *m.Field2) i = encodeVarintThetest(dAtA, i, uint64(len(*m.Field2))) - i += copy(dAtA[i:], *m.Field2) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintThetest(dAtA []byte, offset int, v uint64) int { + offset -= sovThetest(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedNidOptNative(r randyThetest, easy bool) *NidOptNative { this := &NidOptNative{} @@ -26140,87 +26663,87 @@ func NewPopulatedNinOptNative(r randyThetest, easy bool) *NinOptNative { this := &NinOptNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := float64(r.Float64()) if r.Intn(2) == 0 { v2 *= -1 } this.Field1 = &v2 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := float32(r.Float32()) if r.Intn(2) == 0 { v3 *= -1 } this.Field2 = &v3 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := int32(r.Int31()) if r.Intn(2) == 0 { v4 *= -1 } this.Field3 = &v4 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := int64(r.Int63()) if r.Intn(2) == 0 { v5 *= -1 } this.Field4 = &v5 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := uint32(r.Uint32()) this.Field5 = &v6 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := uint64(uint64(r.Uint32())) this.Field6 = &v7 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := int32(r.Int31()) if r.Intn(2) == 0 { v8 *= -1 } this.Field7 = &v8 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := int64(r.Int63()) if r.Intn(2) == 0 { v9 *= -1 } this.Field8 = &v9 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := uint32(r.Uint32()) this.Field9 = &v10 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := int32(r.Int31()) if r.Intn(2) == 0 { v11 *= -1 } this.Field10 = &v11 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := uint64(uint64(r.Uint32())) this.Field11 = &v12 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := int64(r.Int63()) if r.Intn(2) == 0 { v13 *= -1 } this.Field12 = &v13 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v14 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := string(randStringThetest(r)) this.Field14 = &v15 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(100) this.Field15 = make([]byte, v16) for i := 0; i < v16; i++ { @@ -26235,7 +26758,7 @@ func NewPopulatedNidRepNative(r randyThetest, easy bool) *NidRepNative { this := &NidRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := r.Intn(10) this.Field1 = make([]float64, v17) for i := 0; i < v17; i++ { @@ -26245,7 +26768,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(10) this.Field2 = make([]float32, v18) for i := 0; i < v18; i++ { @@ -26255,7 +26778,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := r.Intn(10) this.Field3 = make([]int32, v19) for i := 0; i < v19; i++ { @@ -26265,7 +26788,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(10) this.Field4 = make([]int64, v20) for i := 0; i < v20; i++ { @@ -26275,21 +26798,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(10) this.Field5 = make([]uint32, v21) for i := 0; i < v21; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := r.Intn(10) this.Field6 = make([]uint64, v22) for i := 0; i < v22; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(10) this.Field7 = make([]int32, v23) for i := 0; i < v23; i++ { @@ -26299,7 +26822,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(10) this.Field8 = make([]int64, v24) for i := 0; i < v24; i++ { @@ -26309,14 +26832,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(10) this.Field9 = make([]uint32, v25) for i := 0; i < v25; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v26 := r.Intn(10) this.Field10 = make([]int32, v26) for i := 0; i < v26; i++ { @@ -26326,14 +26849,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(10) this.Field11 = make([]uint64, v27) for i := 0; i < v27; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v28 := r.Intn(10) this.Field12 = make([]int64, v28) for i := 0; i < v28; i++ { @@ -26343,21 +26866,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(10) this.Field13 = make([]bool, v29) for i := 0; i < v29; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(10) this.Field14 = make([]string, v30) for i := 0; i < v30; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v31 := r.Intn(10) this.Field15 = make([][]byte, v31) for i := 0; i < v31; i++ { @@ -26376,7 +26899,7 @@ func NewPopulatedNinRepNative(r randyThetest, easy bool) *NinRepNative { this := &NinRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(10) this.Field1 = make([]float64, v33) for i := 0; i < v33; i++ { @@ -26386,7 +26909,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v34 := r.Intn(10) this.Field2 = make([]float32, v34) for i := 0; i < v34; i++ { @@ -26396,7 +26919,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(10) this.Field3 = make([]int32, v35) for i := 0; i < v35; i++ { @@ -26406,7 +26929,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.Field4 = make([]int64, v36) for i := 0; i < v36; i++ { @@ -26416,21 +26939,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.Field5 = make([]uint32, v37) for i := 0; i < v37; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(10) this.Field6 = make([]uint64, v38) for i := 0; i < v38; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(10) this.Field7 = make([]int32, v39) for i := 0; i < v39; i++ { @@ -26440,7 +26963,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v40 := r.Intn(10) this.Field8 = make([]int64, v40) for i := 0; i < v40; i++ { @@ -26450,14 +26973,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(10) this.Field9 = make([]uint32, v41) for i := 0; i < v41; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(10) this.Field10 = make([]int32, v42) for i := 0; i < v42; i++ { @@ -26467,14 +26990,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v43 := r.Intn(10) this.Field11 = make([]uint64, v43) for i := 0; i < v43; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(10) this.Field12 = make([]int64, v44) for i := 0; i < v44; i++ { @@ -26484,21 +27007,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(10) this.Field13 = make([]bool, v45) for i := 0; i < v45; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v46 := r.Intn(10) this.Field14 = make([]string, v46) for i := 0; i < v46; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(10) this.Field15 = make([][]byte, v47) for i := 0; i < v47; i++ { @@ -26517,7 +27040,7 @@ func NewPopulatedNidRepPackedNative(r randyThetest, easy bool) *NidRepPackedNative { this := &NidRepPackedNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v49 := r.Intn(10) this.Field1 = make([]float64, v49) for i := 0; i < v49; i++ { @@ -26527,7 +27050,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(10) this.Field2 = make([]float32, v50) for i := 0; i < v50; i++ { @@ -26537,7 +27060,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(10) this.Field3 = make([]int32, v51) for i := 0; i < v51; i++ { @@ -26547,7 +27070,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v52 := r.Intn(10) this.Field4 = make([]int64, v52) for i := 0; i < v52; i++ { @@ -26557,21 +27080,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(10) this.Field5 = make([]uint32, v53) for i := 0; i < v53; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(10) this.Field6 = make([]uint64, v54) for i := 0; i < v54; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v55 := r.Intn(10) this.Field7 = make([]int32, v55) for i := 0; i < v55; i++ { @@ -26581,7 +27104,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(10) this.Field8 = make([]int64, v56) for i := 0; i < v56; i++ { @@ -26591,14 +27114,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(10) this.Field9 = make([]uint32, v57) for i := 0; i < v57; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(10) this.Field10 = make([]int32, v58) for i := 0; i < v58; i++ { @@ -26608,14 +27131,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v59 := r.Intn(10) this.Field11 = make([]uint64, v59) for i := 0; i < v59; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(10) this.Field12 = make([]int64, v60) for i := 0; i < v60; i++ { @@ -26625,7 +27148,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v61 := r.Intn(10) this.Field13 = make([]bool, v61) for i := 0; i < v61; i++ { @@ -26640,7 +27163,7 @@ func NewPopulatedNinRepPackedNative(r randyThetest, easy bool) *NinRepPackedNative { this := &NinRepPackedNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(10) this.Field1 = make([]float64, v62) for i := 0; i < v62; i++ { @@ -26650,7 +27173,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(10) this.Field2 = make([]float32, v63) for i := 0; i < v63; i++ { @@ -26660,7 +27183,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.Field3 = make([]int32, v64) for i := 0; i < v64; i++ { @@ -26670,7 +27193,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(10) this.Field4 = make([]int64, v65) for i := 0; i < v65; i++ { @@ -26680,21 +27203,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v66 := r.Intn(10) this.Field5 = make([]uint32, v66) for i := 0; i < v66; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v67 := r.Intn(10) this.Field6 = make([]uint64, v67) for i := 0; i < v67; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.Field7 = make([]int32, v68) for i := 0; i < v68; i++ { @@ -26704,7 +27227,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.Field8 = make([]int64, v69) for i := 0; i < v69; i++ { @@ -26714,14 +27237,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v70 := r.Intn(10) this.Field9 = make([]uint32, v70) for i := 0; i < v70; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(10) this.Field10 = make([]int32, v71) for i := 0; i < v71; i++ { @@ -26731,14 +27254,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v72 := r.Intn(10) this.Field11 = make([]uint64, v72) for i := 0; i < v72; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v73 := r.Intn(10) this.Field12 = make([]int64, v73) for i := 0; i < v73; i++ { @@ -26748,7 +27271,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v74 := r.Intn(10) this.Field13 = make([]bool, v74) for i := 0; i < v74; i++ { @@ -26797,49 +27320,49 @@ func NewPopulatedNinOptStruct(r randyThetest, easy bool) *NinOptStruct { this := &NinOptStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v79 := float64(r.Float64()) if r.Intn(2) == 0 { v79 *= -1 } this.Field1 = &v79 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v80 := float32(r.Float32()) if r.Intn(2) == 0 { v80 *= -1 } this.Field2 = &v80 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field3 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field4 = NewPopulatedNinOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v81 := uint64(uint64(r.Uint32())) this.Field6 = &v81 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v82 := int32(r.Int31()) if r.Intn(2) == 0 { v82 *= -1 } this.Field7 = &v82 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field8 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v83 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v83 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v84 := string(randStringThetest(r)) this.Field14 = &v84 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v85 := r.Intn(100) this.Field15 = make([]byte, v85) for i := 0; i < v85; i++ { @@ -26854,7 +27377,7 @@ func NewPopulatedNidRepStruct(r randyThetest, easy bool) *NidRepStruct { this := &NidRepStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v86 := r.Intn(10) this.Field1 = make([]float64, v86) for i := 0; i < v86; i++ { @@ -26864,7 +27387,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v87 := r.Intn(10) this.Field2 = make([]float32, v87) for i := 0; i < v87; i++ { @@ -26874,7 +27397,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v88 := r.Intn(5) this.Field3 = make([]NidOptNative, v88) for i := 0; i < v88; i++ { @@ -26882,7 +27405,7 @@ this.Field3[i] = *v89 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v90 := r.Intn(5) this.Field4 = make([]NinOptNative, v90) for i := 0; i < v90; i++ { @@ -26890,14 +27413,14 @@ this.Field4[i] = *v91 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v92 := r.Intn(10) this.Field6 = make([]uint64, v92) for i := 0; i < v92; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v93 := r.Intn(10) this.Field7 = make([]int32, v93) for i := 0; i < v93; i++ { @@ -26907,7 +27430,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v94 := r.Intn(5) this.Field8 = make([]NidOptNative, v94) for i := 0; i < v94; i++ { @@ -26915,21 +27438,21 @@ this.Field8[i] = *v95 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v96 := r.Intn(10) this.Field13 = make([]bool, v96) for i := 0; i < v96; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v97 := r.Intn(10) this.Field14 = make([]string, v97) for i := 0; i < v97; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v98 := r.Intn(10) this.Field15 = make([][]byte, v98) for i := 0; i < v98; i++ { @@ -26948,7 +27471,7 @@ func NewPopulatedNinRepStruct(r randyThetest, easy bool) *NinRepStruct { this := &NinRepStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v100 := r.Intn(10) this.Field1 = make([]float64, v100) for i := 0; i < v100; i++ { @@ -26958,7 +27481,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v101 := r.Intn(10) this.Field2 = make([]float32, v101) for i := 0; i < v101; i++ { @@ -26968,28 +27491,28 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v102 := r.Intn(5) this.Field3 = make([]*NidOptNative, v102) for i := 0; i < v102; i++ { this.Field3[i] = NewPopulatedNidOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v103 := r.Intn(5) this.Field4 = make([]*NinOptNative, v103) for i := 0; i < v103; i++ { this.Field4[i] = NewPopulatedNinOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v104 := r.Intn(10) this.Field6 = make([]uint64, v104) for i := 0; i < v104; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v105 := r.Intn(10) this.Field7 = make([]int32, v105) for i := 0; i < v105; i++ { @@ -26999,28 +27522,28 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v106 := r.Intn(5) this.Field8 = make([]*NidOptNative, v106) for i := 0; i < v106; i++ { this.Field8[i] = NewPopulatedNidOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v107 := r.Intn(10) this.Field13 = make([]bool, v107) for i := 0; i < v107; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v108 := r.Intn(10) this.Field14 = make([]string, v108) for i := 0; i < v108; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v109 := r.Intn(10) this.Field15 = make([][]byte, v109) for i := 0; i < v109; i++ { @@ -27039,7 +27562,7 @@ func NewPopulatedNidEmbeddedStruct(r randyThetest, easy bool) *NidEmbeddedStruct { this := &NidEmbeddedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NidOptNative = NewPopulatedNidOptNative(r, easy) } v111 := NewPopulatedNidOptNative(r, easy) @@ -27053,13 +27576,13 @@ func NewPopulatedNinEmbeddedStruct(r randyThetest, easy bool) *NinEmbeddedStruct { this := &NinEmbeddedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NidOptNative = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field200 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v112 := bool(bool(r.Intn(2) == 0)) this.Field210 = &v112 } @@ -27073,7 +27596,7 @@ this := &NidNestedStruct{} v113 := NewPopulatedNidOptStruct(r, easy) this.Field1 = *v113 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v114 := r.Intn(5) this.Field2 = make([]NidRepStruct, v114) for i := 0; i < v114; i++ { @@ -27089,10 +27612,10 @@ func NewPopulatedNinNestedStruct(r randyThetest, easy bool) *NinNestedStruct { this := &NinNestedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedNinOptStruct(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v116 := r.Intn(5) this.Field2 = make([]*NinRepStruct, v116) for i := 0; i < v116; i++ { @@ -27119,7 +27642,7 @@ func NewPopulatedCustomDash(r randyThetest, easy bool) *CustomDash { this := &CustomDash{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Value = github_com_gogo_protobuf_test_custom_dash_type.NewPopulatedBytes(r) } if !easy && r.Intn(10) != 0 { @@ -27130,10 +27653,10 @@ func NewPopulatedNinOptCustom(r randyThetest, easy bool) *NinOptCustom { this := &NinOptCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Id = NewPopulatedUuid(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Value = github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r) } if !easy && r.Intn(10) != 0 { @@ -27144,7 +27667,7 @@ func NewPopulatedNidRepCustom(r randyThetest, easy bool) *NidRepCustom { this := &NidRepCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v119 := r.Intn(10) this.Id = make([]Uuid, v119) for i := 0; i < v119; i++ { @@ -27152,7 +27675,7 @@ this.Id[i] = *v120 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v121 := r.Intn(10) this.Value = make([]github_com_gogo_protobuf_test_custom.Uint128, v121) for i := 0; i < v121; i++ { @@ -27168,7 +27691,7 @@ func NewPopulatedNinRepCustom(r randyThetest, easy bool) *NinRepCustom { this := &NinRepCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v123 := r.Intn(10) this.Id = make([]Uuid, v123) for i := 0; i < v123; i++ { @@ -27176,7 +27699,7 @@ this.Id[i] = *v124 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v125 := r.Intn(10) this.Value = make([]github_com_gogo_protobuf_test_custom.Uint128, v125) for i := 0; i < v125; i++ { @@ -27430,15 +27953,15 @@ func NewPopulatedNinOptEnum(r randyThetest, easy bool) *NinOptEnum { this := &NinOptEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v152 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.Field1 = &v152 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v153 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v153 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v154 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v154 } @@ -27450,21 +27973,21 @@ func NewPopulatedNidRepEnum(r randyThetest, easy bool) *NidRepEnum { this := &NidRepEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v155 := r.Intn(10) this.Field1 = make([]TheTestEnum, v155) for i := 0; i < v155; i++ { this.Field1[i] = TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v156 := r.Intn(10) this.Field2 = make([]YetAnotherTestEnum, v156) for i := 0; i < v156; i++ { this.Field2[i] = YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v157 := r.Intn(10) this.Field3 = make([]YetYetAnotherTestEnum, v157) for i := 0; i < v157; i++ { @@ -27479,21 +28002,21 @@ func NewPopulatedNinRepEnum(r randyThetest, easy bool) *NinRepEnum { this := &NinRepEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v158 := r.Intn(10) this.Field1 = make([]TheTestEnum, v158) for i := 0; i < v158; i++ { this.Field1[i] = TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v159 := r.Intn(10) this.Field2 = make([]YetAnotherTestEnum, v159) for i := 0; i < v159; i++ { this.Field2[i] = YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v160 := r.Intn(10) this.Field3 = make([]YetYetAnotherTestEnum, v160) for i := 0; i < v160; i++ { @@ -27508,15 +28031,15 @@ func NewPopulatedNinOptEnumDefault(r randyThetest, easy bool) *NinOptEnumDefault { this := &NinOptEnumDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v161 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.Field1 = &v161 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v162 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v162 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v163 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v163 } @@ -27528,15 +28051,15 @@ func NewPopulatedAnotherNinOptEnum(r randyThetest, easy bool) *AnotherNinOptEnum { this := &AnotherNinOptEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v164 := AnotherTestEnum([]int32{10, 11}[r.Intn(2)]) this.Field1 = &v164 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v165 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v165 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v166 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v166 } @@ -27548,15 +28071,15 @@ func NewPopulatedAnotherNinOptEnumDefault(r randyThetest, easy bool) *AnotherNinOptEnumDefault { this := &AnotherNinOptEnumDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v167 := AnotherTestEnum([]int32{10, 11}[r.Intn(2)]) this.Field1 = &v167 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v168 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v168 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v169 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v169 } @@ -27589,7 +28112,7 @@ func NewPopulatedMyExtendable(r randyThetest, easy bool) *MyExtendable { this := &MyExtendable{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v171 := int64(r.Int63()) if r.Intn(2) == 0 { v171 *= -1 @@ -27616,17 +28139,17 @@ func NewPopulatedOtherExtenable(r randyThetest, easy bool) *OtherExtenable { this := &OtherExtenable{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.M = NewPopulatedMyExtendable(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v172 := int64(r.Int63()) if r.Intn(2) == 0 { v172 *= -1 } this.Field2 = &v172 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v173 := int64(r.Int63()) if r.Intn(2) == 0 { v173 *= -1 @@ -27660,21 +28183,21 @@ func NewPopulatedNestedDefinition(r randyThetest, easy bool) *NestedDefinition { this := &NestedDefinition{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v174 := int64(r.Int63()) if r.Intn(2) == 0 { v174 *= -1 } this.Field1 = &v174 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v175 := NestedDefinition_NestedEnum([]int32{1}[r.Intn(1)]) this.EnumField = &v175 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NNM = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NM = NewPopulatedNestedDefinition_NestedMessage(r, easy) } if !easy && r.Intn(10) != 0 { @@ -27685,11 +28208,11 @@ func NewPopulatedNestedDefinition_NestedMessage(r randyThetest, easy bool) *NestedDefinition_NestedMessage { this := &NestedDefinition_NestedMessage{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v176 := uint64(uint64(r.Uint32())) this.NestedField1 = &v176 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NNM = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } if !easy && r.Intn(10) != 0 { @@ -27700,7 +28223,7 @@ func NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r randyThetest, easy bool) *NestedDefinition_NestedMessage_NestedNestedMsg { this := &NestedDefinition_NestedMessage_NestedNestedMsg{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v177 := string(randStringThetest(r)) this.NestedNestedField1 = &v177 } @@ -27712,14 +28235,14 @@ func NewPopulatedNestedScope(r randyThetest, easy bool) *NestedScope { this := &NestedScope{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.A = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v178 := NestedDefinition_NestedEnum([]int32{1}[r.Intn(1)]) this.B = &v178 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.C = NewPopulatedNestedDefinition_NestedMessage(r, easy) } if !easy && r.Intn(10) != 0 { @@ -27730,87 +28253,87 @@ func NewPopulatedNinOptNativeDefault(r randyThetest, easy bool) *NinOptNativeDefault { this := &NinOptNativeDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v179 := float64(r.Float64()) if r.Intn(2) == 0 { v179 *= -1 } this.Field1 = &v179 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v180 := float32(r.Float32()) if r.Intn(2) == 0 { v180 *= -1 } this.Field2 = &v180 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v181 := int32(r.Int31()) if r.Intn(2) == 0 { v181 *= -1 } this.Field3 = &v181 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v182 := int64(r.Int63()) if r.Intn(2) == 0 { v182 *= -1 } this.Field4 = &v182 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v183 := uint32(r.Uint32()) this.Field5 = &v183 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v184 := uint64(uint64(r.Uint32())) this.Field6 = &v184 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v185 := int32(r.Int31()) if r.Intn(2) == 0 { v185 *= -1 } this.Field7 = &v185 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v186 := int64(r.Int63()) if r.Intn(2) == 0 { v186 *= -1 } this.Field8 = &v186 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v187 := uint32(r.Uint32()) this.Field9 = &v187 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v188 := int32(r.Int31()) if r.Intn(2) == 0 { v188 *= -1 } this.Field10 = &v188 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v189 := uint64(uint64(r.Uint32())) this.Field11 = &v189 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v190 := int64(r.Int63()) if r.Intn(2) == 0 { v190 *= -1 } this.Field12 = &v190 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v191 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v191 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v192 := string(randStringThetest(r)) this.Field14 = &v192 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v193 := r.Intn(100) this.Field15 = make([]byte, v193) for i := 0; i < v193; i++ { @@ -27886,87 +28409,87 @@ func NewPopulatedCustomNameNinOptNative(r randyThetest, easy bool) *CustomNameNinOptNative { this := &CustomNameNinOptNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v196 := float64(r.Float64()) if r.Intn(2) == 0 { v196 *= -1 } this.FieldA = &v196 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v197 := float32(r.Float32()) if r.Intn(2) == 0 { v197 *= -1 } this.FieldB = &v197 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v198 := int32(r.Int31()) if r.Intn(2) == 0 { v198 *= -1 } this.FieldC = &v198 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v199 := int64(r.Int63()) if r.Intn(2) == 0 { v199 *= -1 } this.FieldD = &v199 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v200 := uint32(r.Uint32()) this.FieldE = &v200 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v201 := uint64(uint64(r.Uint32())) this.FieldF = &v201 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v202 := int32(r.Int31()) if r.Intn(2) == 0 { v202 *= -1 } this.FieldG = &v202 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v203 := int64(r.Int63()) if r.Intn(2) == 0 { v203 *= -1 } this.FieldH = &v203 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v204 := uint32(r.Uint32()) this.FieldI = &v204 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v205 := int32(r.Int31()) if r.Intn(2) == 0 { v205 *= -1 } this.FieldJ = &v205 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v206 := uint64(uint64(r.Uint32())) this.FieldK = &v206 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v207 := int64(r.Int63()) if r.Intn(2) == 0 { v207 *= -1 } this.FielL = &v207 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v208 := bool(bool(r.Intn(2) == 0)) this.FieldM = &v208 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v209 := string(randStringThetest(r)) this.FieldN = &v209 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v210 := r.Intn(100) this.FieldO = make([]byte, v210) for i := 0; i < v210; i++ { @@ -27981,7 +28504,7 @@ func NewPopulatedCustomNameNinRepNative(r randyThetest, easy bool) *CustomNameNinRepNative { this := &CustomNameNinRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v211 := r.Intn(10) this.FieldA = make([]float64, v211) for i := 0; i < v211; i++ { @@ -27991,7 +28514,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v212 := r.Intn(10) this.FieldB = make([]float32, v212) for i := 0; i < v212; i++ { @@ -28001,7 +28524,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v213 := r.Intn(10) this.FieldC = make([]int32, v213) for i := 0; i < v213; i++ { @@ -28011,7 +28534,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v214 := r.Intn(10) this.FieldD = make([]int64, v214) for i := 0; i < v214; i++ { @@ -28021,21 +28544,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v215 := r.Intn(10) this.FieldE = make([]uint32, v215) for i := 0; i < v215; i++ { this.FieldE[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v216 := r.Intn(10) this.FieldF = make([]uint64, v216) for i := 0; i < v216; i++ { this.FieldF[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v217 := r.Intn(10) this.FieldG = make([]int32, v217) for i := 0; i < v217; i++ { @@ -28045,7 +28568,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v218 := r.Intn(10) this.FieldH = make([]int64, v218) for i := 0; i < v218; i++ { @@ -28055,14 +28578,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v219 := r.Intn(10) this.FieldI = make([]uint32, v219) for i := 0; i < v219; i++ { this.FieldI[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v220 := r.Intn(10) this.FieldJ = make([]int32, v220) for i := 0; i < v220; i++ { @@ -28072,14 +28595,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v221 := r.Intn(10) this.FieldK = make([]uint64, v221) for i := 0; i < v221; i++ { this.FieldK[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v222 := r.Intn(10) this.FieldL = make([]int64, v222) for i := 0; i < v222; i++ { @@ -28089,21 +28612,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v223 := r.Intn(10) this.FieldM = make([]bool, v223) for i := 0; i < v223; i++ { this.FieldM[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v224 := r.Intn(10) this.FieldN = make([]string, v224) for i := 0; i < v224; i++ { this.FieldN[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v225 := r.Intn(10) this.FieldO = make([][]byte, v225) for i := 0; i < v225; i++ { @@ -28122,53 +28645,53 @@ func NewPopulatedCustomNameNinStruct(r randyThetest, easy bool) *CustomNameNinStruct { this := &CustomNameNinStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v227 := float64(r.Float64()) if r.Intn(2) == 0 { v227 *= -1 } this.FieldA = &v227 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v228 := float32(r.Float32()) if r.Intn(2) == 0 { v228 *= -1 } this.FieldB = &v228 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldC = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v229 := r.Intn(5) this.FieldD = make([]*NinOptNative, v229) for i := 0; i < v229; i++ { this.FieldD[i] = NewPopulatedNinOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v230 := uint64(uint64(r.Uint32())) this.FieldE = &v230 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v231 := int32(r.Int31()) if r.Intn(2) == 0 { v231 *= -1 } this.FieldF = &v231 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldG = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v232 := bool(bool(r.Intn(2) == 0)) this.FieldH = &v232 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v233 := string(randStringThetest(r)) this.FieldI = &v233 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v234 := r.Intn(100) this.FieldJ = make([]byte, v234) for i := 0; i < v234; i++ { @@ -28183,13 +28706,13 @@ func NewPopulatedCustomNameCustomType(r randyThetest, easy bool) *CustomNameCustomType { this := &CustomNameCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldA = NewPopulatedUuid(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldB = github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v235 := r.Intn(10) this.FieldC = make([]Uuid, v235) for i := 0; i < v235; i++ { @@ -28197,7 +28720,7 @@ this.FieldC[i] = *v236 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v237 := r.Intn(10) this.FieldD = make([]github_com_gogo_protobuf_test_custom.Uint128, v237) for i := 0; i < v237; i++ { @@ -28228,11 +28751,11 @@ func NewPopulatedCustomNameEnum(r randyThetest, easy bool) *CustomNameEnum { this := &CustomNameEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v240 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.FieldA = &v240 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v241 := r.Intn(10) this.FieldB = make([]TheTestEnum, v241) for i := 0; i < v241; i++ { @@ -28247,7 +28770,7 @@ func NewPopulatedNoExtensionsMap(r randyThetest, easy bool) *NoExtensionsMap { this := &NoExtensionsMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v242 := int64(r.Int63()) if r.Intn(2) == 0 { v242 *= -1 @@ -28274,7 +28797,7 @@ func NewPopulatedUnrecognized(r randyThetest, easy bool) *Unrecognized { this := &Unrecognized{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v243 := string(randStringThetest(r)) this.Field1 = &v243 } @@ -28285,14 +28808,14 @@ func NewPopulatedUnrecognizedWithInner(r randyThetest, easy bool) *UnrecognizedWithInner { this := &UnrecognizedWithInner{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v244 := r.Intn(5) this.Embedded = make([]*UnrecognizedWithInner_Inner, v244) for i := 0; i < v244; i++ { this.Embedded[i] = NewPopulatedUnrecognizedWithInner_Inner(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v245 := string(randStringThetest(r)) this.Field2 = &v245 } @@ -28304,7 +28827,7 @@ func NewPopulatedUnrecognizedWithInner_Inner(r randyThetest, easy bool) *UnrecognizedWithInner_Inner { this := &UnrecognizedWithInner_Inner{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v246 := uint32(r.Uint32()) this.Field1 = &v246 } @@ -28317,7 +28840,7 @@ this := &UnrecognizedWithEmbed{} v247 := NewPopulatedUnrecognizedWithEmbed_Embedded(r, easy) this.UnrecognizedWithEmbed_Embedded = *v247 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v248 := string(randStringThetest(r)) this.Field2 = &v248 } @@ -28329,7 +28852,7 @@ func NewPopulatedUnrecognizedWithEmbed_Embedded(r randyThetest, easy bool) *UnrecognizedWithEmbed_Embedded { this := &UnrecognizedWithEmbed_Embedded{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v249 := uint32(r.Uint32()) this.Field1 = &v249 } @@ -28340,11 +28863,11 @@ func NewPopulatedNode(r randyThetest, easy bool) *Node { this := &Node{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v250 := string(randStringThetest(r)) this.Label = &v250 } - if r.Intn(10) == 0 { + if r.Intn(5) == 0 { v251 := r.Intn(5) this.Children = make([]*Node, v251) for i := 0; i < v251; i++ { @@ -28359,7 +28882,7 @@ func NewPopulatedNonByteCustomType(r randyThetest, easy bool) *NonByteCustomType { this := &NonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedT(r) } if !easy && r.Intn(10) != 0 { @@ -28380,7 +28903,7 @@ func NewPopulatedNinOptNonByteCustomType(r randyThetest, easy bool) *NinOptNonByteCustomType { this := &NinOptNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedT(r) } if !easy && r.Intn(10) != 0 { @@ -28391,7 +28914,7 @@ func NewPopulatedNidRepNonByteCustomType(r randyThetest, easy bool) *NidRepNonByteCustomType { this := &NidRepNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v253 := r.Intn(10) this.Field1 = make([]T, v253) for i := 0; i < v253; i++ { @@ -28407,7 +28930,7 @@ func NewPopulatedNinRepNonByteCustomType(r randyThetest, easy bool) *NinRepNonByteCustomType { this := &NinRepNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v255 := r.Intn(10) this.Field1 = make([]T, v255) for i := 0; i < v255; i++ { @@ -28423,7 +28946,7 @@ func NewPopulatedProtoType(r randyThetest, easy bool) *ProtoType { this := &ProtoType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v257 := string(randStringThetest(r)) this.Field2 = &v257 } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/combos/unmarshaler/thetest.pb.go golang-gogoprotobuf-1.3.1/test/combos/unmarshaler/thetest.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/combos/unmarshaler/thetest.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/combos/unmarshaler/thetest.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -34,7 +34,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type TheTestEnum int32 @@ -20187,16 +20187,16 @@ s = append(s, "Field2: "+fmt.Sprintf("%#v", this.Field2)+",\n") } if this.Field3 != nil { - vs := make([]*NidOptNative, len(this.Field3)) + vs := make([]NidOptNative, len(this.Field3)) for i := range vs { - vs[i] = &this.Field3[i] + vs[i] = this.Field3[i] } s = append(s, "Field3: "+fmt.Sprintf("%#v", vs)+",\n") } if this.Field4 != nil { - vs := make([]*NinOptNative, len(this.Field4)) + vs := make([]NinOptNative, len(this.Field4)) for i := range vs { - vs[i] = &this.Field4[i] + vs[i] = this.Field4[i] } s = append(s, "Field4: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -20207,9 +20207,9 @@ s = append(s, "Field7: "+fmt.Sprintf("%#v", this.Field7)+",\n") } if this.Field8 != nil { - vs := make([]*NidOptNative, len(this.Field8)) + vs := make([]NidOptNative, len(this.Field8)) for i := range vs { - vs[i] = &this.Field8[i] + vs[i] = this.Field8[i] } s = append(s, "Field8: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -20316,9 +20316,9 @@ s = append(s, "&test.NidNestedStruct{") s = append(s, "Field1: "+strings.Replace(this.Field1.GoString(), `&`, ``, 1)+",\n") if this.Field2 != nil { - vs := make([]*NidRepStruct, len(this.Field2)) + vs := make([]NidRepStruct, len(this.Field2)) for i := range vs { - vs[i] = &this.Field2[i] + vs[i] = this.Field2[i] } s = append(s, "Field2: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -21544,87 +21544,87 @@ func NewPopulatedNinOptNative(r randyThetest, easy bool) *NinOptNative { this := &NinOptNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := float64(r.Float64()) if r.Intn(2) == 0 { v2 *= -1 } this.Field1 = &v2 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := float32(r.Float32()) if r.Intn(2) == 0 { v3 *= -1 } this.Field2 = &v3 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := int32(r.Int31()) if r.Intn(2) == 0 { v4 *= -1 } this.Field3 = &v4 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := int64(r.Int63()) if r.Intn(2) == 0 { v5 *= -1 } this.Field4 = &v5 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := uint32(r.Uint32()) this.Field5 = &v6 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := uint64(uint64(r.Uint32())) this.Field6 = &v7 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := int32(r.Int31()) if r.Intn(2) == 0 { v8 *= -1 } this.Field7 = &v8 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := int64(r.Int63()) if r.Intn(2) == 0 { v9 *= -1 } this.Field8 = &v9 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := uint32(r.Uint32()) this.Field9 = &v10 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := int32(r.Int31()) if r.Intn(2) == 0 { v11 *= -1 } this.Field10 = &v11 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := uint64(uint64(r.Uint32())) this.Field11 = &v12 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := int64(r.Int63()) if r.Intn(2) == 0 { v13 *= -1 } this.Field12 = &v13 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v14 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := string(randStringThetest(r)) this.Field14 = &v15 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(100) this.Field15 = make([]byte, v16) for i := 0; i < v16; i++ { @@ -21639,7 +21639,7 @@ func NewPopulatedNidRepNative(r randyThetest, easy bool) *NidRepNative { this := &NidRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := r.Intn(10) this.Field1 = make([]float64, v17) for i := 0; i < v17; i++ { @@ -21649,7 +21649,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(10) this.Field2 = make([]float32, v18) for i := 0; i < v18; i++ { @@ -21659,7 +21659,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := r.Intn(10) this.Field3 = make([]int32, v19) for i := 0; i < v19; i++ { @@ -21669,7 +21669,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(10) this.Field4 = make([]int64, v20) for i := 0; i < v20; i++ { @@ -21679,21 +21679,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(10) this.Field5 = make([]uint32, v21) for i := 0; i < v21; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := r.Intn(10) this.Field6 = make([]uint64, v22) for i := 0; i < v22; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(10) this.Field7 = make([]int32, v23) for i := 0; i < v23; i++ { @@ -21703,7 +21703,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(10) this.Field8 = make([]int64, v24) for i := 0; i < v24; i++ { @@ -21713,14 +21713,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(10) this.Field9 = make([]uint32, v25) for i := 0; i < v25; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v26 := r.Intn(10) this.Field10 = make([]int32, v26) for i := 0; i < v26; i++ { @@ -21730,14 +21730,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(10) this.Field11 = make([]uint64, v27) for i := 0; i < v27; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v28 := r.Intn(10) this.Field12 = make([]int64, v28) for i := 0; i < v28; i++ { @@ -21747,21 +21747,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(10) this.Field13 = make([]bool, v29) for i := 0; i < v29; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(10) this.Field14 = make([]string, v30) for i := 0; i < v30; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v31 := r.Intn(10) this.Field15 = make([][]byte, v31) for i := 0; i < v31; i++ { @@ -21780,7 +21780,7 @@ func NewPopulatedNinRepNative(r randyThetest, easy bool) *NinRepNative { this := &NinRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(10) this.Field1 = make([]float64, v33) for i := 0; i < v33; i++ { @@ -21790,7 +21790,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v34 := r.Intn(10) this.Field2 = make([]float32, v34) for i := 0; i < v34; i++ { @@ -21800,7 +21800,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(10) this.Field3 = make([]int32, v35) for i := 0; i < v35; i++ { @@ -21810,7 +21810,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.Field4 = make([]int64, v36) for i := 0; i < v36; i++ { @@ -21820,21 +21820,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.Field5 = make([]uint32, v37) for i := 0; i < v37; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(10) this.Field6 = make([]uint64, v38) for i := 0; i < v38; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(10) this.Field7 = make([]int32, v39) for i := 0; i < v39; i++ { @@ -21844,7 +21844,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v40 := r.Intn(10) this.Field8 = make([]int64, v40) for i := 0; i < v40; i++ { @@ -21854,14 +21854,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(10) this.Field9 = make([]uint32, v41) for i := 0; i < v41; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(10) this.Field10 = make([]int32, v42) for i := 0; i < v42; i++ { @@ -21871,14 +21871,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v43 := r.Intn(10) this.Field11 = make([]uint64, v43) for i := 0; i < v43; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(10) this.Field12 = make([]int64, v44) for i := 0; i < v44; i++ { @@ -21888,21 +21888,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(10) this.Field13 = make([]bool, v45) for i := 0; i < v45; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v46 := r.Intn(10) this.Field14 = make([]string, v46) for i := 0; i < v46; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(10) this.Field15 = make([][]byte, v47) for i := 0; i < v47; i++ { @@ -21921,7 +21921,7 @@ func NewPopulatedNidRepPackedNative(r randyThetest, easy bool) *NidRepPackedNative { this := &NidRepPackedNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v49 := r.Intn(10) this.Field1 = make([]float64, v49) for i := 0; i < v49; i++ { @@ -21931,7 +21931,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(10) this.Field2 = make([]float32, v50) for i := 0; i < v50; i++ { @@ -21941,7 +21941,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(10) this.Field3 = make([]int32, v51) for i := 0; i < v51; i++ { @@ -21951,7 +21951,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v52 := r.Intn(10) this.Field4 = make([]int64, v52) for i := 0; i < v52; i++ { @@ -21961,21 +21961,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(10) this.Field5 = make([]uint32, v53) for i := 0; i < v53; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(10) this.Field6 = make([]uint64, v54) for i := 0; i < v54; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v55 := r.Intn(10) this.Field7 = make([]int32, v55) for i := 0; i < v55; i++ { @@ -21985,7 +21985,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(10) this.Field8 = make([]int64, v56) for i := 0; i < v56; i++ { @@ -21995,14 +21995,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(10) this.Field9 = make([]uint32, v57) for i := 0; i < v57; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(10) this.Field10 = make([]int32, v58) for i := 0; i < v58; i++ { @@ -22012,14 +22012,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v59 := r.Intn(10) this.Field11 = make([]uint64, v59) for i := 0; i < v59; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(10) this.Field12 = make([]int64, v60) for i := 0; i < v60; i++ { @@ -22029,7 +22029,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v61 := r.Intn(10) this.Field13 = make([]bool, v61) for i := 0; i < v61; i++ { @@ -22044,7 +22044,7 @@ func NewPopulatedNinRepPackedNative(r randyThetest, easy bool) *NinRepPackedNative { this := &NinRepPackedNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(10) this.Field1 = make([]float64, v62) for i := 0; i < v62; i++ { @@ -22054,7 +22054,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(10) this.Field2 = make([]float32, v63) for i := 0; i < v63; i++ { @@ -22064,7 +22064,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.Field3 = make([]int32, v64) for i := 0; i < v64; i++ { @@ -22074,7 +22074,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(10) this.Field4 = make([]int64, v65) for i := 0; i < v65; i++ { @@ -22084,21 +22084,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v66 := r.Intn(10) this.Field5 = make([]uint32, v66) for i := 0; i < v66; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v67 := r.Intn(10) this.Field6 = make([]uint64, v67) for i := 0; i < v67; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.Field7 = make([]int32, v68) for i := 0; i < v68; i++ { @@ -22108,7 +22108,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.Field8 = make([]int64, v69) for i := 0; i < v69; i++ { @@ -22118,14 +22118,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v70 := r.Intn(10) this.Field9 = make([]uint32, v70) for i := 0; i < v70; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(10) this.Field10 = make([]int32, v71) for i := 0; i < v71; i++ { @@ -22135,14 +22135,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v72 := r.Intn(10) this.Field11 = make([]uint64, v72) for i := 0; i < v72; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v73 := r.Intn(10) this.Field12 = make([]int64, v73) for i := 0; i < v73; i++ { @@ -22152,7 +22152,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v74 := r.Intn(10) this.Field13 = make([]bool, v74) for i := 0; i < v74; i++ { @@ -22201,49 +22201,49 @@ func NewPopulatedNinOptStruct(r randyThetest, easy bool) *NinOptStruct { this := &NinOptStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v79 := float64(r.Float64()) if r.Intn(2) == 0 { v79 *= -1 } this.Field1 = &v79 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v80 := float32(r.Float32()) if r.Intn(2) == 0 { v80 *= -1 } this.Field2 = &v80 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field3 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field4 = NewPopulatedNinOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v81 := uint64(uint64(r.Uint32())) this.Field6 = &v81 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v82 := int32(r.Int31()) if r.Intn(2) == 0 { v82 *= -1 } this.Field7 = &v82 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field8 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v83 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v83 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v84 := string(randStringThetest(r)) this.Field14 = &v84 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v85 := r.Intn(100) this.Field15 = make([]byte, v85) for i := 0; i < v85; i++ { @@ -22258,7 +22258,7 @@ func NewPopulatedNidRepStruct(r randyThetest, easy bool) *NidRepStruct { this := &NidRepStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v86 := r.Intn(10) this.Field1 = make([]float64, v86) for i := 0; i < v86; i++ { @@ -22268,7 +22268,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v87 := r.Intn(10) this.Field2 = make([]float32, v87) for i := 0; i < v87; i++ { @@ -22278,7 +22278,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v88 := r.Intn(5) this.Field3 = make([]NidOptNative, v88) for i := 0; i < v88; i++ { @@ -22286,7 +22286,7 @@ this.Field3[i] = *v89 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v90 := r.Intn(5) this.Field4 = make([]NinOptNative, v90) for i := 0; i < v90; i++ { @@ -22294,14 +22294,14 @@ this.Field4[i] = *v91 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v92 := r.Intn(10) this.Field6 = make([]uint64, v92) for i := 0; i < v92; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v93 := r.Intn(10) this.Field7 = make([]int32, v93) for i := 0; i < v93; i++ { @@ -22311,7 +22311,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v94 := r.Intn(5) this.Field8 = make([]NidOptNative, v94) for i := 0; i < v94; i++ { @@ -22319,21 +22319,21 @@ this.Field8[i] = *v95 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v96 := r.Intn(10) this.Field13 = make([]bool, v96) for i := 0; i < v96; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v97 := r.Intn(10) this.Field14 = make([]string, v97) for i := 0; i < v97; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v98 := r.Intn(10) this.Field15 = make([][]byte, v98) for i := 0; i < v98; i++ { @@ -22352,7 +22352,7 @@ func NewPopulatedNinRepStruct(r randyThetest, easy bool) *NinRepStruct { this := &NinRepStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v100 := r.Intn(10) this.Field1 = make([]float64, v100) for i := 0; i < v100; i++ { @@ -22362,7 +22362,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v101 := r.Intn(10) this.Field2 = make([]float32, v101) for i := 0; i < v101; i++ { @@ -22372,28 +22372,28 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v102 := r.Intn(5) this.Field3 = make([]*NidOptNative, v102) for i := 0; i < v102; i++ { this.Field3[i] = NewPopulatedNidOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v103 := r.Intn(5) this.Field4 = make([]*NinOptNative, v103) for i := 0; i < v103; i++ { this.Field4[i] = NewPopulatedNinOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v104 := r.Intn(10) this.Field6 = make([]uint64, v104) for i := 0; i < v104; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v105 := r.Intn(10) this.Field7 = make([]int32, v105) for i := 0; i < v105; i++ { @@ -22403,28 +22403,28 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v106 := r.Intn(5) this.Field8 = make([]*NidOptNative, v106) for i := 0; i < v106; i++ { this.Field8[i] = NewPopulatedNidOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v107 := r.Intn(10) this.Field13 = make([]bool, v107) for i := 0; i < v107; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v108 := r.Intn(10) this.Field14 = make([]string, v108) for i := 0; i < v108; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v109 := r.Intn(10) this.Field15 = make([][]byte, v109) for i := 0; i < v109; i++ { @@ -22443,7 +22443,7 @@ func NewPopulatedNidEmbeddedStruct(r randyThetest, easy bool) *NidEmbeddedStruct { this := &NidEmbeddedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NidOptNative = NewPopulatedNidOptNative(r, easy) } v111 := NewPopulatedNidOptNative(r, easy) @@ -22457,13 +22457,13 @@ func NewPopulatedNinEmbeddedStruct(r randyThetest, easy bool) *NinEmbeddedStruct { this := &NinEmbeddedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NidOptNative = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field200 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v112 := bool(bool(r.Intn(2) == 0)) this.Field210 = &v112 } @@ -22477,7 +22477,7 @@ this := &NidNestedStruct{} v113 := NewPopulatedNidOptStruct(r, easy) this.Field1 = *v113 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v114 := r.Intn(5) this.Field2 = make([]NidRepStruct, v114) for i := 0; i < v114; i++ { @@ -22493,10 +22493,10 @@ func NewPopulatedNinNestedStruct(r randyThetest, easy bool) *NinNestedStruct { this := &NinNestedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedNinOptStruct(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v116 := r.Intn(5) this.Field2 = make([]*NinRepStruct, v116) for i := 0; i < v116; i++ { @@ -22523,7 +22523,7 @@ func NewPopulatedCustomDash(r randyThetest, easy bool) *CustomDash { this := &CustomDash{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Value = github_com_gogo_protobuf_test_custom_dash_type.NewPopulatedBytes(r) } if !easy && r.Intn(10) != 0 { @@ -22534,10 +22534,10 @@ func NewPopulatedNinOptCustom(r randyThetest, easy bool) *NinOptCustom { this := &NinOptCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Id = NewPopulatedUuid(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Value = github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r) } if !easy && r.Intn(10) != 0 { @@ -22548,7 +22548,7 @@ func NewPopulatedNidRepCustom(r randyThetest, easy bool) *NidRepCustom { this := &NidRepCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v119 := r.Intn(10) this.Id = make([]Uuid, v119) for i := 0; i < v119; i++ { @@ -22556,7 +22556,7 @@ this.Id[i] = *v120 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v121 := r.Intn(10) this.Value = make([]github_com_gogo_protobuf_test_custom.Uint128, v121) for i := 0; i < v121; i++ { @@ -22572,7 +22572,7 @@ func NewPopulatedNinRepCustom(r randyThetest, easy bool) *NinRepCustom { this := &NinRepCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v123 := r.Intn(10) this.Id = make([]Uuid, v123) for i := 0; i < v123; i++ { @@ -22580,7 +22580,7 @@ this.Id[i] = *v124 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v125 := r.Intn(10) this.Value = make([]github_com_gogo_protobuf_test_custom.Uint128, v125) for i := 0; i < v125; i++ { @@ -22834,15 +22834,15 @@ func NewPopulatedNinOptEnum(r randyThetest, easy bool) *NinOptEnum { this := &NinOptEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v152 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.Field1 = &v152 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v153 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v153 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v154 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v154 } @@ -22854,21 +22854,21 @@ func NewPopulatedNidRepEnum(r randyThetest, easy bool) *NidRepEnum { this := &NidRepEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v155 := r.Intn(10) this.Field1 = make([]TheTestEnum, v155) for i := 0; i < v155; i++ { this.Field1[i] = TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v156 := r.Intn(10) this.Field2 = make([]YetAnotherTestEnum, v156) for i := 0; i < v156; i++ { this.Field2[i] = YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v157 := r.Intn(10) this.Field3 = make([]YetYetAnotherTestEnum, v157) for i := 0; i < v157; i++ { @@ -22883,21 +22883,21 @@ func NewPopulatedNinRepEnum(r randyThetest, easy bool) *NinRepEnum { this := &NinRepEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v158 := r.Intn(10) this.Field1 = make([]TheTestEnum, v158) for i := 0; i < v158; i++ { this.Field1[i] = TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v159 := r.Intn(10) this.Field2 = make([]YetAnotherTestEnum, v159) for i := 0; i < v159; i++ { this.Field2[i] = YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v160 := r.Intn(10) this.Field3 = make([]YetYetAnotherTestEnum, v160) for i := 0; i < v160; i++ { @@ -22912,15 +22912,15 @@ func NewPopulatedNinOptEnumDefault(r randyThetest, easy bool) *NinOptEnumDefault { this := &NinOptEnumDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v161 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.Field1 = &v161 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v162 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v162 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v163 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v163 } @@ -22932,15 +22932,15 @@ func NewPopulatedAnotherNinOptEnum(r randyThetest, easy bool) *AnotherNinOptEnum { this := &AnotherNinOptEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v164 := AnotherTestEnum([]int32{10, 11}[r.Intn(2)]) this.Field1 = &v164 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v165 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v165 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v166 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v166 } @@ -22952,15 +22952,15 @@ func NewPopulatedAnotherNinOptEnumDefault(r randyThetest, easy bool) *AnotherNinOptEnumDefault { this := &AnotherNinOptEnumDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v167 := AnotherTestEnum([]int32{10, 11}[r.Intn(2)]) this.Field1 = &v167 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v168 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v168 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v169 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v169 } @@ -22993,7 +22993,7 @@ func NewPopulatedMyExtendable(r randyThetest, easy bool) *MyExtendable { this := &MyExtendable{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v171 := int64(r.Int63()) if r.Intn(2) == 0 { v171 *= -1 @@ -23020,21 +23020,21 @@ func NewPopulatedOtherExtenable(r randyThetest, easy bool) *OtherExtenable { this := &OtherExtenable{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v172 := int64(r.Int63()) if r.Intn(2) == 0 { v172 *= -1 } this.Field2 = &v172 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v173 := int64(r.Int63()) if r.Intn(2) == 0 { v173 *= -1 } this.Field13 = &v173 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.M = NewPopulatedMyExtendable(r, easy) } if !easy && r.Intn(10) != 0 { @@ -23064,21 +23064,21 @@ func NewPopulatedNestedDefinition(r randyThetest, easy bool) *NestedDefinition { this := &NestedDefinition{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v174 := int64(r.Int63()) if r.Intn(2) == 0 { v174 *= -1 } this.Field1 = &v174 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v175 := NestedDefinition_NestedEnum([]int32{1}[r.Intn(1)]) this.EnumField = &v175 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NNM = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NM = NewPopulatedNestedDefinition_NestedMessage(r, easy) } if !easy && r.Intn(10) != 0 { @@ -23089,11 +23089,11 @@ func NewPopulatedNestedDefinition_NestedMessage(r randyThetest, easy bool) *NestedDefinition_NestedMessage { this := &NestedDefinition_NestedMessage{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v176 := uint64(uint64(r.Uint32())) this.NestedField1 = &v176 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NNM = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } if !easy && r.Intn(10) != 0 { @@ -23104,7 +23104,7 @@ func NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r randyThetest, easy bool) *NestedDefinition_NestedMessage_NestedNestedMsg { this := &NestedDefinition_NestedMessage_NestedNestedMsg{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v177 := string(randStringThetest(r)) this.NestedNestedField1 = &v177 } @@ -23116,14 +23116,14 @@ func NewPopulatedNestedScope(r randyThetest, easy bool) *NestedScope { this := &NestedScope{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.A = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v178 := NestedDefinition_NestedEnum([]int32{1}[r.Intn(1)]) this.B = &v178 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.C = NewPopulatedNestedDefinition_NestedMessage(r, easy) } if !easy && r.Intn(10) != 0 { @@ -23134,87 +23134,87 @@ func NewPopulatedNinOptNativeDefault(r randyThetest, easy bool) *NinOptNativeDefault { this := &NinOptNativeDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v179 := float64(r.Float64()) if r.Intn(2) == 0 { v179 *= -1 } this.Field1 = &v179 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v180 := float32(r.Float32()) if r.Intn(2) == 0 { v180 *= -1 } this.Field2 = &v180 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v181 := int32(r.Int31()) if r.Intn(2) == 0 { v181 *= -1 } this.Field3 = &v181 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v182 := int64(r.Int63()) if r.Intn(2) == 0 { v182 *= -1 } this.Field4 = &v182 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v183 := uint32(r.Uint32()) this.Field5 = &v183 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v184 := uint64(uint64(r.Uint32())) this.Field6 = &v184 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v185 := int32(r.Int31()) if r.Intn(2) == 0 { v185 *= -1 } this.Field7 = &v185 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v186 := int64(r.Int63()) if r.Intn(2) == 0 { v186 *= -1 } this.Field8 = &v186 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v187 := uint32(r.Uint32()) this.Field9 = &v187 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v188 := int32(r.Int31()) if r.Intn(2) == 0 { v188 *= -1 } this.Field10 = &v188 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v189 := uint64(uint64(r.Uint32())) this.Field11 = &v189 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v190 := int64(r.Int63()) if r.Intn(2) == 0 { v190 *= -1 } this.Field12 = &v190 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v191 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v191 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v192 := string(randStringThetest(r)) this.Field14 = &v192 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v193 := r.Intn(100) this.Field15 = make([]byte, v193) for i := 0; i < v193; i++ { @@ -23290,87 +23290,87 @@ func NewPopulatedCustomNameNinOptNative(r randyThetest, easy bool) *CustomNameNinOptNative { this := &CustomNameNinOptNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v196 := float64(r.Float64()) if r.Intn(2) == 0 { v196 *= -1 } this.FieldA = &v196 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v197 := float32(r.Float32()) if r.Intn(2) == 0 { v197 *= -1 } this.FieldB = &v197 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v198 := int32(r.Int31()) if r.Intn(2) == 0 { v198 *= -1 } this.FieldC = &v198 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v199 := int64(r.Int63()) if r.Intn(2) == 0 { v199 *= -1 } this.FieldD = &v199 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v200 := uint32(r.Uint32()) this.FieldE = &v200 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v201 := uint64(uint64(r.Uint32())) this.FieldF = &v201 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v202 := int32(r.Int31()) if r.Intn(2) == 0 { v202 *= -1 } this.FieldG = &v202 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v203 := int64(r.Int63()) if r.Intn(2) == 0 { v203 *= -1 } this.FieldH = &v203 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v204 := uint32(r.Uint32()) this.FieldI = &v204 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v205 := int32(r.Int31()) if r.Intn(2) == 0 { v205 *= -1 } this.FieldJ = &v205 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v206 := uint64(uint64(r.Uint32())) this.FieldK = &v206 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v207 := int64(r.Int63()) if r.Intn(2) == 0 { v207 *= -1 } this.FielL = &v207 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v208 := bool(bool(r.Intn(2) == 0)) this.FieldM = &v208 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v209 := string(randStringThetest(r)) this.FieldN = &v209 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v210 := r.Intn(100) this.FieldO = make([]byte, v210) for i := 0; i < v210; i++ { @@ -23385,7 +23385,7 @@ func NewPopulatedCustomNameNinRepNative(r randyThetest, easy bool) *CustomNameNinRepNative { this := &CustomNameNinRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v211 := r.Intn(10) this.FieldA = make([]float64, v211) for i := 0; i < v211; i++ { @@ -23395,7 +23395,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v212 := r.Intn(10) this.FieldB = make([]float32, v212) for i := 0; i < v212; i++ { @@ -23405,7 +23405,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v213 := r.Intn(10) this.FieldC = make([]int32, v213) for i := 0; i < v213; i++ { @@ -23415,7 +23415,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v214 := r.Intn(10) this.FieldD = make([]int64, v214) for i := 0; i < v214; i++ { @@ -23425,21 +23425,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v215 := r.Intn(10) this.FieldE = make([]uint32, v215) for i := 0; i < v215; i++ { this.FieldE[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v216 := r.Intn(10) this.FieldF = make([]uint64, v216) for i := 0; i < v216; i++ { this.FieldF[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v217 := r.Intn(10) this.FieldG = make([]int32, v217) for i := 0; i < v217; i++ { @@ -23449,7 +23449,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v218 := r.Intn(10) this.FieldH = make([]int64, v218) for i := 0; i < v218; i++ { @@ -23459,14 +23459,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v219 := r.Intn(10) this.FieldI = make([]uint32, v219) for i := 0; i < v219; i++ { this.FieldI[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v220 := r.Intn(10) this.FieldJ = make([]int32, v220) for i := 0; i < v220; i++ { @@ -23476,14 +23476,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v221 := r.Intn(10) this.FieldK = make([]uint64, v221) for i := 0; i < v221; i++ { this.FieldK[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v222 := r.Intn(10) this.FieldL = make([]int64, v222) for i := 0; i < v222; i++ { @@ -23493,21 +23493,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v223 := r.Intn(10) this.FieldM = make([]bool, v223) for i := 0; i < v223; i++ { this.FieldM[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v224 := r.Intn(10) this.FieldN = make([]string, v224) for i := 0; i < v224; i++ { this.FieldN[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v225 := r.Intn(10) this.FieldO = make([][]byte, v225) for i := 0; i < v225; i++ { @@ -23526,53 +23526,53 @@ func NewPopulatedCustomNameNinStruct(r randyThetest, easy bool) *CustomNameNinStruct { this := &CustomNameNinStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v227 := float64(r.Float64()) if r.Intn(2) == 0 { v227 *= -1 } this.FieldA = &v227 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v228 := float32(r.Float32()) if r.Intn(2) == 0 { v228 *= -1 } this.FieldB = &v228 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldC = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v229 := r.Intn(5) this.FieldD = make([]*NinOptNative, v229) for i := 0; i < v229; i++ { this.FieldD[i] = NewPopulatedNinOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v230 := uint64(uint64(r.Uint32())) this.FieldE = &v230 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v231 := int32(r.Int31()) if r.Intn(2) == 0 { v231 *= -1 } this.FieldF = &v231 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldG = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v232 := bool(bool(r.Intn(2) == 0)) this.FieldH = &v232 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v233 := string(randStringThetest(r)) this.FieldI = &v233 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v234 := r.Intn(100) this.FieldJ = make([]byte, v234) for i := 0; i < v234; i++ { @@ -23587,13 +23587,13 @@ func NewPopulatedCustomNameCustomType(r randyThetest, easy bool) *CustomNameCustomType { this := &CustomNameCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldA = NewPopulatedUuid(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldB = github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v235 := r.Intn(10) this.FieldC = make([]Uuid, v235) for i := 0; i < v235; i++ { @@ -23601,7 +23601,7 @@ this.FieldC[i] = *v236 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v237 := r.Intn(10) this.FieldD = make([]github_com_gogo_protobuf_test_custom.Uint128, v237) for i := 0; i < v237; i++ { @@ -23632,11 +23632,11 @@ func NewPopulatedCustomNameEnum(r randyThetest, easy bool) *CustomNameEnum { this := &CustomNameEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v240 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.FieldA = &v240 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v241 := r.Intn(10) this.FieldB = make([]TheTestEnum, v241) for i := 0; i < v241; i++ { @@ -23651,7 +23651,7 @@ func NewPopulatedNoExtensionsMap(r randyThetest, easy bool) *NoExtensionsMap { this := &NoExtensionsMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v242 := int64(r.Int63()) if r.Intn(2) == 0 { v242 *= -1 @@ -23678,7 +23678,7 @@ func NewPopulatedUnrecognized(r randyThetest, easy bool) *Unrecognized { this := &Unrecognized{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v243 := string(randStringThetest(r)) this.Field1 = &v243 } @@ -23689,14 +23689,14 @@ func NewPopulatedUnrecognizedWithInner(r randyThetest, easy bool) *UnrecognizedWithInner { this := &UnrecognizedWithInner{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v244 := r.Intn(5) this.Embedded = make([]*UnrecognizedWithInner_Inner, v244) for i := 0; i < v244; i++ { this.Embedded[i] = NewPopulatedUnrecognizedWithInner_Inner(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v245 := string(randStringThetest(r)) this.Field2 = &v245 } @@ -23708,7 +23708,7 @@ func NewPopulatedUnrecognizedWithInner_Inner(r randyThetest, easy bool) *UnrecognizedWithInner_Inner { this := &UnrecognizedWithInner_Inner{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v246 := uint32(r.Uint32()) this.Field1 = &v246 } @@ -23721,7 +23721,7 @@ this := &UnrecognizedWithEmbed{} v247 := NewPopulatedUnrecognizedWithEmbed_Embedded(r, easy) this.UnrecognizedWithEmbed_Embedded = *v247 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v248 := string(randStringThetest(r)) this.Field2 = &v248 } @@ -23733,7 +23733,7 @@ func NewPopulatedUnrecognizedWithEmbed_Embedded(r randyThetest, easy bool) *UnrecognizedWithEmbed_Embedded { this := &UnrecognizedWithEmbed_Embedded{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v249 := uint32(r.Uint32()) this.Field1 = &v249 } @@ -23744,11 +23744,11 @@ func NewPopulatedNode(r randyThetest, easy bool) *Node { this := &Node{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v250 := string(randStringThetest(r)) this.Label = &v250 } - if r.Intn(10) == 0 { + if r.Intn(5) == 0 { v251 := r.Intn(5) this.Children = make([]*Node, v251) for i := 0; i < v251; i++ { @@ -23763,7 +23763,7 @@ func NewPopulatedNonByteCustomType(r randyThetest, easy bool) *NonByteCustomType { this := &NonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedT(r) } if !easy && r.Intn(10) != 0 { @@ -23784,7 +23784,7 @@ func NewPopulatedNinOptNonByteCustomType(r randyThetest, easy bool) *NinOptNonByteCustomType { this := &NinOptNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedT(r) } if !easy && r.Intn(10) != 0 { @@ -23795,7 +23795,7 @@ func NewPopulatedNidRepNonByteCustomType(r randyThetest, easy bool) *NidRepNonByteCustomType { this := &NidRepNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v253 := r.Intn(10) this.Field1 = make([]T, v253) for i := 0; i < v253; i++ { @@ -23811,7 +23811,7 @@ func NewPopulatedNinRepNonByteCustomType(r randyThetest, easy bool) *NinRepNonByteCustomType { this := &NinRepNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v255 := r.Intn(10) this.Field1 = make([]T, v255) for i := 0; i < v255; i++ { @@ -23827,7 +23827,7 @@ func NewPopulatedProtoType(r randyThetest, easy bool) *ProtoType { this := &ProtoType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v257 := string(randStringThetest(r)) this.Field2 = &v257 } @@ -42202,6 +42202,7 @@ func skipThetest(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -42233,10 +42234,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -42257,55 +42256,30 @@ return 0, ErrInvalidLengthThetest } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthThetest - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowThetest - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipThetest(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthThetest - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupThetest + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthThetest + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthThetest = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowThetest = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthThetest = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowThetest = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupThetest = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/custombytesnonstruct/proto.pb.go golang-gogoprotobuf-1.3.1/test/custombytesnonstruct/proto.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/custombytesnonstruct/proto.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/custombytesnonstruct/proto.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Object struct { CustomField1 *CustomType `protobuf:"bytes,1,opt,name=CustomField1,customtype=CustomType" json:"CustomField1,omitempty"` @@ -201,6 +201,7 @@ func skipProto(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -232,10 +233,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -256,55 +255,30 @@ return 0, ErrInvalidLengthProto } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthProto - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowProto - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipProto(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthProto - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupProto + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthProto + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthProto = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowProto = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthProto = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowProto = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupProto = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/data/data.pb.go golang-gogoprotobuf-1.3.1/test/data/data.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/data/data.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/data/data.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -24,7 +24,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MyMessage struct { MyData uint32 `protobuf:"varint,1,opt,name=my_data,json=myData,proto3" json:"my_data,omitempty"` @@ -46,7 +46,7 @@ return xxx_messageInfo_MyMessage.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -176,7 +176,7 @@ func (m *MyMessage) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -184,29 +184,37 @@ } func (m *MyMessage) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MyMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.MyData != 0 { - dAtA[i] = 0x8 - i++ i = encodeVarintData(dAtA, i, uint64(m.MyData)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintData(dAtA []byte, offset int, v uint64) int { + offset -= sovData(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedMyMessage(r randyData, easy bool) *MyMessage { this := &MyMessage{} @@ -405,6 +413,7 @@ func skipData(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -436,10 +445,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -460,55 +467,30 @@ return 0, ErrInvalidLengthData } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthData - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowData - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipData(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthData - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupData + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthData + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthData = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowData = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthData = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowData = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupData = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/deterministic/deterministic.pb.go golang-gogoprotobuf-1.3.1/test/deterministic/deterministic.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/deterministic/deterministic.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/deterministic/deterministic.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type OrderedMap struct { StringMap map[string]string `protobuf:"bytes,1,rep,name=StringMap,proto3" json:"StringMap,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` @@ -42,7 +42,7 @@ } func (m *OrderedMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -88,7 +88,7 @@ return xxx_messageInfo_UnorderedMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -171,7 +171,7 @@ } func (m *NestedOrderedMap) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -221,7 +221,7 @@ } func (m *NestedMap1) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -268,7 +268,7 @@ return xxx_messageInfo_NestedUnorderedMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -322,7 +322,7 @@ return xxx_messageInfo_NestedMap2.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -901,7 +901,7 @@ func (m *OrderedMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -909,42 +909,50 @@ } func (m *OrderedMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OrderedMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.StringMap) > 0 { keysForStringMap := make([]string, 0, len(m.StringMap)) for k := range m.StringMap { keysForStringMap = append(keysForStringMap, string(k)) } github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap) - for _, k := range keysForStringMap { + for iNdEx := len(keysForStringMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringMap[string(keysForStringMap[iNdEx])] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintDeterministic(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(keysForStringMap[iNdEx]) + copy(dAtA[i:], keysForStringMap[iNdEx]) + i = encodeVarintDeterministic(dAtA, i, uint64(len(keysForStringMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - v := m.StringMap[string(k)] - mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v))) - i = encodeVarintDeterministic(dAtA, i, uint64(mapSize)) + i = encodeVarintDeterministic(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *UnorderedMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -952,37 +960,45 @@ } func (m *UnorderedMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnorderedMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.StringMap) > 0 { for k := range m.StringMap { - dAtA[i] = 0xa - i++ v := m.StringMap[k] - mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v))) - i = encodeVarintDeterministic(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ + baseI := i + i -= len(v) + copy(dAtA[i:], v) i = encodeVarintDeterministic(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintDeterministic(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintDeterministic(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NestedOrderedMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -990,52 +1006,62 @@ } func (m *NestedOrderedMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedOrderedMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.NestedMap != nil { + { + size, err := m.NestedMap.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDeterministic(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } if len(m.StringMap) > 0 { keysForStringMap := make([]string, 0, len(m.StringMap)) for k := range m.StringMap { keysForStringMap = append(keysForStringMap, string(k)) } github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap) - for _, k := range keysForStringMap { + for iNdEx := len(keysForStringMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringMap[string(keysForStringMap[iNdEx])] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintDeterministic(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(keysForStringMap[iNdEx]) + copy(dAtA[i:], keysForStringMap[iNdEx]) + i = encodeVarintDeterministic(dAtA, i, uint64(len(keysForStringMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - v := m.StringMap[string(k)] - mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v))) - i = encodeVarintDeterministic(dAtA, i, uint64(mapSize)) + i = encodeVarintDeterministic(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } - } - if m.NestedMap != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(m.NestedMap.Size())) - n1, err1 := m.NestedMap.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 } - i += n1 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *NestedMap1) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1043,42 +1069,50 @@ } func (m *NestedMap1) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedMap1) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.NestedStringMap) > 0 { keysForNestedStringMap := make([]string, 0, len(m.NestedStringMap)) for k := range m.NestedStringMap { keysForNestedStringMap = append(keysForNestedStringMap, string(k)) } github_com_gogo_protobuf_sortkeys.Strings(keysForNestedStringMap) - for _, k := range keysForNestedStringMap { + for iNdEx := len(keysForNestedStringMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.NestedStringMap[string(keysForNestedStringMap[iNdEx])] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintDeterministic(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(keysForNestedStringMap[iNdEx]) + copy(dAtA[i:], keysForNestedStringMap[iNdEx]) + i = encodeVarintDeterministic(dAtA, i, uint64(len(keysForNestedStringMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - v := m.NestedStringMap[string(k)] - mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v))) - i = encodeVarintDeterministic(dAtA, i, uint64(mapSize)) + i = encodeVarintDeterministic(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NestedUnorderedMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1086,47 +1120,57 @@ } func (m *NestedUnorderedMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedUnorderedMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.NestedMap != nil { + { + size, err := m.NestedMap.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDeterministic(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } if len(m.StringMap) > 0 { for k := range m.StringMap { - dAtA[i] = 0xa - i++ v := m.StringMap[k] - mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v))) - i = encodeVarintDeterministic(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ + baseI := i + i -= len(v) + copy(dAtA[i:], v) i = encodeVarintDeterministic(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } - } - if m.NestedMap != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(m.NestedMap.Size())) - n2, err2 := m.NestedMap.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintDeterministic(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintDeterministic(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } - i += n2 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *NestedMap2) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1134,41 +1178,51 @@ } func (m *NestedMap2) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedMap2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.NestedStringMap) > 0 { for k := range m.NestedStringMap { - dAtA[i] = 0xa - i++ v := m.NestedStringMap[k] - mapSize := 1 + len(k) + sovDeterministic(uint64(len(k))) + 1 + len(v) + sovDeterministic(uint64(len(v))) - i = encodeVarintDeterministic(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintDeterministic(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ + baseI := i + i -= len(v) + copy(dAtA[i:], v) i = encodeVarintDeterministic(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintDeterministic(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintDeterministic(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintDeterministic(dAtA []byte, offset int, v uint64) int { + offset -= sovDeterministic(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *OrderedMap) Size() (n int) { if m == nil { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/empty-issue70/empty.pb.go golang-gogoprotobuf-1.3.1/test/empty-issue70/empty.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/empty-issue70/empty.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/empty-issue70/empty.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type TestRequest struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -125,6 +125,7 @@ func skipEmpty(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -156,10 +157,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -180,55 +179,30 @@ return 0, ErrInvalidLengthEmpty } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthEmpty - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEmpty - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipEmpty(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthEmpty - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupEmpty + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthEmpty + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthEmpty = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowEmpty = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthEmpty = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowEmpty = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupEmpty = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/enumcustomname/enumcustomname.pb.go golang-gogoprotobuf-1.3.1/test/enumcustomname/enumcustomname.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/enumcustomname/enumcustomname.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/enumcustomname/enumcustomname.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -24,7 +24,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MyCustomEnum int32 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/enumdecl/enumdecl.pb.go golang-gogoprotobuf-1.3.1/test/enumdecl/enumdecl.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/enumdecl/enumdecl.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/enumdecl/enumdecl.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package var MyEnum_name = map[int32]string{ 0: "A", @@ -63,7 +63,7 @@ return xxx_messageInfo_Message.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -176,7 +176,7 @@ func (m *Message) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -184,29 +184,37 @@ } func (m *Message) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Message) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.EnumeratedField != 0 { - dAtA[i] = 0x8 - i++ i = encodeVarintEnumdecl(dAtA, i, uint64(m.EnumeratedField)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintEnumdecl(dAtA []byte, offset int, v uint64) int { + offset -= sovEnumdecl(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedMessage(r randyEnumdecl, easy bool) *Message { this := &Message{} @@ -386,6 +394,7 @@ func skipEnumdecl(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -417,10 +426,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -441,55 +448,30 @@ return 0, ErrInvalidLengthEnumdecl } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthEnumdecl - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEnumdecl - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipEnumdecl(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthEnumdecl - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupEnumdecl + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthEnumdecl + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthEnumdecl = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowEnumdecl = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthEnumdecl = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowEnumdecl = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupEnumdecl = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/enumdecl_all/enumdeclall.pb.go golang-gogoprotobuf-1.3.1/test/enumdecl_all/enumdeclall.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/enumdecl_all/enumdeclall.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/enumdecl_all/enumdeclall.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package var MyEnum_name = map[int32]string{ 0: "A", @@ -89,7 +89,7 @@ return xxx_messageInfo_Message.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -220,7 +220,7 @@ func (m *Message) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -228,34 +228,42 @@ } func (m *Message) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Message) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.EnumeratedField != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintEnumdeclall(dAtA, i, uint64(m.EnumeratedField)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.OtherenumeratedField != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintEnumdeclall(dAtA, i, uint64(m.OtherenumeratedField)) + i-- + dAtA[i] = 0x10 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.EnumeratedField != 0 { + i = encodeVarintEnumdeclall(dAtA, i, uint64(m.EnumeratedField)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintEnumdeclall(dAtA []byte, offset int, v uint64) int { + offset -= sovEnumdeclall(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedMessage(r randyEnumdeclall, easy bool) *Message { this := &Message{} @@ -458,6 +466,7 @@ func skipEnumdeclall(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -489,10 +498,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -513,55 +520,30 @@ return 0, ErrInvalidLengthEnumdeclall } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthEnumdeclall - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEnumdeclall - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipEnumdeclall(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthEnumdeclall - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupEnumdeclall + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthEnumdeclall + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthEnumdeclall = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowEnumdeclall = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthEnumdeclall = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowEnumdeclall = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupEnumdeclall = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/enumprefix/enumprefix.pb.go golang-gogoprotobuf-1.3.1/test/enumprefix/enumprefix.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/enumprefix/enumprefix.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/enumprefix/enumprefix.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MyMessage struct { TheField test.TheTestEnum `protobuf:"varint,1,opt,name=TheField,enum=test.TheTestEnum" json:"TheField"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/enumstringer/enumstringer.pb.go golang-gogoprotobuf-1.3.1/test/enumstringer/enumstringer.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/enumstringer/enumstringer.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/enumstringer/enumstringer.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type TheTestEnum int32 @@ -527,7 +527,7 @@ func NewPopulatedNinOptEnum(r randyEnumstringer, easy bool) *NinOptEnum { this := &NinOptEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.Field1 = &v1 } @@ -539,7 +539,7 @@ func NewPopulatedNidRepEnum(r randyEnumstringer, easy bool) *NidRepEnum { this := &NidRepEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.Field1 = make([]TheTestEnum, v2) for i := 0; i < v2; i++ { @@ -554,7 +554,7 @@ func NewPopulatedNinRepEnum(r randyEnumstringer, easy bool) *NinRepEnum { this := &NinRepEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.Field1 = make([]TheTestEnum, v3) for i := 0; i < v3; i++ { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/example/example.pb.go golang-gogoprotobuf-1.3.1/test/example/example.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/example/example.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/example/example.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -30,7 +30,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type A struct { Description string `protobuf:"bytes,1,opt,name=Description" json:"Description"` @@ -54,7 +54,7 @@ return xxx_messageInfo_A.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -94,7 +94,7 @@ return xxx_messageInfo_B.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -133,7 +133,7 @@ return xxx_messageInfo_C.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -180,7 +180,7 @@ return xxx_messageInfo_U.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -248,7 +248,7 @@ return xxx_messageInfo_E.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -286,7 +286,7 @@ return xxx_messageInfo_R.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -332,7 +332,7 @@ return xxx_messageInfo_CastType.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1317,7 +1317,7 @@ func (m *A) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1325,35 +1325,44 @@ } func (m *A) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *A) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintExample(dAtA, i, uint64(len(m.Description))) - i += copy(dAtA[i:], m.Description) - dAtA[i] = 0x10 - i++ - i = encodeVarintExample(dAtA, i, uint64(m.Number)) - dAtA[i] = 0x1a - i++ - i = encodeVarintExample(dAtA, i, uint64(m.Id.Size())) - n1, err1 := m.Id.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 - } - i += n1 if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + { + size := m.Id.Size() + i -= size + if _, err := m.Id.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintExample(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0x1a + i = encodeVarintExample(dAtA, i, uint64(m.Number)) + i-- + dAtA[i] = 0x10 + i -= len(m.Description) + copy(dAtA[i:], m.Description) + i = encodeVarintExample(dAtA, i, uint64(len(m.Description))) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *B) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1361,40 +1370,50 @@ } func (m *B) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *B) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintExample(dAtA, i, uint64(m.A.Size())) - n2, err2 := m.A.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n2 if len(m.G) > 0 { - for _, msg := range m.G { - dAtA[i] = 0x12 - i++ - i = encodeVarintExample(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.G) - 1; iNdEx >= 0; iNdEx-- { + { + size := m.G[iNdEx].Size() + i -= size + if _, err := m.G[iNdEx].MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintExample(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + { + size, err := m.A.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintExample(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *C) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1402,25 +1421,31 @@ } func (m *C) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *C) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.MySize != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintExample(dAtA, i, uint64(*m.MySize)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *U) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1428,40 +1453,50 @@ } func (m *U) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *U) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.A != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintExample(dAtA, i, uint64(m.A.Size())) - n3, err3 := m.A.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 - } - i += n3 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.B != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintExample(dAtA, i, uint64(m.B.Size())) - n4, err4 := m.B.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 + { + size, err := m.B.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintExample(dAtA, i, uint64(size)) } - i += n4 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.A != nil { + { + size, err := m.A.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintExample(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *E) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1469,23 +1504,30 @@ } func (m *E) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *E) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.XXX_extensions != nil { - i += copy(dAtA[i:], m.XXX_extensions) - } if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.XXX_extensions != nil { + i -= len(m.XXX_extensions) + copy(dAtA[i:], m.XXX_extensions) } - return i, nil + return len(dAtA) - i, nil } func (m *R) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1493,22 +1535,27 @@ } func (m *R) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *R) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.Recognized != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintExample(dAtA, i, uint64(*m.Recognized)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *CastType) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1516,29 +1563,37 @@ } func (m *CastType) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CastType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Int32 != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintExample(dAtA, i, uint64(*m.Int32)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintExample(dAtA []byte, offset int, v uint64) int { + offset -= sovExample(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedA(r randyExample, easy bool) *A { this := &A{} @@ -1559,7 +1614,7 @@ this := &B{} v2 := NewPopulatedA(r, easy) this.A = *v2 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.G = make([]github_com_gogo_protobuf_test_custom.Uint128, v3) for i := 0; i < v3; i++ { @@ -1575,7 +1630,7 @@ func NewPopulatedC(r randyExample, easy bool) *C { this := &C{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := int64(r.Int63()) if r.Intn(2) == 0 { v5 *= -1 @@ -1619,7 +1674,7 @@ func NewPopulatedR(r randyExample, easy bool) *R { this := &R{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := uint32(r.Uint32()) this.Recognized = &v6 } @@ -1630,7 +1685,7 @@ func NewPopulatedCastType(r randyExample, easy bool) *CastType { this := &CastType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := int32(r.Int63()) if r.Intn(2) == 0 { v7 *= -1 @@ -2635,6 +2690,7 @@ func skipExample(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -2666,10 +2722,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -2690,55 +2744,30 @@ return 0, ErrInvalidLengthExample } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthExample - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowExample - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipExample(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthExample - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupExample + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthExample + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthExample = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowExample = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthExample = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowExample = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupExample = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/filedotname/file.dot.pb.go golang-gogoprotobuf-1.3.1/test/filedotname/file.dot.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/filedotname/file.dot.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/filedotname/file.dot.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -27,7 +27,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M struct { A *string `protobuf:"bytes,1,opt,name=a" json:"a,omitempty"` @@ -469,7 +469,7 @@ } func NewPopulatedM(r randyFileDot, easy bool) *M { this := &M{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := string(randStringFileDot(r)) this.A = &v1 } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/fuzztests/fuzz.pb.go golang-gogoprotobuf-1.3.1/test/fuzztests/fuzz.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/fuzztests/fuzz.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/fuzztests/fuzz.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -24,7 +24,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Nil struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -46,7 +46,7 @@ return xxx_messageInfo_Nil.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -98,7 +98,7 @@ return xxx_messageInfo_NinRepPackedNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -243,7 +243,7 @@ return xxx_messageInfo_NinOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -397,7 +397,7 @@ return xxx_messageInfo_NinOptStruct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -700,7 +700,7 @@ func (m *Nil) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -708,20 +708,26 @@ } func (m *Nil) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Nil) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *NinRepPackedNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -729,70 +735,110 @@ } func (m *NinRepPackedNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinRepPackedNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Field1) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field1)*8)) - for _, num := range m.Field1 { - f1 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f1)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Field13) > 0 { + for iNdEx := len(m.Field13) - 1; iNdEx >= 0; iNdEx-- { + i-- + if m.Field13[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } } + i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field13))) + i-- + dAtA[i] = 0x6a } - if len(m.Field2) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field2)*4)) - for _, num := range m.Field2 { - f2 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f2)) - i += 4 + if len(m.Field12) > 0 { + for iNdEx := len(m.Field12) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12[iNdEx])) } + i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field12)*8)) + i-- + dAtA[i] = 0x62 } - if len(m.Field3) > 0 { - dAtA4 := make([]byte, len(m.Field3)*10) - var j3 int - for _, num1 := range m.Field3 { - num := uint64(num1) - for num >= 1<<7 { - dAtA4[j3] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 - j3++ - } - dAtA4[j3] = uint8(num) - j3++ + if len(m.Field11) > 0 { + for iNdEx := len(m.Field11) - 1; iNdEx >= 0; iNdEx-- { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11[iNdEx])) } - dAtA[i] = 0x1a - i++ - i = encodeVarintFuzz(dAtA, i, uint64(j3)) - i += copy(dAtA[i:], dAtA4[:j3]) + i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field11)*8)) + i-- + dAtA[i] = 0x5a } - if len(m.Field4) > 0 { - dAtA6 := make([]byte, len(m.Field4)*10) + if len(m.Field10) > 0 { + for iNdEx := len(m.Field10) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10[iNdEx])) + } + i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field10)*4)) + i-- + dAtA[i] = 0x52 + } + if len(m.Field9) > 0 { + for iNdEx := len(m.Field9) - 1; iNdEx >= 0; iNdEx-- { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9[iNdEx])) + } + i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field9)*4)) + i-- + dAtA[i] = 0x4a + } + if len(m.Field8) > 0 { + var j1 int + dAtA3 := make([]byte, len(m.Field8)*10) + for _, num := range m.Field8 { + x2 := (uint64(num) << 1) ^ uint64((num >> 63)) + for x2 >= 1<<7 { + dAtA3[j1] = uint8(uint64(x2)&0x7f | 0x80) + j1++ + x2 >>= 7 + } + dAtA3[j1] = uint8(x2) + j1++ + } + i -= j1 + copy(dAtA[i:], dAtA3[:j1]) + i = encodeVarintFuzz(dAtA, i, uint64(j1)) + i-- + dAtA[i] = 0x42 + } + if len(m.Field7) > 0 { + dAtA4 := make([]byte, len(m.Field7)*5) var j5 int - for _, num1 := range m.Field4 { - num := uint64(num1) - for num >= 1<<7 { - dAtA6[j5] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 + for _, num := range m.Field7 { + x6 := (uint32(num) << 1) ^ uint32((num >> 31)) + for x6 >= 1<<7 { + dAtA4[j5] = uint8(uint64(x6)&0x7f | 0x80) j5++ + x6 >>= 7 } - dAtA6[j5] = uint8(num) + dAtA4[j5] = uint8(x6) j5++ } - dAtA[i] = 0x22 - i++ + i -= j5 + copy(dAtA[i:], dAtA4[:j5]) i = encodeVarintFuzz(dAtA, i, uint64(j5)) - i += copy(dAtA[i:], dAtA6[:j5]) + i-- + dAtA[i] = 0x3a } - if len(m.Field5) > 0 { - dAtA8 := make([]byte, len(m.Field5)*10) + if len(m.Field6) > 0 { + dAtA8 := make([]byte, len(m.Field6)*10) var j7 int - for _, num := range m.Field5 { + for _, num := range m.Field6 { for num >= 1<<7 { dAtA8[j7] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 @@ -801,15 +847,16 @@ dAtA8[j7] = uint8(num) j7++ } - dAtA[i] = 0x2a - i++ + i -= j7 + copy(dAtA[i:], dAtA8[:j7]) i = encodeVarintFuzz(dAtA, i, uint64(j7)) - i += copy(dAtA[i:], dAtA8[:j7]) + i-- + dAtA[i] = 0x32 } - if len(m.Field6) > 0 { - dAtA10 := make([]byte, len(m.Field6)*10) + if len(m.Field5) > 0 { + dAtA10 := make([]byte, len(m.Field5)*10) var j9 int - for _, num := range m.Field6 { + for _, num := range m.Field5 { for num >= 1<<7 { dAtA10[j9] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 @@ -818,106 +865,77 @@ dAtA10[j9] = uint8(num) j9++ } - dAtA[i] = 0x32 - i++ + i -= j9 + copy(dAtA[i:], dAtA10[:j9]) i = encodeVarintFuzz(dAtA, i, uint64(j9)) - i += copy(dAtA[i:], dAtA10[:j9]) + i-- + dAtA[i] = 0x2a } - if len(m.Field7) > 0 { - dAtA11 := make([]byte, len(m.Field7)*5) - var j12 int - for _, num := range m.Field7 { - x13 := (uint32(num) << 1) ^ uint32((num >> 31)) - for x13 >= 1<<7 { - dAtA11[j12] = uint8(uint64(x13)&0x7f | 0x80) - j12++ - x13 >>= 7 + if len(m.Field4) > 0 { + dAtA12 := make([]byte, len(m.Field4)*10) + var j11 int + for _, num1 := range m.Field4 { + num := uint64(num1) + for num >= 1<<7 { + dAtA12[j11] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j11++ } - dAtA11[j12] = uint8(x13) - j12++ + dAtA12[j11] = uint8(num) + j11++ } - dAtA[i] = 0x3a - i++ - i = encodeVarintFuzz(dAtA, i, uint64(j12)) - i += copy(dAtA[i:], dAtA11[:j12]) + i -= j11 + copy(dAtA[i:], dAtA12[:j11]) + i = encodeVarintFuzz(dAtA, i, uint64(j11)) + i-- + dAtA[i] = 0x22 } - if len(m.Field8) > 0 { - var j14 int - dAtA16 := make([]byte, len(m.Field8)*10) - for _, num := range m.Field8 { - x15 := (uint64(num) << 1) ^ uint64((num >> 63)) - for x15 >= 1<<7 { - dAtA16[j14] = uint8(uint64(x15)&0x7f | 0x80) - j14++ - x15 >>= 7 + if len(m.Field3) > 0 { + dAtA14 := make([]byte, len(m.Field3)*10) + var j13 int + for _, num1 := range m.Field3 { + num := uint64(num1) + for num >= 1<<7 { + dAtA14[j13] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j13++ } - dAtA16[j14] = uint8(x15) - j14++ - } - dAtA[i] = 0x42 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(j14)) - i += copy(dAtA[i:], dAtA16[:j14]) - } - if len(m.Field9) > 0 { - dAtA[i] = 0x4a - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field9)*4)) - for _, num := range m.Field9 { - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 - } - } - if len(m.Field10) > 0 { - dAtA[i] = 0x52 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field10)*4)) - for _, num := range m.Field10 { - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(num)) - i += 4 - } - } - if len(m.Field11) > 0 { - dAtA[i] = 0x5a - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field11)*8)) - for _, num := range m.Field11 { - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + dAtA14[j13] = uint8(num) + j13++ } + i -= j13 + copy(dAtA[i:], dAtA14[:j13]) + i = encodeVarintFuzz(dAtA, i, uint64(j13)) + i-- + dAtA[i] = 0x1a } - if len(m.Field12) > 0 { - dAtA[i] = 0x62 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field12)*8)) - for _, num := range m.Field12 { - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(num)) - i += 8 + if len(m.Field2) > 0 { + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f15 := math.Float32bits(float32(m.Field2[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f15)) } + i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field2)*4)) + i-- + dAtA[i] = 0x12 } - if len(m.Field13) > 0 { - dAtA[i] = 0x6a - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field13))) - for _, b := range m.Field13 { - if b { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Field1) > 0 { + for iNdEx := len(m.Field1) - 1; iNdEx >= 0; iNdEx-- { + f16 := math.Float64bits(float64(m.Field1[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f16)) } + i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field1)*8)) + i-- + dAtA[i] = 0xa } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -925,108 +943,116 @@ } func (m *NinOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 - } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field3 != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(*m.Field3)) + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field4 != nil { - dAtA[i] = 0x20 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(*m.Field4)) + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintFuzz(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } - if m.Field5 != nil { - dAtA[i] = 0x28 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(*m.Field5)) + if m.Field13 != nil { + i-- + if *m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(*m.Field6)) + if m.Field12 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) + i-- + dAtA[i] = 0x61 } - if m.Field7 != nil { - dAtA[i] = 0x38 - i++ - i = encodeVarintFuzz(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + if m.Field11 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) + i-- + dAtA[i] = 0x59 } - if m.Field8 != nil { - dAtA[i] = 0x40 - i++ - i = encodeVarintFuzz(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + if m.Field10 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) + i-- + dAtA[i] = 0x55 } if m.Field9 != nil { - dAtA[i] = 0x4d - i++ + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field9)) - i += 4 + i-- + dAtA[i] = 0x4d } - if m.Field10 != nil { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) - i += 4 + if m.Field8 != nil { + i = encodeVarintFuzz(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + i-- + dAtA[i] = 0x40 } - if m.Field11 != nil { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) - i += 8 + if m.Field7 != nil { + i = encodeVarintFuzz(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field12 != nil { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) - i += 8 + if m.Field6 != nil { + i = encodeVarintFuzz(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field13 != nil { - dAtA[i] = 0x68 - i++ - if *m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if m.Field5 != nil { + i = encodeVarintFuzz(dAtA, i, uint64(*m.Field5)) + i-- + dAtA[i] = 0x28 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field4 != nil { + i = encodeVarintFuzz(dAtA, i, uint64(*m.Field4)) + i-- + dAtA[i] = 0x20 } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field3 != nil { + i = encodeVarintFuzz(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 + } + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NinOptStruct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1034,98 +1060,114 @@ } func (m *NinOptStruct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptStruct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field2 != nil { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 + if m.Field15 != nil { + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field3 != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintFuzz(dAtA, i, uint64(m.Field3.Size())) - n17, err17 := m.Field3.MarshalTo(dAtA[i:]) - if err17 != nil { - return 0, err17 - } - i += n17 + if m.Field14 != nil { + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintFuzz(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } - if m.Field4 != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(m.Field4.Size())) - n18, err18 := m.Field4.MarshalTo(dAtA[i:]) - if err18 != nil { - return 0, err18 + if m.Field13 != nil { + i-- + if *m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - i += n18 + i-- + dAtA[i] = 0x68 } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(*m.Field6)) + if m.Field8 != nil { + { + size, err := m.Field8.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintFuzz(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 } if m.Field7 != nil { - dAtA[i] = 0x38 - i++ i = encodeVarintFuzz(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field8 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(m.Field8.Size())) - n19, err19 := m.Field8.MarshalTo(dAtA[i:]) - if err19 != nil { - return 0, err19 - } - i += n19 + if m.Field6 != nil { + i = encodeVarintFuzz(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field13 != nil { - dAtA[i] = 0x68 - i++ - if *m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.Field4 != nil { + { + size, err := m.Field4.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintFuzz(dAtA, i, uint64(size)) } - i++ + i-- + dAtA[i] = 0x22 } - if m.Field14 != nil { - dAtA[i] = 0x72 - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + if m.Field3 != nil { + { + size, err := m.Field3.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintFuzz(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } - if m.Field15 != nil { - dAtA[i] = 0x7a - i++ - i = encodeVarintFuzz(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + if m.Field2 != nil { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintFuzz(dAtA []byte, offset int, v uint64) int { + offset -= sovFuzz(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *Nil) Size() (n int) { if m == nil { @@ -2931,6 +2973,7 @@ func skipFuzz(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -2962,10 +3005,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -2986,55 +3027,30 @@ return 0, ErrInvalidLengthFuzz } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthFuzz - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFuzz - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipFuzz(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthFuzz - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupFuzz + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthFuzz + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthFuzz = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowFuzz = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthFuzz = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowFuzz = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupFuzz = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/group/group.pb.go golang-gogoprotobuf-1.3.1/test/group/group.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/group/group.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/group/group.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -26,7 +26,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Groups1 struct { G []*Groups1_G `protobuf:"group,1,rep,name=G,json=g" json:"g,omitempty"` @@ -838,7 +838,7 @@ } func NewPopulatedGroups1(r randyGroup, easy bool) *Groups1 { this := &Groups1{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(5) this.G = make([]*Groups1_G, v1) for i := 0; i < v1; i++ { @@ -853,14 +853,14 @@ func NewPopulatedGroups1_G(r randyGroup, easy bool) *Groups1_G { this := &Groups1_G{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := int64(r.Int63()) if r.Intn(2) == 0 { v2 *= -1 } this.Field1 = &v2 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := float64(r.Float64()) if r.Intn(2) == 0 { v3 *= -1 @@ -875,7 +875,7 @@ func NewPopulatedGroups2(r randyGroup, easy bool) *Groups2 { this := &Groups2{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.G = NewPopulatedGroups2_G(r, easy) } if !easy && r.Intn(10) != 0 { @@ -886,14 +886,14 @@ func NewPopulatedGroups2_G(r randyGroup, easy bool) *Groups2_G { this := &Groups2_G{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := int64(r.Int63()) if r.Intn(2) == 0 { v4 *= -1 } this.Field1 = &v4 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.Field2 = make([]float64, v5) for i := 0; i < v5; i++ { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importcustom-issue389/imported/a.pb.go golang-gogoprotobuf-1.3.1/test/importcustom-issue389/imported/a.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importcustom-issue389/imported/a.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/importcustom-issue389/imported/a.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type A struct { F1 string `protobuf:"bytes,1,opt,name=f1,proto3" json:"f1,omitempty"` @@ -45,7 +45,7 @@ return xxx_messageInfo_A.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -119,7 +119,7 @@ func (m *A) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -127,30 +127,39 @@ } func (m *A) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *A) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.F1) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.F1) + copy(dAtA[i:], m.F1) i = encodeVarintA(dAtA, i, uint64(len(m.F1))) - i += copy(dAtA[i:], m.F1) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintA(dAtA []byte, offset int, v uint64) int { + offset -= sovA(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedA(r randyA, easy bool) *A { this := &A{} @@ -344,6 +353,7 @@ func skipA(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -375,10 +385,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -399,55 +407,30 @@ return 0, ErrInvalidLengthA } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthA - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowA - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipA(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthA - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupA + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthA + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthA = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowA = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthA = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowA = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupA = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importcustom-issue389/importing/c.pb.go golang-gogoprotobuf-1.3.1/test/importcustom-issue389/importing/c.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importcustom-issue389/importing/c.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/importcustom-issue389/importing/c.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -24,7 +24,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type C struct { F2 *github_com_gogo_protobuf_test_importcustom_issue389_imported.B `protobuf:"bytes,1,opt,name=f2,proto3,customtype=github.com/gogo/protobuf/test/importcustom-issue389/imported.B" json:"f2,omitempty"` @@ -47,7 +47,7 @@ return xxx_messageInfo_C.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -122,7 +122,7 @@ func (m *C) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -130,38 +130,48 @@ } func (m *C) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *C) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.F2 != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintC(dAtA, i, uint64(m.F2.Size())) - n1, err1 := m.F2.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + { + size := m.F2.Size() + i -= size + if _, err := m.F2.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintC(dAtA, i, uint64(size)) } - i += n1 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintC(dAtA []byte, offset int, v uint64) int { + offset -= sovC(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedC(r randyC, easy bool) *C { this := &C{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.F2 = github_com_gogo_protobuf_test_importcustom_issue389_imported.NewPopulatedB(r) } if !easy && r.Intn(10) != 0 { @@ -357,6 +367,7 @@ func skipC(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -388,10 +399,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -412,55 +421,30 @@ return 0, ErrInvalidLengthC } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthC - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowC - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipC(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthC - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupC + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthC + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthC = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowC = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthC = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowC = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupC = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importdedup/proto.pb.go golang-gogoprotobuf-1.3.1/test/importdedup/proto.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importdedup/proto.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/importdedup/proto.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Object struct { CustomField *github_com_gogo_protobuf_test_importdedup_subpkg.CustomType `protobuf:"bytes,1,opt,name=CustomField,customtype=github.com/gogo/protobuf/test/importdedup/subpkg.CustomType" json:"CustomField,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importdedup/subpkg/subproto.pb.go golang-gogoprotobuf-1.3.1/test/importdedup/subpkg/subproto.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importdedup/subpkg/subproto.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/importdedup/subpkg/subproto.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type SubObject struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importduplicate/importduplicate.pb.go golang-gogoprotobuf-1.3.1/test/importduplicate/importduplicate.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importduplicate/importduplicate.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/importduplicate/importduplicate.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -25,7 +25,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapAndSortKeys struct { Key *sortkeys.Object `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` @@ -189,17 +189,17 @@ } func NewPopulatedMapAndSortKeys(r randyImportduplicate, easy bool) *MapAndSortKeys { this := &MapAndSortKeys{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Key = sortkeys.NewPopulatedObject(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.KeyValue = make(map[int32]string) for i := 0; i < v1; i++ { this.KeyValue[int32(r.Int31())] = randStringImportduplicate(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Value = proto1.NewPopulatedSubject(r, easy) } if !easy && r.Intn(10) != 0 { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importduplicate/proto/proto.pb.go golang-gogoprotobuf-1.3.1/test/importduplicate/proto/proto.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importduplicate/proto/proto.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/importduplicate/proto/proto.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Subject struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importduplicate/sortkeys/sortable.pb.go golang-gogoprotobuf-1.3.1/test/importduplicate/sortkeys/sortable.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/importduplicate/sortkeys/sortable.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/importduplicate/sortkeys/sortable.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Object struct { XXX_NoUnkeyedLiteral struct{} `json:"-"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/indeximport-issue72/index/index.pb.go golang-gogoprotobuf-1.3.1/test/indeximport-issue72/index/index.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/indeximport-issue72/index/index.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/indeximport-issue72/index/index.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type IndexQuery struct { Key *string `protobuf:"bytes,1,opt,name=Key" json:"Key,omitempty"` @@ -46,7 +46,7 @@ return xxx_messageInfo_IndexQuery.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -143,7 +143,7 @@ func (m *IndexQuery) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -151,44 +151,54 @@ } func (m *IndexQuery) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *IndexQuery) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Key != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintIndex(dAtA, i, uint64(len(*m.Key))) - i += copy(dAtA[i:], *m.Key) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Value != nil { - dAtA[i] = 0x12 - i++ + i -= len(*m.Value) + copy(dAtA[i:], *m.Value) i = encodeVarintIndex(dAtA, i, uint64(len(*m.Value))) - i += copy(dAtA[i:], *m.Value) + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Key != nil { + i -= len(*m.Key) + copy(dAtA[i:], *m.Key) + i = encodeVarintIndex(dAtA, i, uint64(len(*m.Key))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintIndex(dAtA []byte, offset int, v uint64) int { + offset -= sovIndex(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedIndexQuery(r randyIndex, easy bool) *IndexQuery { this := &IndexQuery{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := string(randStringIndex(r)) this.Key = &v1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := string(randStringIndex(r)) this.Value = &v2 } @@ -419,6 +429,7 @@ func skipIndex(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -450,10 +461,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -474,55 +483,30 @@ return 0, ErrInvalidLengthIndex } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIndex - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIndex - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIndex(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIndex - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIndex + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIndex + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIndex = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIndex = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIndex = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIndex = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIndex = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/indeximport-issue72/indeximport.pb.go golang-gogoprotobuf-1.3.1/test/indeximport-issue72/indeximport.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/indeximport-issue72/indeximport.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/indeximport-issue72/indeximport.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type IndexQueries struct { Queries []*index.IndexQuery `protobuf:"bytes,1,rep,name=Queries" json:"Queries,omitempty"` @@ -46,7 +46,7 @@ return xxx_messageInfo_IndexQueries.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -128,7 +128,7 @@ func (m *IndexQueries) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -136,40 +136,50 @@ } func (m *IndexQueries) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *IndexQueries) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Queries) > 0 { - for _, msg := range m.Queries { - dAtA[i] = 0xa - i++ - i = encodeVarintIndeximport(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Queries) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Queries[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIndeximport(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintIndeximport(dAtA []byte, offset int, v uint64) int { + offset -= sovIndeximport(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedIndexQueries(r randyIndeximport, easy bool) *IndexQueries { this := &IndexQueries{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(5) this.Queries = make([]*index.IndexQuery, v1) for i := 0; i < v1; i++ { @@ -369,6 +379,7 @@ func skipIndeximport(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -400,10 +411,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -424,55 +433,30 @@ return 0, ErrInvalidLengthIndeximport } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIndeximport - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIndeximport - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIndeximport(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIndeximport - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIndeximport + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIndeximport + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIndeximport = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIndeximport = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIndeximport = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIndeximport = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIndeximport = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/int64support/object.pb.go golang-gogoprotobuf-1.3.1/test/int64support/object.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/int64support/object.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/int64support/object.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Object struct { OptionalNumber *int64 `protobuf:"varint,1,opt,name=optional_number,json=optionalNumber" json:"optional_number,omitempty"` @@ -44,7 +44,7 @@ return xxx_messageInfo_Object.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -181,7 +181,7 @@ func (m *Object) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -189,30 +189,37 @@ } func (m *Object) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Object) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.OptionalNumber != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintObject(dAtA, i, uint64(*m.OptionalNumber)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintObject(dAtA []byte, offset int, v uint64) int { + offset -= sovObject(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedObject(r randyObject, easy bool) *Object { this := &Object{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := int64(r.Int63()) if r.Intn(2) == 0 { v1 *= -1 @@ -408,6 +415,7 @@ func skipObject(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -439,10 +447,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -463,55 +469,30 @@ return 0, ErrInvalidLengthObject } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthObject - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowObject - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipObject(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthObject - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupObject + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthObject + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthObject = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowObject = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthObject = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowObject = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupObject = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue260/issue260.pb.go golang-gogoprotobuf-1.3.1/test/issue260/issue260.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue260/issue260.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue260/issue260.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -25,7 +25,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func (m *Dropped) Reset() { *m = Dropped{} } func (m *Dropped) String() string { return proto.CompactTextString(m) } @@ -41,7 +41,7 @@ return xxx_messageInfo_Dropped.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -88,7 +88,7 @@ return xxx_messageInfo_DroppedWithoutGetters.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -128,7 +128,7 @@ return xxx_messageInfo_Kept.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -382,7 +382,7 @@ func (m *Dropped) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -390,28 +390,34 @@ } func (m *Dropped) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Dropped) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintIssue260(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } if m.Age != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintIssue260(dAtA, i, uint64(m.Age)) + i-- + dAtA[i] = 0x10 } - return i, nil + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintIssue260(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func (m *DroppedWithoutGetters) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -419,35 +425,40 @@ } func (m *DroppedWithoutGetters) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DroppedWithoutGetters) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Height != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintIssue260(dAtA, i, uint64(m.Height)) + n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err1 != nil { + return 0, err1 } + i -= n1 + i = encodeVarintIssue260(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x1a if m.Width != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintIssue260(dAtA, i, uint64(m.Width)) + i-- + dAtA[i] = 0x10 } - dAtA[i] = 0x1a - i++ - i = encodeVarintIssue260(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp))) - n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i:]) - if err1 != nil { - return 0, err1 + if m.Height != 0 { + i = encodeVarintIssue260(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x8 } - i += n1 - return i, nil + return len(dAtA) - i, nil } func (m *Kept) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -455,32 +466,40 @@ } func (m *Kept) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Kept) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintIssue260(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } if m.Age != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintIssue260(dAtA, i, uint64(m.Age)) + i-- + dAtA[i] = 0x10 } - return i, nil + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintIssue260(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func encodeVarintIssue260(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue260(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedDropped(r randyIssue260, easy bool) *Dropped { this := &Dropped{} @@ -985,6 +1004,7 @@ func skipIssue260(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1016,10 +1036,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1040,55 +1058,30 @@ return 0, ErrInvalidLengthIssue260 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue260 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIssue260 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIssue260(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue260 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIssue260 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIssue260 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIssue260 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIssue260 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIssue260 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIssue260 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIssue260 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue261/issue261.pb.go golang-gogoprotobuf-1.3.1/test/issue261/issue261.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue261/issue261.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue261/issue261.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -28,7 +28,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapStdTypes struct { NullableDuration map[int32]*time.Duration `protobuf:"bytes,3,rep,name=nullableDuration,proto3,stdduration" json:"nullableDuration,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` @@ -47,7 +47,7 @@ return xxx_messageInfo_MapStdTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -164,7 +164,7 @@ func (m *MapStdTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -172,48 +172,50 @@ } func (m *MapStdTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MapStdTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if len(m.NullableDuration) > 0 { for k := range m.NullableDuration { - dAtA[i] = 0x1a - i++ v := m.NullableDuration[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdDuration(*v) - msgSize += 1 + sovIssue261(uint64(msgSize)) - } - mapSize := 1 + sovIssue261(uint64(k)) + msgSize - i = encodeVarintIssue261(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintIssue261(dAtA, i, uint64(k)) + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintIssue261(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*v))) - n1, err1 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*v, dAtA[i:]) + n1, err1 := github_com_gogo_protobuf_types.StdDurationMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration((*v)):]) if err1 != nil { return 0, err1 } - i += n1 + i -= n1 + i = encodeVarintIssue261(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintIssue261(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintIssue261(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - return i, nil + return len(dAtA) - i, nil } func encodeVarintIssue261(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue261(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *MapStdTypes) Size() (n int) { if m == nil { @@ -441,6 +443,7 @@ func skipIssue261(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -472,10 +475,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -496,55 +497,30 @@ return 0, ErrInvalidLengthIssue261 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue261 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIssue261 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIssue261(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue261 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIssue261 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIssue261 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIssue261 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIssue261 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIssue261 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIssue261 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIssue261 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue262/timefail.pb.go golang-gogoprotobuf-1.3.1/test/issue262/timefail.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue262/timefail.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue262/timefail.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -27,7 +27,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type TimeFail struct { TimeTest *time.Time `protobuf:"bytes,1,opt,name=time_test,json=timeTest,proto3,stdtime" json:"time_test,omitempty"` @@ -46,7 +46,7 @@ return xxx_messageInfo_TimeFail.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -145,7 +145,7 @@ func (m *TimeFail) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -153,31 +153,38 @@ } func (m *TimeFail) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TimeFail) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.TimeTest != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTimefail(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.TimeTest))) - n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.TimeTest, dAtA[i:]) + n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.TimeTest, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.TimeTest):]) if err1 != nil { return 0, err1 } - i += n1 + i -= n1 + i = encodeVarintTimefail(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintTimefail(dAtA []byte, offset int, v uint64) int { + offset -= sovTimefail(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *TimeFail) Size() (n int) { if m == nil { @@ -308,6 +315,7 @@ func skipTimefail(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -339,10 +347,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -363,55 +369,30 @@ return 0, ErrInvalidLengthTimefail } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthTimefail - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTimefail - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipTimefail(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthTimefail - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTimefail + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthTimefail + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthTimefail = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTimefail = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthTimefail = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTimefail = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTimefail = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue312/events/events.pb.go golang-gogoprotobuf-1.3.1/test/issue312/events/events.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue312/events/events.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue312/events/events.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Subtype struct { State *issue312.TaskState `protobuf:"varint,4,opt,name=state,enum=issue312.TaskState" json:"state,omitempty"` @@ -142,7 +142,7 @@ } func NewPopulatedSubtype(r randyEvents, easy bool) *Subtype { this := &Subtype{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := issue312.TaskState([]int32{6, 0, 1}[r.Intn(3)]) this.State = &v1 } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue312/issue312.pb.go golang-gogoprotobuf-1.3.1/test/issue312/issue312.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue312/issue312.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue312/issue312.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type TaskState int32 diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue322/issue322.pb.go golang-gogoprotobuf-1.3.1/test/issue322/issue322.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue322/issue322.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue322/issue322.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -24,7 +24,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type OneofTest struct { // Types that are valid to be assigned to Union: @@ -49,7 +49,7 @@ return xxx_messageInfo_OneofTest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -75,10 +75,11 @@ Equal(interface{}) bool MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type OneofTest_I struct { - I int32 `protobuf:"varint,1,opt,name=i,oneof,def=4"` + I int32 `protobuf:"varint,1,opt,name=i,oneof,def=4" json:"i,omitempty"` } func (*OneofTest_I) isOneofTest_Union() {} @@ -97,56 +98,13 @@ return Default_OneofTest_I } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*OneofTest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _OneofTest_OneofMarshaler, _OneofTest_OneofUnmarshaler, _OneofTest_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*OneofTest) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*OneofTest_I)(nil), } } -func _OneofTest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*OneofTest) - // union - switch x := m.Union.(type) { - case *OneofTest_I: - _ = b.EncodeVarint(1<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.I)) - case nil: - default: - return fmt.Errorf("OneofTest.Union has unexpected type %T", x) - } - return nil -} - -func _OneofTest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*OneofTest) - switch tag { - case 1: // union.i - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Union = &OneofTest_I{int32(x)} - return true, err - default: - return false, nil - } -} - -func _OneofTest_OneofSizer(msg proto.Message) (n int) { - m := msg.(*OneofTest) - // union - switch x := m.Union.(type) { - case *OneofTest_I: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.I)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*OneofTest)(nil), "test.OneofTest") } @@ -154,19 +112,113 @@ func init() { proto.RegisterFile("issue322.proto", fileDescriptor_fbf4e8d164dccde1) } var fileDescriptor_fbf4e8d164dccde1 = []byte{ - // 149 bytes of a gzipped FileDescriptorProto + // 153 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcb, 0x2c, 0x2e, 0x2e, 0x4d, 0x35, 0x36, 0x32, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x29, 0x49, 0x2d, 0x2e, 0x91, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0x4f, 0xcf, 0xd7, 0x07, 0x4b, 0x26, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0xa4, 0xa4, 0xce, 0xc5, 0xe9, 0x9f, 0x97, 0x9a, 0x9f, 0x16, 0x92, 0x5a, 0x5c, 0x22, 0x24, 0xc8, 0xc5, 0x98, 0x29, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6a, 0xc5, 0x68, 0xe2, 0xc1, 0x10, 0xc4, 0x98, 0xe9, 0xc4, - 0xce, 0xc5, 0x5a, 0x9a, 0x97, 0x99, 0x9f, 0xe7, 0x24, 0xf3, 0xe1, 0xa1, 0x1c, 0xe3, 0x8f, 0x87, + 0xce, 0xc5, 0x5a, 0x9a, 0x97, 0x99, 0x9f, 0xe7, 0xa4, 0xf0, 0xe1, 0xa1, 0x1c, 0xe3, 0x8f, 0x87, 0x72, 0x8c, 0x2b, 0x1e, 0xc9, 0x31, 0xee, 0x78, 0x24, 0xc7, 0x78, 0xe2, 0x91, 0x1c, 0xe3, 0x85, - 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x02, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe6, 0x64, 0xd7, - 0x6a, 0x8c, 0x00, 0x00, 0x00, + 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0xae, 0x78, 0x2c, 0xc7, 0x08, 0x08, 0x00, 0x00, 0xff, + 0xff, 0x42, 0xe9, 0xae, 0x78, 0x90, 0x00, 0x00, 0x00, +} + +func (this *OneofTest) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*OneofTest) + if !ok { + that2, ok := that.(OneofTest) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.Union == nil { + if this.Union != nil { + return 1 + } + } else if this.Union == nil { + return -1 + } else { + thisType := -1 + switch this.Union.(type) { + case *OneofTest_I: + thisType = 0 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Union)) + } + that1Type := -1 + switch that1.Union.(type) { + case *OneofTest_I: + that1Type = 0 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Union)) + } + if thisType == that1Type { + if c := this.Union.Compare(that1.Union); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 } +func (this *OneofTest_I) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + that1, ok := that.(*OneofTest_I) + if !ok { + that2, ok := that.(OneofTest_I) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.I != that1.I { + if this.I < that1.I { + return -1 + } + return 1 + } + return 0 +} func (this *OneofTest) Equal(that interface{}) bool { if that == nil { return this == nil @@ -258,7 +310,7 @@ func (m *OneofTest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -266,38 +318,53 @@ } func (m *OneofTest) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofTest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Union != nil { - nn1, err1 := m.Union.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + { + size := m.Union.Size() + i -= size + if _, err := m.Union.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn1 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *OneofTest_I) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x8 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofTest_I) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintIssue322(dAtA, i, uint64(m.I)) - return i, nil + i-- + dAtA[i] = 0x8 + return len(dAtA) - i, nil } func encodeVarintIssue322(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue322(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedOneofTest(r randyIssue322, easy bool) *OneofTest { this := &OneofTest{} @@ -501,6 +568,7 @@ func skipIssue322(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -532,10 +600,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -556,55 +622,30 @@ return 0, ErrInvalidLengthIssue322 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue322 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIssue322 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIssue322(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue322 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIssue322 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIssue322 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIssue322 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIssue322 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIssue322 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIssue322 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIssue322 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue322/issue322pb_test.go golang-gogoprotobuf-1.3.1/test/issue322/issue322pb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue322/issue322pb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue322/issue322pb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -123,6 +123,30 @@ } } +func TestOneofTestCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedOneofTest(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &OneofTest{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedOneofTest(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} func TestOneofTestGoString(t *testing.T) { popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) p := NewPopulatedOneofTest(popr, false) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue322/issue322.proto golang-gogoprotobuf-1.3.1/test/issue322/issue322.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue322/issue322.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue322/issue322.proto 2020-05-17 12:22:58.000000000 +0000 @@ -7,6 +7,7 @@ option (gogoproto.populate_all) = true; option (gogoproto.equal_all) = true; option (gogoproto.testgen_all) = true; +option (gogoproto.compare_all) = true; message OneofTest { oneof union { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue330/issue330.pb.go golang-gogoprotobuf-1.3.1/test/issue330/issue330.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue330/issue330.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue330/issue330.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Object struct { Type TypeIdentifier `protobuf:"varint,1,opt,name=type,proto3,casttype=TypeIdentifier" json:"type,omitempty"` @@ -45,7 +45,7 @@ return xxx_messageInfo_Object.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -121,7 +121,7 @@ func (m *Object) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -129,29 +129,37 @@ } func (m *Object) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Object) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Type != 0 { - dAtA[i] = 0x8 - i++ i = encodeVarintIssue330(dAtA, i, uint64(m.Type)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintIssue330(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue330(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedObject(r randyIssue330, easy bool) *Object { this := &Object{} @@ -331,6 +339,7 @@ func skipIssue330(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -362,10 +371,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -386,55 +393,30 @@ return 0, ErrInvalidLengthIssue330 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue330 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIssue330 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIssue330(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue330 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIssue330 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIssue330 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIssue330 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIssue330 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIssue330 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIssue330 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIssue330 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue34/proto.pb.go golang-gogoprotobuf-1.3.1/test/issue34/proto.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue34/proto.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue34/proto.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Foo struct { Bar []byte `protobuf:"bytes,1,opt,name=bar" json:"bar,omitempty"` @@ -294,6 +294,7 @@ func skipProto(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -325,10 +326,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -349,55 +348,30 @@ return 0, ErrInvalidLengthProto } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthProto - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowProto - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipProto(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthProto - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupProto + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthProto + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthProto = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowProto = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthProto = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowProto = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupProto = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue411/issue411.pb.go golang-gogoprotobuf-1.3.1/test/issue411/issue411.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue411/issue411.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue411/issue411.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Span struct { TraceID TraceID `protobuf:"bytes,1,opt,name=trace_id,json=traceId,proto3,customtype=TraceID" json:"trace_id"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue42order/issue42.pb.go golang-gogoprotobuf-1.3.1/test/issue42order/issue42.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue42order/issue42.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue42order/issue42.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type UnorderedFields struct { A *int64 `protobuf:"varint,10,opt,name=A" json:"A,omitempty"` @@ -46,7 +46,7 @@ return xxx_messageInfo_UnorderedFields.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -101,7 +101,7 @@ return xxx_messageInfo_OrderedFields.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -158,7 +158,7 @@ func (m *UnorderedFields) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -166,31 +166,37 @@ } func (m *UnorderedFields) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UnorderedFields) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.B != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.B)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.A != nil { - dAtA[i] = 0x50 - i++ i = encodeVarintIssue42(dAtA, i, uint64(*m.A)) + i-- + dAtA[i] = 0x50 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.B != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.B)) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *OrderedFields) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -198,43 +204,51 @@ } func (m *OrderedFields) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OrderedFields) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.B != nil { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.B)) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.A != nil { - dAtA[i] = 0x50 - i++ i = encodeVarintIssue42(dAtA, i, uint64(*m.A)) + i-- + dAtA[i] = 0x50 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.B != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.B)) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintIssue42(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue42(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedUnorderedFields(r randyIssue42, easy bool) *UnorderedFields { this := &UnorderedFields{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := uint64(uint64(r.Uint32())) this.B = &v1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := int64(r.Int63()) if r.Intn(2) == 0 { v2 *= -1 @@ -249,11 +263,11 @@ func NewPopulatedOrderedFields(r randyIssue42, easy bool) *OrderedFields { this := &OrderedFields{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := uint64(uint64(r.Uint32())) this.B = &v3 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := int64(r.Int63()) if r.Intn(2) == 0 { v4 *= -1 @@ -553,6 +567,7 @@ func skipIssue42(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -584,10 +599,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -608,55 +621,30 @@ return 0, ErrInvalidLengthIssue42 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue42 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIssue42 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIssue42(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue42 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIssue42 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIssue42 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIssue42 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIssue42 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIssue42 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIssue42 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIssue42 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue435/issue435.pb.go golang-gogoprotobuf-1.3.1/test/issue435/issue435.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue435/issue435.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue435/issue435.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Message struct { NonnullableOptional SubMessage `protobuf:"bytes,1,opt,name=nonnullable_optional,json=nonnullableOptional" json:"nonnullable_optional"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue438/issue438.pb.go golang-gogoprotobuf-1.3.1/test/issue438/issue438.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue438/issue438.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue438/issue438.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Types struct { Any *types.Any `protobuf:"bytes,1,opt,name=any,proto3" json:"any,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue444/issue444.pb.go golang-gogoprotobuf-1.3.1/test/issue444/issue444.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue444/issue444.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue444/issue444.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type SizeMe struct { Foo string `protobuf:"bytes,1,opt,name=foo,proto3" json:"foo,omitempty"` diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue449/issue449.pb.go golang-gogoprotobuf-1.3.1/test/issue449/issue449.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue449/issue449.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue449/issue449.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type CodeGenMsg struct { Int64ReqPtr *int64 `protobuf:"varint,1,req,name=Int64ReqPtr" json:"Int64ReqPtr,omitempty"` @@ -49,7 +49,7 @@ return xxx_messageInfo_CodeGenMsg.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -281,7 +281,7 @@ func (m *CodeGenMsg) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -289,42 +289,50 @@ } func (m *CodeGenMsg) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CodeGenMsg) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Int64ReqPtr == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int64ReqPtr") - } else { - dAtA[i] = 0x8 - i++ - i = encodeVarintIssue449(dAtA, i, uint64(*m.Int64ReqPtr)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } + i = encodeVarintIssue449(dAtA, i, uint64(m.Int32Opt)) + i-- + dAtA[i] = 0x20 + i = encodeVarintIssue449(dAtA, i, uint64(m.Int64Req)) + i-- + dAtA[i] = 0x18 if m.Int32OptPtr != nil { - dAtA[i] = 0x10 - i++ i = encodeVarintIssue449(dAtA, i, uint64(*m.Int32OptPtr)) + i-- + dAtA[i] = 0x10 } - dAtA[i] = 0x18 - i++ - i = encodeVarintIssue449(dAtA, i, uint64(m.Int64Req)) - dAtA[i] = 0x20 - i++ - i = encodeVarintIssue449(dAtA, i, uint64(m.Int32Opt)) - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Int64ReqPtr == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int64ReqPtr") + } else { + i = encodeVarintIssue449(dAtA, i, uint64(*m.Int64ReqPtr)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintIssue449(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue449(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *CodeGenMsg) Size() (n int) { if m == nil { @@ -496,6 +504,7 @@ func skipIssue449(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -527,10 +536,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -551,55 +558,30 @@ return 0, ErrInvalidLengthIssue449 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue449 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIssue449 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIssue449(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue449 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIssue449 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIssue449 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIssue449 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIssue449 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIssue449 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIssue449 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIssue449 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue498/issue498.pb.go golang-gogoprotobuf-1.3.1/test/issue498/issue498.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue498/issue498.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue498/issue498.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Message struct { Uint8 *uint8 `protobuf:"varint,1,req,name=uint8,casttype=uint8" json:"uint8,omitempty"` @@ -49,7 +49,7 @@ return xxx_messageInfo_Message.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -181,7 +181,7 @@ func (m *Message) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -189,52 +189,60 @@ } func (m *Message) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Message) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Uint8 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("uint8") - } else { - dAtA[i] = 0x8 - i++ - i = encodeVarintIssue498(dAtA, i, uint64(*m.Uint8)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Uint16 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("uint16") + if m.Int16 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("int16") } else { - dAtA[i] = 0x10 - i++ - i = encodeVarintIssue498(dAtA, i, uint64(*m.Uint16)) + i = encodeVarintIssue498(dAtA, i, uint64(*m.Int16)) + i-- + dAtA[i] = 0x20 } if m.Int8 == nil { return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("int8") } else { - dAtA[i] = 0x18 - i++ i = encodeVarintIssue498(dAtA, i, uint64(*m.Int8)) + i-- + dAtA[i] = 0x18 } - if m.Int16 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("int16") + if m.Uint16 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("uint16") } else { - dAtA[i] = 0x20 - i++ - i = encodeVarintIssue498(dAtA, i, uint64(*m.Int16)) + i = encodeVarintIssue498(dAtA, i, uint64(*m.Uint16)) + i-- + dAtA[i] = 0x10 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Uint8 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("uint8") + } else { + i = encodeVarintIssue498(dAtA, i, uint64(*m.Uint8)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintIssue498(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue498(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedMessage(r randyIssue498, easy bool) *Message { this := &Message{} @@ -508,6 +516,7 @@ func skipIssue498(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -539,10 +548,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -563,55 +570,30 @@ return 0, ErrInvalidLengthIssue498 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue498 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIssue498 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIssue498(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue498 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIssue498 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIssue498 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIssue498 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIssue498 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIssue498 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIssue498 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIssue498 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue503/issue503.pb.go golang-gogoprotobuf-1.3.1/test/issue503/issue503.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue503/issue503.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue503/issue503.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Foo struct { Num1 []int64 `protobuf:"varint,1,rep,packed,name=num1,proto3" json:"num1,omitempty"` @@ -48,7 +48,7 @@ return xxx_messageInfo_Foo.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -237,7 +237,7 @@ func (m *Foo) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -245,14 +245,41 @@ } func (m *Foo) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Foo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Num1) > 0 { - dAtA2 := make([]byte, len(m.Num1)*10) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Dat1) > 0 { + for iNdEx := len(m.Dat1) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Dat1[iNdEx]) + copy(dAtA[i:], m.Dat1[iNdEx]) + i = encodeVarintIssue503(dAtA, i, uint64(len(m.Dat1[iNdEx]))) + i-- + dAtA[i] = 0x22 + } + } + if len(m.Str1) > 0 { + for iNdEx := len(m.Str1) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Str1[iNdEx]) + copy(dAtA[i:], m.Str1[iNdEx]) + i = encodeVarintIssue503(dAtA, i, uint64(len(m.Str1[iNdEx]))) + i-- + dAtA[i] = 0x1a + } + } + if len(m.Num2) > 0 { + dAtA2 := make([]byte, len(m.Num2)*10) var j1 int - for _, num1 := range m.Num1 { + for _, num1 := range m.Num2 { num := uint64(num1) for num >= 1<<7 { dAtA2[j1] = uint8(uint64(num)&0x7f | 0x80) @@ -262,15 +289,16 @@ dAtA2[j1] = uint8(num) j1++ } - dAtA[i] = 0xa - i++ + i -= j1 + copy(dAtA[i:], dAtA2[:j1]) i = encodeVarintIssue503(dAtA, i, uint64(j1)) - i += copy(dAtA[i:], dAtA2[:j1]) + i-- + dAtA[i] = 0x12 } - if len(m.Num2) > 0 { - dAtA4 := make([]byte, len(m.Num2)*10) + if len(m.Num1) > 0 { + dAtA4 := make([]byte, len(m.Num1)*10) var j3 int - for _, num1 := range m.Num2 { + for _, num1 := range m.Num1 { num := uint64(num1) for num >= 1<<7 { dAtA4[j3] = uint8(uint64(num)&0x7f | 0x80) @@ -280,48 +308,25 @@ dAtA4[j3] = uint8(num) j3++ } - dAtA[i] = 0x12 - i++ + i -= j3 + copy(dAtA[i:], dAtA4[:j3]) i = encodeVarintIssue503(dAtA, i, uint64(j3)) - i += copy(dAtA[i:], dAtA4[:j3]) - } - if len(m.Str1) > 0 { - for _, s := range m.Str1 { - dAtA[i] = 0x1a - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) - } - } - if len(m.Dat1) > 0 { - for _, b := range m.Dat1 { - dAtA[i] = 0x22 - i++ - i = encodeVarintIssue503(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) - } - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintIssue503(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue503(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedFoo(r randyIssue503, easy bool) *Foo { this := &Foo{} @@ -750,6 +755,7 @@ func skipIssue503(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -781,10 +787,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -805,55 +809,30 @@ return 0, ErrInvalidLengthIssue503 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue503 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIssue503 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIssue503(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue503 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIssue503 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIssue503 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIssue503 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIssue503 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIssue503 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIssue503 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIssue503 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue530/issue530.pb.go golang-gogoprotobuf-1.3.1/test/issue530/issue530.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue530/issue530.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue530/issue530.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -24,7 +24,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Foo5 struct { Bar1 Bar1 `protobuf:"bytes,1,opt,name=bar1" json:"bar1"` @@ -54,7 +54,7 @@ return xxx_messageInfo_Foo5.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -174,7 +174,7 @@ return xxx_messageInfo_Bar1.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -217,7 +217,7 @@ return xxx_messageInfo_Bar2.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -261,7 +261,7 @@ return xxx_messageInfo_Bar3.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -311,7 +311,7 @@ return xxx_messageInfo_Bar4.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -355,7 +355,7 @@ return xxx_messageInfo_Bar5.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -408,7 +408,7 @@ return xxx_messageInfo_Bar7.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -472,7 +472,7 @@ return xxx_messageInfo_Bar8.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -516,7 +516,7 @@ return xxx_messageInfo_Bar9.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -948,7 +948,7 @@ func (m *Foo5) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -956,181 +956,202 @@ } func (m *Foo5) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Foo5) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintIssue530(dAtA, i, uint64(m.Bar1.Size())) - n1, err1 := m.Bar1.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 - } - i += n1 - if m.Bar2 != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(m.Bar2.Size())) - n2, err2 := m.Bar2.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + if len(m.Barmap2) > 0 { + for k := range m.Barmap2 { + v := m.Barmap2[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintIssue530(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintIssue530(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } - i += n2 } - dAtA[i] = 0x1a - i++ - i = encodeVarintIssue530(dAtA, i, uint64(m.Bar3.Size())) - n3, err3 := m.Bar3.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + if len(m.Barmap1) > 0 { + for k := range m.Barmap1 { + v := m.Barmap1[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintIssue530(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintIssue530(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a + } } - i += n3 - if m.Bar4 != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(m.Bar4.Size())) - n4, err4 := m.Bar4.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 + if len(m.Barrs2) > 0 { + for iNdEx := len(m.Barrs2) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Barrs2[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x52 } - i += n4 } - if len(m.Bars1) > 0 { - for _, msg := range m.Bars1 { - dAtA[i] = 0x2a - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Barrs1) > 0 { + for iNdEx := len(m.Barrs1) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Barrs1[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x4a } } - if len(m.Bars2) > 0 { - for _, msg := range m.Bars2 { - dAtA[i] = 0x32 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Bars4) > 0 { + for iNdEx := len(m.Bars4) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars4[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x42 } } if len(m.Bars3) > 0 { - for _, msg := range m.Bars3 { - dAtA[i] = 0x3a - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Bars3) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars3[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x3a } } - if len(m.Bars4) > 0 { - for _, msg := range m.Bars4 { - dAtA[i] = 0x42 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Bars2) > 0 { + for iNdEx := len(m.Bars2) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars2[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x32 } } - if len(m.Barrs1) > 0 { - for _, msg := range m.Barrs1 { - dAtA[i] = 0x4a - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Bars1) > 0 { + for iNdEx := len(m.Bars1) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars1[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x2a } } - if len(m.Barrs2) > 0 { - for _, msg := range m.Barrs2 { - dAtA[i] = 0x52 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) + if m.Bar4 != nil { + { + size, err := m.Bar4.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } - i += n + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x22 } - if len(m.Barmap1) > 0 { - for k := range m.Barmap1 { - dAtA[i] = 0x5a - i++ - v := m.Barmap1[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovIssue530(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovIssue530(uint64(len(k))) + msgSize - i = encodeVarintIssue530(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintIssue530(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(v.Size())) - n5, err5 := v.MarshalTo(dAtA[i:]) - if err5 != nil { - return 0, err5 - } - i += n5 - } + { + size, err := m.Bar3.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - if len(m.Barmap2) > 0 { - for k := range m.Barmap2 { - dAtA[i] = 0x62 - i++ - v := m.Barmap2[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovIssue530(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovIssue530(uint64(len(k))) + msgSize - i = encodeVarintIssue530(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintIssue530(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(v.Size())) - n6, err6 := v.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 - } - i += n6 + i-- + dAtA[i] = 0x1a + if m.Bar2 != nil { + { + size, err := m.Bar2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + { + size, err := m.Bar1.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *Bar1) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1138,21 +1159,27 @@ } func (m *Bar1) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Bar1) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ + i -= len(m.Str) + copy(dAtA[i:], m.Str) i = encodeVarintIssue530(dAtA, i, uint64(len(m.Str))) - i += copy(dAtA[i:], m.Str) - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *Bar2) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1160,23 +1187,29 @@ } func (m *Bar2) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Bar2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.Str != nil { - dAtA[i] = 0xa - i++ + i -= len(*m.Str) + copy(dAtA[i:], *m.Str) i = encodeVarintIssue530(dAtA, i, uint64(len(*m.Str))) - i += copy(dAtA[i:], *m.Str) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *Bar3) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1184,41 +1217,50 @@ } func (m *Bar3) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Bar3) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Bars4) > 0 { - for _, msg := range m.Bars4 { - dAtA[i] = 0xa - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Bars2) > 0 { + for iNdEx := len(m.Bars2) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars2[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if len(m.Bars2) > 0 { - for _, msg := range m.Bars2 { - dAtA[i] = 0x12 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Bars4) > 0 { + for iNdEx := len(m.Bars4) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars4[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - return i, nil + return len(dAtA) - i, nil } func (m *Bar4) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1226,21 +1268,27 @@ } func (m *Bar4) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Bar4) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ + i -= len(m.Str) + copy(dAtA[i:], m.Str) i = encodeVarintIssue530(dAtA, i, uint64(len(m.Str))) - i += copy(dAtA[i:], m.Str) - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *Bar5) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1248,41 +1296,50 @@ } func (m *Bar5) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Bar5) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Bars2) > 0 { - for _, msg := range m.Bars2 { - dAtA[i] = 0xa - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Bars1) > 0 { + for iNdEx := len(m.Bars1) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars1[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if len(m.Bars1) > 0 { - for _, msg := range m.Bars1 { - dAtA[i] = 0x12 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Bars2) > 0 { + for iNdEx := len(m.Bars2) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars2[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - return i, nil + return len(dAtA) - i, nil } func (m *Bar7) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1290,51 +1347,62 @@ } func (m *Bar7) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Bar7) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Bars71) > 0 { - for _, msg := range m.Bars71 { - dAtA[i] = 0xa - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + if m.Str2 != nil { + i -= len(*m.Str2) + copy(dAtA[i:], *m.Str2) + i = encodeVarintIssue530(dAtA, i, uint64(len(*m.Str2))) + i-- + dAtA[i] = 0x22 } + i -= len(m.Str1) + copy(dAtA[i:], m.Str1) + i = encodeVarintIssue530(dAtA, i, uint64(len(m.Str1))) + i-- + dAtA[i] = 0x1a if len(m.Bars72) > 0 { - for _, msg := range m.Bars72 { - dAtA[i] = 0x12 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Bars72) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars72[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - dAtA[i] = 0x1a - i++ - i = encodeVarintIssue530(dAtA, i, uint64(len(m.Str1))) - i += copy(dAtA[i:], m.Str1) - if m.Str2 != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintIssue530(dAtA, i, uint64(len(*m.Str2))) - i += copy(dAtA[i:], *m.Str2) + if len(m.Bars71) > 0 { + for iNdEx := len(m.Bars71) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars71[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *Bar8) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1342,29 +1410,36 @@ } func (m *Bar8) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Bar8) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if len(m.Bars1) > 0 { - for _, msg := range m.Bars1 { - dAtA[i] = 0xa - i++ - i = encodeVarintIssue530(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Bars1) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Bars1[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue530(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - return i, nil + return len(dAtA) - i, nil } func (m *Bar9) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1372,39 +1447,47 @@ } func (m *Bar9) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Bar9) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ + i -= len(m.Str) + copy(dAtA[i:], m.Str) i = encodeVarintIssue530(dAtA, i, uint64(len(m.Str))) - i += copy(dAtA[i:], m.Str) - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func encodeVarintIssue530(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue530(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedFoo5(r randyIssue530, easy bool) *Foo5 { this := &Foo5{} v1 := NewPopulatedBar1(r, easy) this.Bar1 = *v1 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bar2 = NewPopulatedBar1(r, easy) } v2 := NewPopulatedBar2(r, easy) this.Bar3 = *v2 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bar4 = NewPopulatedBar2(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(5) this.Bars1 = make([]Bar1, v3) for i := 0; i < v3; i++ { @@ -1412,14 +1495,14 @@ this.Bars1[i] = *v4 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(5) this.Bars2 = make([]*Bar1, v5) for i := 0; i < v5; i++ { this.Bars2[i] = NewPopulatedBar1(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(5) this.Bars3 = make([]Bar2, v6) for i := 0; i < v6; i++ { @@ -1427,14 +1510,14 @@ this.Bars3[i] = *v7 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(5) this.Bars4 = make([]*Bar2, v8) for i := 0; i < v8; i++ { this.Bars4[i] = NewPopulatedBar2(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := r.Intn(5) this.Barrs1 = make([]Bar3, v9) for i := 0; i < v9; i++ { @@ -1442,7 +1525,7 @@ this.Barrs1[i] = *v10 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := r.Intn(5) this.Barrs2 = make([]Bar5, v11) for i := 0; i < v11; i++ { @@ -1450,14 +1533,14 @@ this.Barrs2[i] = *v12 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.Barmap1 = make(map[string]*Bar3) for i := 0; i < v13; i++ { this.Barmap1[randStringIssue530(r)] = NewPopulatedBar3(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := r.Intn(10) this.Barmap2 = make(map[string]*Bar5) for i := 0; i < v14; i++ { @@ -1479,7 +1562,7 @@ func NewPopulatedBar2(r randyIssue530, easy bool) *Bar2 { this := &Bar2{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := string(randStringIssue530(r)) this.Str = &v15 } @@ -1490,7 +1573,7 @@ func NewPopulatedBar3(r randyIssue530, easy bool) *Bar3 { this := &Bar3{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(5) this.Bars4 = make([]Bar4, v16) for i := 0; i < v16; i++ { @@ -1498,7 +1581,7 @@ this.Bars4[i] = *v17 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(5) this.Bars2 = make([]Bar2, v18) for i := 0; i < v18; i++ { @@ -1521,14 +1604,14 @@ func NewPopulatedBar5(r randyIssue530, easy bool) *Bar5 { this := &Bar5{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(5) this.Bars2 = make([]*Bar2, v20) for i := 0; i < v20; i++ { this.Bars2[i] = NewPopulatedBar2(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(5) this.Bars1 = make([]*Bar1, v21) for i := 0; i < v21; i++ { @@ -1542,7 +1625,7 @@ func NewPopulatedBar7(r randyIssue530, easy bool) *Bar7 { this := &Bar7{} - if r.Intn(10) == 0 { + if r.Intn(5) == 0 { v22 := r.Intn(5) this.Bars71 = make([]Bar7, v22) for i := 0; i < v22; i++ { @@ -1550,7 +1633,7 @@ this.Bars71[i] = *v23 } } - if r.Intn(10) == 0 { + if r.Intn(5) == 0 { v24 := r.Intn(5) this.Bars72 = make([]*Bar7, v24) for i := 0; i < v24; i++ { @@ -1558,7 +1641,7 @@ } } this.Str1 = string(randStringIssue530(r)) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := string(randStringIssue530(r)) this.Str2 = &v25 } @@ -1569,7 +1652,7 @@ func NewPopulatedBar8(r randyIssue530, easy bool) *Bar8 { this := &Bar8{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v26 := r.Intn(5) this.Bars1 = make([]Bar9, v26) for i := 0; i < v26; i++ { @@ -3582,6 +3665,7 @@ func skipIssue530(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -3613,10 +3697,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -3637,55 +3719,30 @@ return 0, ErrInvalidLengthIssue530 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue530 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowIssue530 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipIssue530(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthIssue530 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIssue530 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthIssue530 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthIssue530 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowIssue530 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthIssue530 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIssue530 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIssue530 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue617/issue617.pb.go golang-gogoprotobuf-1.3.1/test/issue617/issue617.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue617/issue617.pb.go 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue617/issue617.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,527 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: issue617.proto + +package issue617 + +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +type Foo struct { + // Types that are valid to be assigned to Details: + // *Foo_Bar_ + Details isFoo_Details `protobuf_oneof:"details"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Foo) Reset() { *m = Foo{} } +func (m *Foo) String() string { return proto.CompactTextString(m) } +func (*Foo) ProtoMessage() {} +func (*Foo) Descriptor() ([]byte, []int) { + return fileDescriptor_8be66a68e4f427ad, []int{0} +} +func (m *Foo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Foo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Foo.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Foo) XXX_Merge(src proto.Message) { + xxx_messageInfo_Foo.Merge(m, src) +} +func (m *Foo) XXX_Size() int { + return m.ProtoSize() +} +func (m *Foo) XXX_DiscardUnknown() { + xxx_messageInfo_Foo.DiscardUnknown(m) +} + +var xxx_messageInfo_Foo proto.InternalMessageInfo + +type isFoo_Details interface { + isFoo_Details() + MarshalTo([]byte) (int, error) + ProtoSize() int +} + +type Foo_Bar_ struct { + Bar *Foo_Bar `protobuf:"bytes,1,opt,name=bar,proto3,oneof" json:"bar,omitempty"` +} + +func (*Foo_Bar_) isFoo_Details() {} + +func (m *Foo) GetDetails() isFoo_Details { + if m != nil { + return m.Details + } + return nil +} + +func (m *Foo) GetBar() *Foo_Bar { + if x, ok := m.GetDetails().(*Foo_Bar_); ok { + return x.Bar + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Foo) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*Foo_Bar_)(nil), + } +} + +type Foo_Bar struct { + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Foo_Bar) Reset() { *m = Foo_Bar{} } +func (m *Foo_Bar) String() string { return proto.CompactTextString(m) } +func (*Foo_Bar) ProtoMessage() {} +func (*Foo_Bar) Descriptor() ([]byte, []int) { + return fileDescriptor_8be66a68e4f427ad, []int{0, 0} +} +func (m *Foo_Bar) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Foo_Bar) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Foo_Bar.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Foo_Bar) XXX_Merge(src proto.Message) { + xxx_messageInfo_Foo_Bar.Merge(m, src) +} +func (m *Foo_Bar) XXX_Size() int { + return m.ProtoSize() +} +func (m *Foo_Bar) XXX_DiscardUnknown() { + xxx_messageInfo_Foo_Bar.DiscardUnknown(m) +} + +var xxx_messageInfo_Foo_Bar proto.InternalMessageInfo + +func init() { + proto.RegisterType((*Foo)(nil), "issue617.Foo") + proto.RegisterType((*Foo_Bar)(nil), "issue617.Foo.Bar") +} + +func init() { proto.RegisterFile("issue617.proto", fileDescriptor_8be66a68e4f427ad) } + +var fileDescriptor_8be66a68e4f427ad = []byte{ + // 153 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcb, 0x2c, 0x2e, 0x2e, + 0x4d, 0x35, 0x33, 0x34, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x80, 0xf1, 0xa5, 0x74, + 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5, + 0xc1, 0x0a, 0x92, 0x4a, 0xd3, 0xc0, 0x3c, 0x30, 0x07, 0xcc, 0x82, 0x68, 0x54, 0xb2, 0xe3, 0x62, + 0x76, 0xcb, 0xcf, 0x17, 0x52, 0xe5, 0x62, 0x4e, 0x4a, 0x2c, 0x92, 0x60, 0x54, 0x60, 0xd4, 0xe0, + 0x36, 0x12, 0xd4, 0x83, 0x9b, 0xee, 0x96, 0x9f, 0xaf, 0xe7, 0x94, 0x58, 0xe4, 0xc1, 0x10, 0x04, + 0x92, 0x97, 0x62, 0xe5, 0x62, 0x76, 0x4a, 0x2c, 0x72, 0xe2, 0xe4, 0x62, 0x4f, 0x49, 0x2d, 0x49, + 0xcc, 0xcc, 0x29, 0x76, 0x12, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, + 0xe4, 0x18, 0x16, 0x3c, 0x96, 0x63, 0x4c, 0x62, 0x03, 0x1b, 0x6c, 0x0c, 0x08, 0x00, 0x00, 0xff, + 0xff, 0x8f, 0xa2, 0x8a, 0xc0, 0xa3, 0x00, 0x00, 0x00, +} + +func (m *Foo) Marshal() (dAtA []byte, err error) { + size := m.ProtoSize() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Foo) MarshalTo(dAtA []byte) (int, error) { + size := m.ProtoSize() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Foo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Details != nil { + { + size := m.Details.ProtoSize() + i -= size + if _, err := m.Details.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + } + } + return len(dAtA) - i, nil +} + +func (m *Foo_Bar_) MarshalTo(dAtA []byte) (int, error) { + size := m.ProtoSize() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Foo_Bar_) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + if m.Bar != nil { + { + size, err := m.Bar.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintIssue617(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} +func (m *Foo_Bar) Marshal() (dAtA []byte, err error) { + size := m.ProtoSize() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Foo_Bar) MarshalTo(dAtA []byte) (int, error) { + size := m.ProtoSize() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Foo_Bar) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + return len(dAtA) - i, nil +} + +func encodeVarintIssue617(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue617(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *Foo) ProtoSize() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Details != nil { + n += m.Details.ProtoSize() + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func (m *Foo_Bar_) ProtoSize() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Bar != nil { + l = m.Bar.ProtoSize() + n += 1 + l + sovIssue617(uint64(l)) + } + return n +} +func (m *Foo_Bar) ProtoSize() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func sovIssue617(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozIssue617(x uint64) (n int) { + return sovIssue617(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Foo) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowIssue617 + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Foo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Foo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Bar", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowIssue617 + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthIssue617 + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthIssue617 + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := &Foo_Bar{} + if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + m.Details = &Foo_Bar_{v} + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipIssue617(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthIssue617 + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthIssue617 + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Foo_Bar) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowIssue617 + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Bar: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Bar: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipIssue617(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthIssue617 + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthIssue617 + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipIssue617(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowIssue617 + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowIssue617 + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowIssue617 + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthIssue617 + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupIssue617 + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthIssue617 + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthIssue617 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowIssue617 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupIssue617 = fmt.Errorf("proto: unexpected end of group") +) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue617/issue617.proto golang-gogoprotobuf-1.3.1/test/issue617/issue617.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue617/issue617.proto 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue617/issue617.proto 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,47 @@ +// Protocol Buffers for Go with Gadgets +// +// Copyright (c) 2019, The GoGo Authors. All rights reserved. +// http://github.com/gogo/protobuf +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto3"; + +package issue617; + +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; + +option (gogoproto.marshaler_all) = true; +option (gogoproto.unmarshaler_all) = true; +option (gogoproto.sizer_all) = false; +option (gogoproto.protosizer_all) = true; + +message Foo { + message Bar { + } + + oneof details { + Bar bar = 1; + } +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue617/Makefile golang-gogoprotobuf-1.3.1/test/issue617/Makefile --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue617/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue617/Makefile 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,32 @@ +# Protocol Buffers for Go with Gadgets +# +# Copyright (c) 2019, The GoGo Authors. All rights reserved. +# http://github.com/gogo/protobuf +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +regenerate: + go install github.com/gogo/protobuf/protoc-gen-gogo + go install github.com/gogo/protobuf/protoc-min-version + protoc-min-version --version="3.0.0" --gogo_out=. --proto_path=../../../../../:../../protobuf/:. *.proto diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue620/issue620.pb.go golang-gogoprotobuf-1.3.1/test/issue620/issue620.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue620/issue620.pb.go 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue620/issue620.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,229 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: issue620.proto + +package issue620 + +import ( + bytes "bytes" + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +type Bar struct { + Field1 *string `protobuf:"bytes,1,opt,name=Field1" json:"Field1,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Bar) Reset() { *m = Bar{} } +func (m *Bar) String() string { return proto.CompactTextString(m) } +func (*Bar) ProtoMessage() {} +func (*Bar) Descriptor() ([]byte, []int) { + return fileDescriptor_63df3af46ac96f83, []int{0} +} +func (m *Bar) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Bar.Unmarshal(m, b) +} +func (m *Bar) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Bar.Marshal(b, m, deterministic) +} +func (m *Bar) XXX_Merge(src proto.Message) { + xxx_messageInfo_Bar.Merge(m, src) +} +func (m *Bar) XXX_Size() int { + return xxx_messageInfo_Bar.Size(m) +} +func (m *Bar) XXX_DiscardUnknown() { + xxx_messageInfo_Bar.DiscardUnknown(m) +} + +var xxx_messageInfo_Bar proto.InternalMessageInfo + +func (m *Bar) GetField1() string { + if m != nil && m.Field1 != nil { + return *m.Field1 + } + return "" +} + +type BarFast struct { + Field1 *string `protobuf:"bytes,1,opt,name=Field1" json:"Field1,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *BarFast) Reset() { *m = BarFast{} } +func (m *BarFast) String() string { return proto.CompactTextString(m) } +func (*BarFast) ProtoMessage() {} +func (*BarFast) Descriptor() ([]byte, []int) { + return fileDescriptor_63df3af46ac96f83, []int{1} +} +func (m *BarFast) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_BarFast.Unmarshal(m, b) +} +func (m *BarFast) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_BarFast.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *BarFast) XXX_Merge(src proto.Message) { + xxx_messageInfo_BarFast.Merge(m, src) +} +func (m *BarFast) XXX_Size() int { + return m.Size() +} +func (m *BarFast) XXX_DiscardUnknown() { + xxx_messageInfo_BarFast.DiscardUnknown(m) +} + +var xxx_messageInfo_BarFast proto.InternalMessageInfo + +func (m *BarFast) GetField1() string { + if m != nil && m.Field1 != nil { + return *m.Field1 + } + return "" +} + +func init() { + proto.RegisterType((*Bar)(nil), "issue620.Bar") + proto.RegisterType((*BarFast)(nil), "issue620.BarFast") +} + +func init() { proto.RegisterFile("issue620.proto", fileDescriptor_63df3af46ac96f83) } + +var fileDescriptor_63df3af46ac96f83 = []byte{ + // 128 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcb, 0x2c, 0x2e, 0x2e, + 0x4d, 0x35, 0x33, 0x32, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x80, 0xf1, 0xa5, 0x74, + 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5, + 0xc1, 0x0a, 0x92, 0x4a, 0xd3, 0xc0, 0x3c, 0x30, 0x07, 0xcc, 0x82, 0x68, 0x54, 0x92, 0xe5, 0x62, + 0x76, 0x4a, 0x2c, 0x12, 0x12, 0xe3, 0x62, 0x73, 0xcb, 0x4c, 0xcd, 0x49, 0x31, 0x94, 0x60, 0x54, + 0x60, 0xd4, 0xe0, 0x0c, 0x82, 0xf2, 0x94, 0xf4, 0xb9, 0xd8, 0x9d, 0x12, 0x8b, 0xdc, 0x12, 0x8b, + 0x4b, 0x70, 0x29, 0xb1, 0xe2, 0x79, 0xb1, 0x40, 0x9e, 0xb1, 0x63, 0xa1, 0x3c, 0xe3, 0x82, 0x85, + 0xf2, 0x8c, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0x1c, 0x6d, 0xdf, 0x99, 0x00, 0x00, 0x00, +} + +func (this *BarFast) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*BarFast) + if !ok { + that2, ok := that.(BarFast) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.Field1 != nil && that1.Field1 != nil { + if *this.Field1 != *that1.Field1 { + return false + } + } else if this.Field1 != nil { + return false + } else if that1.Field1 != nil { + return false + } + if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { + return false + } + return true +} +func (m *BarFast) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *BarFast) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *BarFast) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Field1 != nil { + i -= len(*m.Field1) + copy(dAtA[i:], *m.Field1) + i = encodeVarintIssue620(dAtA, i, uint64(len(*m.Field1))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintIssue620(dAtA []byte, offset int, v uint64) int { + offset -= sovIssue620(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *BarFast) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Field1 != nil { + l = len(*m.Field1) + n += 1 + l + sovIssue620(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func sovIssue620(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozIssue620(x uint64) (n int) { + return sovIssue620(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue620/issue620.proto golang-gogoprotobuf-1.3.1/test/issue620/issue620.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue620/issue620.proto 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue620/issue620.proto 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,44 @@ +// Protocol Buffers for Go with Gadgets +// +// Copyright (c) 2019, The GoGo Authors. All rights reserved. +// http://github.com/gogo/protobuf +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto2"; + +package issue620; + +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; + +message Bar { + optional string Field1 = 1; +} + +message BarFast { + option (gogoproto.marshaler) = true; + option (gogoproto.sizer) = true; + option (gogoproto.equal) = true; + optional string Field1 = 1; +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue620/issue620_test.go golang-gogoprotobuf-1.3.1/test/issue620/issue620_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue620/issue620_test.go 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue620/issue620_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,119 @@ +// Protocol Buffers for Go with Gadgets +// +// Copyright (c) 2019, The GoGo Authors. All rights reserved. +// http://github.com/gogo/protobuf +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package issue620 + +import ( + "bytes" + "testing" + + "github.com/gogo/protobuf/proto" +) + +func TestEncodeShort(t *testing.T) { + exp := []byte{8, 10, 6, 66, 97, 114, 49, 50, 51} + s := "Bar123" + b1 := &Bar{Field1: &s} + bufProto := proto.NewBuffer(nil) + + b2 := &BarFast{Field1: &s} + bufProtoFast := proto.NewBuffer(nil) + + encodeMessageCheck(t, b1, b2, bufProto, bufProtoFast, exp) +} + +func TestEncodeLong(t *testing.T) { + exp := []byte{8, 10, 6, 66, 97, 114, 49, 50, 51} + s := "Bar123" + b1 := &Bar{Field1: &s} + bufProto := proto.NewBuffer(make([]byte, 0, 480)) + b2 := &BarFast{Field1: &s} + bufProtoFast := proto.NewBuffer(make([]byte, 0, 480)) + + encodeMessageCheck(t, b1, b2, bufProto, bufProtoFast, exp) +} + +func TestEncodeDecode(t *testing.T) { + s := "Bar123" + bar := &BarFast{Field1: &s} + bufProtoFast := proto.NewBuffer(make([]byte, 0, 480)) + err := bufProtoFast.EncodeMessage(bar) + errCheck(t, err) + dec := &BarFast{} + err = bufProtoFast.DecodeMessage(dec) + errCheck(t, err) + if !dec.Equal(bar) { + t.Errorf("Expect %+v got %+v after encode/decode", bar, dec) + } +} + +func encodeMessageCheck(t *testing.T, b1, b2 proto.Message, bufProto, bufProtoFast *proto.Buffer, exp []byte) { + err := bufProto.EncodeMessage(b1) + errCheck(t, err) + err = bufProtoFast.EncodeMessage(b2) + errCheck(t, err) + checkEqual(t, exp, bufProto.Bytes()) + checkEqual(t, exp, bufProtoFast.Bytes()) + + bufProto.Reset() + bufProtoFast.Reset() + expMore := make([]byte, 0, len(exp)) + copy(expMore, exp) + for i := 0; i < 10; i++ { + err = bufProto.EncodeMessage(b1) + errCheck(t, err) + err = bufProtoFast.EncodeMessage(b2) + errCheck(t, err) + expMore = append(expMore, exp...) + checkEqual(t, expMore, bufProto.Bytes()) + checkEqual(t, expMore, bufProtoFast.Bytes()) + } + + bufProto.Reset() + bufProtoFast.Reset() + err = bufProto.EncodeMessage(b1) + errCheck(t, err) + err = bufProtoFast.EncodeMessage(b2) + errCheck(t, err) + checkEqual(t, exp, bufProto.Bytes()) + checkEqual(t, exp, bufProtoFast.Bytes()) +} + +func errCheck(t *testing.T, err error) { + t.Helper() + if err != nil { + t.Error(err.Error()) + } +} + +func checkEqual(t *testing.T, b1, b2 []byte) { + t.Helper() + if !bytes.Equal(b1, b2) { + t.Errorf("%v != %v\n", b1, b2) + } +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue620/Makefile golang-gogoprotobuf-1.3.1/test/issue620/Makefile --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue620/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue620/Makefile 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,31 @@ +# Protocol Buffers for Go with Gadgets +# +# Copyright (c) 2019, The GoGo Authors. All rights reserved. +# http://github.com/gogo/protobuf +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +regenerate: + go install github.com/gogo/protobuf/protoc-gen-gogo + protoc --proto_path=../../../../../:../../protobuf/:. --gogo_out=. issue620.proto diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue630/issue630.pb.go golang-gogoprotobuf-1.3.1/test/issue630/issue630.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue630/issue630.pb.go 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue630/issue630.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,216 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: issue630.proto + +package issue630 + +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + math "math" + reflect "reflect" + strings "strings" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +type Foo struct { + Bar1 []Bar `protobuf:"bytes,1,rep,name=Bar1" json:"Bar1"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Foo) Reset() { *m = Foo{} } +func (m *Foo) String() string { return proto.CompactTextString(m) } +func (*Foo) ProtoMessage() {} +func (*Foo) Descriptor() ([]byte, []int) { + return fileDescriptor_60374e06e51d301c, []int{0} +} +func (m *Foo) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Foo.Unmarshal(m, b) +} +func (m *Foo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Foo.Marshal(b, m, deterministic) +} +func (m *Foo) XXX_Merge(src proto.Message) { + xxx_messageInfo_Foo.Merge(m, src) +} +func (m *Foo) XXX_Size() int { + return xxx_messageInfo_Foo.Size(m) +} +func (m *Foo) XXX_DiscardUnknown() { + xxx_messageInfo_Foo.DiscardUnknown(m) +} + +var xxx_messageInfo_Foo proto.InternalMessageInfo + +func (m *Foo) GetBar1() []Bar { + if m != nil { + return m.Bar1 + } + return nil +} + +type Qux struct { + Bar1 []*Bar `protobuf:"bytes,1,rep,name=Bar1" json:"Bar1,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Qux) Reset() { *m = Qux{} } +func (m *Qux) String() string { return proto.CompactTextString(m) } +func (*Qux) ProtoMessage() {} +func (*Qux) Descriptor() ([]byte, []int) { + return fileDescriptor_60374e06e51d301c, []int{1} +} +func (m *Qux) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Qux.Unmarshal(m, b) +} +func (m *Qux) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Qux.Marshal(b, m, deterministic) +} +func (m *Qux) XXX_Merge(src proto.Message) { + xxx_messageInfo_Qux.Merge(m, src) +} +func (m *Qux) XXX_Size() int { + return xxx_messageInfo_Qux.Size(m) +} +func (m *Qux) XXX_DiscardUnknown() { + xxx_messageInfo_Qux.DiscardUnknown(m) +} + +var xxx_messageInfo_Qux proto.InternalMessageInfo + +func (m *Qux) GetBar1() []*Bar { + if m != nil { + return m.Bar1 + } + return nil +} + +type Bar struct { + Baz string `protobuf:"bytes,1,opt,name=Baz" json:"Baz"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Bar) Reset() { *m = Bar{} } +func (m *Bar) String() string { return proto.CompactTextString(m) } +func (*Bar) ProtoMessage() {} +func (*Bar) Descriptor() ([]byte, []int) { + return fileDescriptor_60374e06e51d301c, []int{2} +} +func (m *Bar) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_Bar.Unmarshal(m, b) +} +func (m *Bar) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_Bar.Marshal(b, m, deterministic) +} +func (m *Bar) XXX_Merge(src proto.Message) { + xxx_messageInfo_Bar.Merge(m, src) +} +func (m *Bar) XXX_Size() int { + return xxx_messageInfo_Bar.Size(m) +} +func (m *Bar) XXX_DiscardUnknown() { + xxx_messageInfo_Bar.DiscardUnknown(m) +} + +var xxx_messageInfo_Bar proto.InternalMessageInfo + +func (m *Bar) GetBaz() string { + if m != nil { + return m.Baz + } + return "" +} + +func init() { + proto.RegisterType((*Foo)(nil), "issue630.Foo") + proto.RegisterType((*Qux)(nil), "issue630.Qux") + proto.RegisterType((*Bar)(nil), "issue630.Bar") +} + +func init() { proto.RegisterFile("issue630.proto", fileDescriptor_60374e06e51d301c) } + +var fileDescriptor_60374e06e51d301c = []byte{ + // 150 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcb, 0x2c, 0x2e, 0x2e, + 0x4d, 0x35, 0x33, 0x36, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x80, 0xf1, 0xa5, 0x74, + 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5, + 0xc1, 0x0a, 0x92, 0x4a, 0xd3, 0xc0, 0x3c, 0x30, 0x07, 0xcc, 0x82, 0x68, 0x54, 0xd2, 0xe3, 0x62, + 0x76, 0xcb, 0xcf, 0x17, 0x52, 0xe7, 0x62, 0x71, 0x4a, 0x2c, 0x32, 0x94, 0x60, 0x54, 0x60, 0xd6, + 0xe0, 0x36, 0xe2, 0xd5, 0x83, 0x1b, 0xef, 0x94, 0x58, 0xe4, 0xc4, 0x72, 0xe2, 0x9e, 0x3c, 0x43, + 0x10, 0x58, 0x01, 0x48, 0x7d, 0x60, 0x69, 0x05, 0x61, 0xf5, 0x8c, 0x50, 0xf5, 0xb2, 0x5c, 0xcc, + 0x4e, 0x89, 0x45, 0x42, 0x62, 0x20, 0xaa, 0x4a, 0x82, 0x51, 0x81, 0x51, 0x83, 0x13, 0x6a, 0x1e, + 0x48, 0xc0, 0x89, 0xe5, 0xc3, 0x43, 0x39, 0x46, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x5d, + 0xa4, 0x14, 0xce, 0x00, 0x00, 0x00, +} + +func (this *Foo) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 5) + s = append(s, "&issue630.Foo{") + if this.Bar1 != nil { + vs := make([]Bar, len(this.Bar1)) + for i := range vs { + vs[i] = this.Bar1[i] + } + s = append(s, "Bar1: "+fmt.Sprintf("%#v", vs)+",\n") + } + if this.XXX_unrecognized != nil { + s = append(s, "XXX_unrecognized:"+fmt.Sprintf("%#v", this.XXX_unrecognized)+",\n") + } + s = append(s, "}") + return strings.Join(s, "") +} +func (this *Qux) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 5) + s = append(s, "&issue630.Qux{") + if this.Bar1 != nil { + s = append(s, "Bar1: "+fmt.Sprintf("%#v", this.Bar1)+",\n") + } + if this.XXX_unrecognized != nil { + s = append(s, "XXX_unrecognized:"+fmt.Sprintf("%#v", this.XXX_unrecognized)+",\n") + } + s = append(s, "}") + return strings.Join(s, "") +} +func (this *Bar) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 5) + s = append(s, "&issue630.Bar{") + s = append(s, "Baz: "+fmt.Sprintf("%#v", this.Baz)+",\n") + if this.XXX_unrecognized != nil { + s = append(s, "XXX_unrecognized:"+fmt.Sprintf("%#v", this.XXX_unrecognized)+",\n") + } + s = append(s, "}") + return strings.Join(s, "") +} +func valueToGoStringIssue630(v interface{}, typ string) string { + rv := reflect.ValueOf(v) + if rv.IsNil() { + return "nil" + } + pv := reflect.Indirect(rv).Interface() + return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue630/issue630.proto golang-gogoprotobuf-1.3.1/test/issue630/issue630.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue630/issue630.proto 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue630/issue630.proto 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,47 @@ +// Protocol Buffers for Go with Gadgets +// +// Copyright (c) 2015, The GoGo Authors. All rights reserved. +// http://github.com/gogo/protobuf +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto2"; + +package issue630; + +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; + +option (gogoproto.gostring_all) = true; + +message Foo { + repeated Bar Bar1 = 1 [(gogoproto.nullable) = false]; +} + +message Qux { + repeated Bar Bar1 = 1 [(gogoproto.nullable) = true]; +} + +message Bar { + optional string Baz = 1 [(gogoproto.nullable) = false]; +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue630/issue630_test.go golang-gogoprotobuf-1.3.1/test/issue630/issue630_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue630/issue630_test.go 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue630/issue630_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,55 @@ +// Protocol Buffers for Go with Gadgets +// +// Copyright (c) 2015, The GoGo Authors. All rights reserved. +// http://github.com/gogo/protobuf +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package issue630 + +import ( + "testing" +) + +func TestRepeatedNonNullableGoString(t *testing.T) { + foo := &Foo{Bar1: []Bar{{Baz: "a"}, {Baz: "b"}}} + expected := `&issue630.Foo{Bar1: []issue630.Bar{issue630.Bar{Baz:"a", XXX_NoUnkeyedLiteral:struct {}{}, XXX_unrecognized:[]uint8(nil), XXX_sizecache:0}, issue630.Bar{Baz:"b", XXX_NoUnkeyedLiteral:struct {}{}, XXX_unrecognized:[]uint8(nil), XXX_sizecache:0}}, +}` + actual := foo.GoString() + if expected != actual { + t.Fatalf("expected:\n%s\ngot:\n%s\n", expected, actual) + } +} + +func TestRepeatedNullableGoString(t *testing.T) { + qux := &Qux{Bar1: []*Bar{{Baz: "a"}, {Baz: "b"}}} + expected := `&issue630.Qux{Bar1: []*issue630.Bar{&issue630.Bar{Baz: "a", +}, &issue630.Bar{Baz: "b", +}}, +}` + actual := qux.GoString() + if expected != actual { + t.Fatalf("expected:\n%s\ngot:\n%s\n", expected, actual) + } +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue630/Makefile golang-gogoprotobuf-1.3.1/test/issue630/Makefile --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue630/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue630/Makefile 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,30 @@ +# Protocol Buffers for Go with Gadgets +# +# Copyright (c) 2013, The GoGo Authors. All rights reserved. +# http://github.com/gogo/protobuf +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +regenerate: + (protoc --proto_path=../../protobuf/:../../../../../:. --gogo_out=. issue630.proto) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue8/proto.pb.go golang-gogoprotobuf-1.3.1/test/issue8/proto.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/issue8/proto.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/issue8/proto.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Foo struct { Bar *uint64 `protobuf:"varint,1,req,name=bar" json:"bar,omitempty"` @@ -276,6 +276,7 @@ func skipProto(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -307,10 +308,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -331,55 +330,30 @@ return 0, ErrInvalidLengthProto } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthProto - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowProto - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipProto(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthProto - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupProto + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthProto + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthProto = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowProto = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthProto = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowProto = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupProto = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapdefaults/combos/both/map.pb.go golang-gogoprotobuf-1.3.1/test/mapdefaults/combos/both/map.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapdefaults/combos/both/map.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/mapdefaults/combos/both/map.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,7 +29,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapTest struct { StrStr map[string]string `protobuf:"bytes,1,rep,name=str_str,json=strStr,proto3" json:"str_str,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` @@ -51,7 +51,7 @@ return xxx_messageInfo_MapTest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -90,7 +90,7 @@ return xxx_messageInfo_FakeMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -131,7 +131,7 @@ return xxx_messageInfo_FakeMapEntry.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -740,7 +740,7 @@ func (m *MapTest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -748,37 +748,45 @@ } func (m *MapTest) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MapTest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.StrStr) > 0 { for k := range m.StrStr { - dAtA[i] = 0xa - i++ v := m.StrStr[k] - mapSize := 1 + len(k) + sovMap(uint64(len(k))) + 1 + len(v) + sovMap(uint64(len(v))) - i = encodeVarintMap(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintMap(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ + baseI := i + i -= len(v) + copy(dAtA[i:], v) i = encodeVarintMap(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintMap(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintMap(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *FakeMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -786,32 +794,40 @@ } func (m *FakeMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FakeMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Entries) > 0 { - for _, msg := range m.Entries { - dAtA[i] = 0xa - i++ - i = encodeVarintMap(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Entries) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Entries[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMap(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *FakeMapEntry) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -819,46 +835,57 @@ } func (m *FakeMapEntry) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FakeMapEntry) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Key) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintMap(dAtA, i, uint64(len(m.Key))) - i += copy(dAtA[i:], m.Key) - } - if len(m.Value) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintMap(dAtA, i, uint64(len(m.Value))) - i += copy(dAtA[i:], m.Value) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Other) > 0 { - dAtA[i] = 0x1a - i++ + i -= len(m.Other) + copy(dAtA[i:], m.Other) i = encodeVarintMap(dAtA, i, uint64(len(m.Other))) - i += copy(dAtA[i:], m.Other) + i-- + dAtA[i] = 0x1a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Value) > 0 { + i -= len(m.Value) + copy(dAtA[i:], m.Value) + i = encodeVarintMap(dAtA, i, uint64(len(m.Value))) + i-- + dAtA[i] = 0x12 } - return i, nil + if len(m.Key) > 0 { + i -= len(m.Key) + copy(dAtA[i:], m.Key) + i = encodeVarintMap(dAtA, i, uint64(len(m.Key))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func encodeVarintMap(dAtA []byte, offset int, v uint64) int { + offset -= sovMap(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedMapTest(r randyMap, easy bool) *MapTest { this := &MapTest{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.StrStr = make(map[string]string) for i := 0; i < v1; i++ { @@ -873,7 +900,7 @@ func NewPopulatedFakeMap(r randyMap, easy bool) *FakeMap { this := &FakeMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(5) this.Entries = make([]*FakeMapEntry, v2) for i := 0; i < v2; i++ { @@ -1517,6 +1544,7 @@ func skipMap(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1548,10 +1576,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1572,55 +1598,30 @@ return 0, ErrInvalidLengthMap } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthMap - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowMap - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipMap(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthMap - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupMap + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthMap + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthMap = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowMap = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthMap = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowMap = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupMap = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapdefaults/combos/marshaler/map.pb.go golang-gogoprotobuf-1.3.1/test/mapdefaults/combos/marshaler/map.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapdefaults/combos/marshaler/map.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/mapdefaults/combos/marshaler/map.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -28,7 +28,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapTest struct { StrStr map[string]string `protobuf:"bytes,1,rep,name=str_str,json=strStr,proto3" json:"str_str,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` @@ -50,7 +50,7 @@ return xxx_messageInfo_MapTest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -89,7 +89,7 @@ return xxx_messageInfo_FakeMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -130,7 +130,7 @@ return xxx_messageInfo_FakeMapEntry.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -739,7 +739,7 @@ func (m *MapTest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -747,37 +747,45 @@ } func (m *MapTest) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MapTest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.StrStr) > 0 { for k := range m.StrStr { - dAtA[i] = 0xa - i++ v := m.StrStr[k] - mapSize := 1 + len(k) + sovMap(uint64(len(k))) + 1 + len(v) + sovMap(uint64(len(v))) - i = encodeVarintMap(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintMap(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ + baseI := i + i -= len(v) + copy(dAtA[i:], v) i = encodeVarintMap(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintMap(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintMap(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *FakeMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -785,32 +793,40 @@ } func (m *FakeMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FakeMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Entries) > 0 { - for _, msg := range m.Entries { - dAtA[i] = 0xa - i++ - i = encodeVarintMap(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Entries) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Entries[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMap(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *FakeMapEntry) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -818,46 +834,57 @@ } func (m *FakeMapEntry) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FakeMapEntry) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Key) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintMap(dAtA, i, uint64(len(m.Key))) - i += copy(dAtA[i:], m.Key) - } - if len(m.Value) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintMap(dAtA, i, uint64(len(m.Value))) - i += copy(dAtA[i:], m.Value) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Other) > 0 { - dAtA[i] = 0x1a - i++ + i -= len(m.Other) + copy(dAtA[i:], m.Other) i = encodeVarintMap(dAtA, i, uint64(len(m.Other))) - i += copy(dAtA[i:], m.Other) + i-- + dAtA[i] = 0x1a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Value) > 0 { + i -= len(m.Value) + copy(dAtA[i:], m.Value) + i = encodeVarintMap(dAtA, i, uint64(len(m.Value))) + i-- + dAtA[i] = 0x12 + } + if len(m.Key) > 0 { + i -= len(m.Key) + copy(dAtA[i:], m.Key) + i = encodeVarintMap(dAtA, i, uint64(len(m.Key))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintMap(dAtA []byte, offset int, v uint64) int { + offset -= sovMap(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedMapTest(r randyMap, easy bool) *MapTest { this := &MapTest{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.StrStr = make(map[string]string) for i := 0; i < v1; i++ { @@ -872,7 +899,7 @@ func NewPopulatedFakeMap(r randyMap, easy bool) *FakeMap { this := &FakeMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(5) this.Entries = make([]*FakeMapEntry, v2) for i := 0; i < v2; i++ { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapdefaults/combos/neither/map.pb.go golang-gogoprotobuf-1.3.1/test/mapdefaults/combos/neither/map.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapdefaults/combos/neither/map.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/mapdefaults/combos/neither/map.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -28,7 +28,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapTest struct { StrStr map[string]string `protobuf:"bytes,1,rep,name=str_str,json=strStr,proto3" json:"str_str,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` @@ -711,7 +711,7 @@ } func NewPopulatedMapTest(r randyMap, easy bool) *MapTest { this := &MapTest{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.StrStr = make(map[string]string) for i := 0; i < v1; i++ { @@ -726,7 +726,7 @@ func NewPopulatedFakeMap(r randyMap, easy bool) *FakeMap { this := &FakeMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(5) this.Entries = make([]*FakeMapEntry, v2) for i := 0; i < v2; i++ { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapdefaults/combos/unmarshaler/map.pb.go golang-gogoprotobuf-1.3.1/test/mapdefaults/combos/unmarshaler/map.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapdefaults/combos/unmarshaler/map.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/mapdefaults/combos/unmarshaler/map.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,7 +29,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapTest struct { StrStr map[string]string `protobuf:"bytes,1,rep,name=str_str,json=strStr,proto3" json:"str_str,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` @@ -712,7 +712,7 @@ } func NewPopulatedMapTest(r randyMap, easy bool) *MapTest { this := &MapTest{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.StrStr = make(map[string]string) for i := 0; i < v1; i++ { @@ -727,7 +727,7 @@ func NewPopulatedFakeMap(r randyMap, easy bool) *FakeMap { this := &FakeMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(5) this.Entries = make([]*FakeMapEntry, v2) for i := 0; i < v2; i++ { @@ -1371,6 +1371,7 @@ func skipMap(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1402,10 +1403,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1426,55 +1425,30 @@ return 0, ErrInvalidLengthMap } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthMap - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowMap - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipMap(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthMap - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupMap + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthMap + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthMap = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowMap = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthMap = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowMap = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupMap = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapsproto2/combos/both/mapsproto2.pb.go golang-gogoprotobuf-1.3.1/test/mapsproto2/combos/both/mapsproto2.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapsproto2/combos/both/mapsproto2.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/mapsproto2/combos/both/mapsproto2.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -33,7 +33,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapEnum int32 @@ -98,7 +98,7 @@ return xxx_messageInfo_FloatingPoint.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -140,7 +140,7 @@ return xxx_messageInfo_CustomMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -195,7 +195,7 @@ return xxx_messageInfo_AllMaps.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -247,7 +247,7 @@ } func (m *AllMapsOrdered) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2430,7 +2430,7 @@ func (m *FloatingPoint) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2438,26 +2438,32 @@ } func (m *FloatingPoint) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FloatingPoint) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.F != nil { - dAtA[i] = 0x9 - i++ + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.F)))) - i += 8 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *CustomMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2465,124 +2471,126 @@ } func (m *CustomMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Nullable128S) > 0 { - for k := range m.Nullable128S { - dAtA[i] = 0xa - i++ - v := m.Nullable128S[k] - cSize := 0 - if v != nil { - cSize = v.Size() - cSize += 1 + sovMapsproto2(uint64(cSize)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Ids) > 0 { + for k := range m.Ids { + v := m.Ids[k] + baseI := i + { + size := v.Size() + i -= size + if _, err := v.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + cSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 + } + } + if len(m.NullableIds) > 0 { + for k := range m.NullableIds { + v := m.NullableIds[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n1, err1 := v.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + { + size := v.Size() + i -= size + if _, err := v.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) } - i += n1 + i-- + dAtA[i] = 0x12 } + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } if len(m.Uint128S) > 0 { for k := range m.Uint128S { - dAtA[i] = 0x12 - i++ v := m.Uint128S[k] - cSize := 0 - cSize = v.Size() - cSize += 1 + sovMapsproto2(uint64(cSize)) - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + cSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + baseI := i + { + size := v.Size() + i -= size + if _, err := v.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n2, err2 := v.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 - } - i += n2 } } - if len(m.NullableIds) > 0 { - for k := range m.NullableIds { - dAtA[i] = 0x1a - i++ - v := m.NullableIds[k] - cSize := 0 - if v != nil { - cSize = v.Size() - cSize += 1 + sovMapsproto2(uint64(cSize)) - } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + cSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) + if len(m.Nullable128S) > 0 { + for k := range m.Nullable128S { + v := m.Nullable128S[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n3, err3 := v.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + { + size := v.Size() + i -= size + if _, err := v.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) } - i += n3 + i-- + dAtA[i] = 0x12 } - } - } - if len(m.Ids) > 0 { - for k := range m.Ids { - dAtA[i] = 0x22 - i++ - v := m.Ids[k] - cSize := 0 - cSize = v.Size() - cSize += 1 + sovMapsproto2(uint64(cSize)) - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + cSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n4, err4 := v.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 - } - i += n4 + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *AllMaps) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2590,325 +2598,332 @@ } func (m *AllMaps) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllMaps) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.StringToDoubleMap) > 0 { - for k := range m.StringToDoubleMap { + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.StringToMsgMap) > 0 { + for k := range m.StringToMsgMap { + v := m.StringToMsgMap[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) + i-- dAtA[i] = 0xa - i++ - v := m.StringToDoubleMap[k] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + } + if len(m.StringToEnumMap) > 0 { + for k := range m.StringToEnumMap { + v := m.StringToEnumMap[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) + i-- dAtA[i] = 0xa - i++ + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + } + if len(m.StringToBytesMap) > 0 { + for k := range m.StringToBytesMap { + v := m.StringToBytesMap[k] + baseI := i + if v != nil { + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.StringToFloatMap) > 0 { - for k := range m.StringToFloatMap { + if len(m.StringMap) > 0 { + for k := range m.StringMap { + v := m.StringMap[k] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) + i-- dAtA[i] = 0x12 - i++ - v := m.StringToFloatMap[k] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) - i += 4 + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.Int32Map) > 0 { - for k := range m.Int32Map { - dAtA[i] = 0x1a - i++ - v := m.Int32Map[k] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + if len(m.BoolMap) > 0 { + for k := range m.BoolMap { + v := m.BoolMap[k] + baseI := i + i-- + if v { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + if k { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } - if len(m.Int64Map) > 0 { - for k := range m.Int64Map { - dAtA[i] = 0x22 - i++ - v := m.Int64Map[k] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + if len(m.Sfixed64Map) > 0 { + for k := range m.Sfixed64Map { + v := m.Sfixed64Map[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) + i-- + dAtA[i] = 0x9 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.Uint32Map) > 0 { - for k := range m.Uint32Map { - dAtA[i] = 0x2a - i++ - v := m.Uint32Map[k] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + if len(m.Fixed64Map) > 0 { + for k := range m.Fixed64Map { + v := m.Fixed64Map[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) + i-- + dAtA[i] = 0x9 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a } } - if len(m.Uint64Map) > 0 { - for k := range m.Uint64Map { - dAtA[i] = 0x32 - i++ - v := m.Uint64Map[k] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + if len(m.Sfixed32Map) > 0 { + for k := range m.Sfixed32Map { + v := m.Sfixed32Map[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) + i-- + dAtA[i] = 0xd + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } - if len(m.Sint32Map) > 0 { - for k := range m.Sint32Map { - dAtA[i] = 0x3a - i++ - v := m.Sint32Map[k] - mapSize := 1 + sozMapsproto2(uint64(k)) + 1 + sozMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + if len(m.Fixed32Map) > 0 { + for k := range m.Fixed32Map { + v := m.Fixed32Map[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) + i-- + dAtA[i] = 0xd + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } if len(m.Sint64Map) > 0 { for k := range m.Sint64Map { - dAtA[i] = 0x42 - i++ v := m.Sint64Map[k] - mapSize := 1 + sozMapsproto2(uint64(k)) + 1 + sozMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) - dAtA[i] = 0x10 - i++ + baseI := i i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.Fixed32Map) > 0 { - for k := range m.Fixed32Map { - dAtA[i] = 0x4a - i++ - v := m.Fixed32Map[k] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + if len(m.Sint32Map) > 0 { + for k := range m.Sint32Map { + v := m.Sint32Map[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.Sfixed32Map) > 0 { - for k := range m.Sfixed32Map { - dAtA[i] = 0x52 - i++ - v := m.Sfixed32Map[k] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + if len(m.Uint64Map) > 0 { + for k := range m.Uint64Map { + v := m.Uint64Map[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.Fixed64Map) > 0 { - for k := range m.Fixed64Map { - dAtA[i] = 0x5a - i++ - v := m.Fixed64Map[k] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + if len(m.Uint32Map) > 0 { + for k := range m.Uint32Map { + v := m.Uint32Map[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.Sfixed64Map) > 0 { - for k := range m.Sfixed64Map { - dAtA[i] = 0x62 - i++ - v := m.Sfixed64Map[k] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + if len(m.Int64Map) > 0 { + for k := range m.Int64Map { + v := m.Int64Map[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.BoolMap) > 0 { - for k := range m.BoolMap { - dAtA[i] = 0x6a - i++ - v := m.BoolMap[k] - mapSize := 1 + 1 + 1 + 1 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - if k { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Int32Map) > 0 { + for k := range m.Int32Map { + v := m.Int32Map[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- dAtA[i] = 0x10 - i++ - if v { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.StringMap) > 0 { - for k := range m.StringMap { - dAtA[i] = 0x72 - i++ - v := m.StringMap[k] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + len(v) + sovMapsproto2(uint64(len(v))) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + if len(m.StringToFloatMap) > 0 { + for k := range m.StringToFloatMap { + v := m.StringToFloatMap[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) + i-- + dAtA[i] = 0x15 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) } } - if len(m.StringToBytesMap) > 0 { - for k := range m.StringToBytesMap { - dAtA[i] = 0x7a - i++ - v := m.StringToBytesMap[k] - byteSize := 0 - if v != nil { - byteSize = 1 + len(v) + sovMapsproto2(uint64(len(v))) - } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + byteSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + if len(m.StringToDoubleMap) > 0 { + for k := range m.StringToDoubleMap { + v := m.StringToDoubleMap[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) + i-- + dAtA[i] = 0x11 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } - } - } - if len(m.StringToEnumMap) > 0 { - for k := range m.StringToEnumMap { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToEnumMap[k] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) - } - } - if len(m.StringToMsgMap) > 0 { - for k := range m.StringToMsgMap { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToMsgMap[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovMapsproto2(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + msgSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n5, err5 := v.MarshalTo(dAtA[i:]) - if err5 != nil { - return 0, err5 - } - i += n5 - } } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *AllMapsOrdered) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2916,172 +2931,220 @@ } func (m *AllMapsOrdered) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllMapsOrdered) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.StringToDoubleMap) > 0 { - keysForStringToDoubleMap := make([]string, 0, len(m.StringToDoubleMap)) - for k := range m.StringToDoubleMap { - keysForStringToDoubleMap = append(keysForStringToDoubleMap, string(k)) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToDoubleMap) - for _, k := range keysForStringToDoubleMap { - dAtA[i] = 0xa - i++ - v := m.StringToDoubleMap[string(k)] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.StringToFloatMap) > 0 { - keysForStringToFloatMap := make([]string, 0, len(m.StringToFloatMap)) - for k := range m.StringToFloatMap { - keysForStringToFloatMap = append(keysForStringToFloatMap, string(k)) + if len(m.StringToMsgMap) > 0 { + keysForStringToMsgMap := make([]string, 0, len(m.StringToMsgMap)) + for k := range m.StringToMsgMap { + keysForStringToMsgMap = append(keysForStringToMsgMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToFloatMap) - for _, k := range keysForStringToFloatMap { - dAtA[i] = 0x12 - i++ - v := m.StringToFloatMap[string(k)] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToMsgMap) + for iNdEx := len(keysForStringToMsgMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToMsgMap[string(keysForStringToMsgMap[iNdEx])] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(keysForStringToMsgMap[iNdEx]) + copy(dAtA[i:], keysForStringToMsgMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringToMsgMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) - i += 4 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.Int32Map) > 0 { - keysForInt32Map := make([]int32, 0, len(m.Int32Map)) - for k := range m.Int32Map { - keysForInt32Map = append(keysForInt32Map, int32(k)) + if len(m.StringToEnumMap) > 0 { + keysForStringToEnumMap := make([]string, 0, len(m.StringToEnumMap)) + for k := range m.StringToEnumMap { + keysForStringToEnumMap = append(keysForStringToEnumMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Int32s(keysForInt32Map) - for _, k := range keysForInt32Map { - dAtA[i] = 0x1a - i++ - v := m.Int32Map[int32(k)] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToEnumMap) + for iNdEx := len(keysForStringToEnumMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToEnumMap[string(keysForStringToEnumMap[iNdEx])] + baseI := i i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(keysForStringToEnumMap[iNdEx]) + copy(dAtA[i:], keysForStringToEnumMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringToEnumMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.Int64Map) > 0 { - keysForInt64Map := make([]int64, 0, len(m.Int64Map)) - for k := range m.Int64Map { - keysForInt64Map = append(keysForInt64Map, int64(k)) + if len(m.StringToBytesMap) > 0 { + keysForStringToBytesMap := make([]string, 0, len(m.StringToBytesMap)) + for k := range m.StringToBytesMap { + keysForStringToBytesMap = append(keysForStringToBytesMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForInt64Map) - for _, k := range keysForInt64Map { - dAtA[i] = 0x22 - i++ - v := m.Int64Map[int64(k)] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToBytesMap) + for iNdEx := len(keysForStringToBytesMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToBytesMap[string(keysForStringToBytesMap[iNdEx])] + baseI := i + if v != nil { + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + } + i -= len(keysForStringToBytesMap[iNdEx]) + copy(dAtA[i:], keysForStringToBytesMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringToBytesMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.Uint32Map) > 0 { - keysForUint32Map := make([]uint32, 0, len(m.Uint32Map)) - for k := range m.Uint32Map { - keysForUint32Map = append(keysForUint32Map, uint32(k)) + if len(m.StringMap) > 0 { + keysForStringMap := make([]string, 0, len(m.StringMap)) + for k := range m.StringMap { + keysForStringMap = append(keysForStringMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Uint32s(keysForUint32Map) - for _, k := range keysForUint32Map { - dAtA[i] = 0x2a - i++ - v := m.Uint32Map[uint32(k)] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap) + for iNdEx := len(keysForStringMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringMap[string(keysForStringMap[iNdEx])] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(keysForStringMap[iNdEx]) + copy(dAtA[i:], keysForStringMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.Uint64Map) > 0 { - keysForUint64Map := make([]uint64, 0, len(m.Uint64Map)) - for k := range m.Uint64Map { - keysForUint64Map = append(keysForUint64Map, uint64(k)) + if len(m.BoolMap) > 0 { + keysForBoolMap := make([]bool, 0, len(m.BoolMap)) + for k := range m.BoolMap { + keysForBoolMap = append(keysForBoolMap, bool(k)) } - github_com_gogo_protobuf_sortkeys.Uint64s(keysForUint64Map) - for _, k := range keysForUint64Map { - dAtA[i] = 0x32 - i++ - v := m.Uint64Map[uint64(k)] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Bools(keysForBoolMap) + for iNdEx := len(keysForBoolMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.BoolMap[bool(keysForBoolMap[iNdEx])] + baseI := i + i-- + if v { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x10 + i-- + if keysForBoolMap[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } - if len(m.Sint32Map) > 0 { - keysForSint32Map := make([]int32, 0, len(m.Sint32Map)) - for k := range m.Sint32Map { - keysForSint32Map = append(keysForSint32Map, int32(k)) + if len(m.Sfixed64Map) > 0 { + keysForSfixed64Map := make([]int64, 0, len(m.Sfixed64Map)) + for k := range m.Sfixed64Map { + keysForSfixed64Map = append(keysForSfixed64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Int32s(keysForSint32Map) - for _, k := range keysForSint32Map { - dAtA[i] = 0x3a - i++ - v := m.Sint32Map[int32(k)] - mapSize := 1 + sozMapsproto2(uint64(k)) + 1 + sozMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + github_com_gogo_protobuf_sortkeys.Int64s(keysForSfixed64Map) + for iNdEx := len(keysForSfixed64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sfixed64Map[int64(keysForSfixed64Map[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(keysForSfixed64Map[iNdEx])) + i-- + dAtA[i] = 0x9 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.Sint64Map) > 0 { - keysForSint64Map := make([]int64, 0, len(m.Sint64Map)) - for k := range m.Sint64Map { - keysForSint64Map = append(keysForSint64Map, int64(k)) + if len(m.Fixed64Map) > 0 { + keysForFixed64Map := make([]uint64, 0, len(m.Fixed64Map)) + for k := range m.Fixed64Map { + keysForFixed64Map = append(keysForFixed64Map, uint64(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForSint64Map) - for _, k := range keysForSint64Map { - dAtA[i] = 0x42 - i++ - v := m.Sint64Map[int64(k)] - mapSize := 1 + sozMapsproto2(uint64(k)) + 1 + sozMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + github_com_gogo_protobuf_sortkeys.Uint64s(keysForFixed64Map) + for iNdEx := len(keysForFixed64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Fixed64Map[uint64(keysForFixed64Map[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(keysForFixed64Map[iNdEx])) + i-- + dAtA[i] = 0x9 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a + } + } + if len(m.Sfixed32Map) > 0 { + keysForSfixed32Map := make([]int32, 0, len(m.Sfixed32Map)) + for k := range m.Sfixed32Map { + keysForSfixed32Map = append(keysForSfixed32Map, int32(k)) + } + github_com_gogo_protobuf_sortkeys.Int32s(keysForSfixed32Map) + for iNdEx := len(keysForSfixed32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sfixed32Map[int32(keysForSfixed32Map[iNdEx])] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(keysForSfixed32Map[iNdEx])) + i-- + dAtA[i] = 0xd + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } if len(m.Fixed32Map) > 0 { @@ -3090,244 +3153,205 @@ keysForFixed32Map = append(keysForFixed32Map, uint32(k)) } github_com_gogo_protobuf_sortkeys.Uint32s(keysForFixed32Map) - for _, k := range keysForFixed32Map { - dAtA[i] = 0x4a - i++ - v := m.Fixed32Map[uint32(k)] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ + for iNdEx := len(keysForFixed32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Fixed32Map[uint32(keysForFixed32Map[iNdEx])] + baseI := i + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(keysForFixed32Map[iNdEx])) + i-- + dAtA[i] = 0xd + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } - if len(m.Sfixed32Map) > 0 { - keysForSfixed32Map := make([]int32, 0, len(m.Sfixed32Map)) - for k := range m.Sfixed32Map { - keysForSfixed32Map = append(keysForSfixed32Map, int32(k)) + if len(m.Sint64Map) > 0 { + keysForSint64Map := make([]int64, 0, len(m.Sint64Map)) + for k := range m.Sint64Map { + keysForSint64Map = append(keysForSint64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Int32s(keysForSfixed32Map) - for _, k := range keysForSfixed32Map { - dAtA[i] = 0x52 - i++ - v := m.Sfixed32Map[int32(k)] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + github_com_gogo_protobuf_sortkeys.Int64s(keysForSint64Map) + for iNdEx := len(keysForSint64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sint64Map[int64(keysForSint64Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(keysForSint64Map[iNdEx])<<1)^uint64((keysForSint64Map[iNdEx]>>63)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.Fixed64Map) > 0 { - keysForFixed64Map := make([]uint64, 0, len(m.Fixed64Map)) - for k := range m.Fixed64Map { - keysForFixed64Map = append(keysForFixed64Map, uint64(k)) + if len(m.Sint32Map) > 0 { + keysForSint32Map := make([]int32, 0, len(m.Sint32Map)) + for k := range m.Sint32Map { + keysForSint32Map = append(keysForSint32Map, int32(k)) } - github_com_gogo_protobuf_sortkeys.Uint64s(keysForFixed64Map) - for _, k := range keysForFixed64Map { - dAtA[i] = 0x5a - i++ - v := m.Fixed64Map[uint64(k)] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + github_com_gogo_protobuf_sortkeys.Int32s(keysForSint32Map) + for iNdEx := len(keysForSint32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sint32Map[int32(keysForSint32Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(keysForSint32Map[iNdEx])<<1)^uint32((keysForSint32Map[iNdEx]>>31)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.Sfixed64Map) > 0 { - keysForSfixed64Map := make([]int64, 0, len(m.Sfixed64Map)) - for k := range m.Sfixed64Map { - keysForSfixed64Map = append(keysForSfixed64Map, int64(k)) + if len(m.Uint64Map) > 0 { + keysForUint64Map := make([]uint64, 0, len(m.Uint64Map)) + for k := range m.Uint64Map { + keysForUint64Map = append(keysForUint64Map, uint64(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForSfixed64Map) - for _, k := range keysForSfixed64Map { - dAtA[i] = 0x62 - i++ - v := m.Sfixed64Map[int64(k)] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + github_com_gogo_protobuf_sortkeys.Uint64s(keysForUint64Map) + for iNdEx := len(keysForUint64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Uint64Map[uint64(keysForUint64Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(keysForUint64Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.BoolMap) > 0 { - keysForBoolMap := make([]bool, 0, len(m.BoolMap)) - for k := range m.BoolMap { - keysForBoolMap = append(keysForBoolMap, bool(k)) + if len(m.Uint32Map) > 0 { + keysForUint32Map := make([]uint32, 0, len(m.Uint32Map)) + for k := range m.Uint32Map { + keysForUint32Map = append(keysForUint32Map, uint32(k)) } - github_com_gogo_protobuf_sortkeys.Bools(keysForBoolMap) - for _, k := range keysForBoolMap { - dAtA[i] = 0x6a - i++ - v := m.BoolMap[bool(k)] - mapSize := 1 + 1 + 1 + 1 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - if k { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + github_com_gogo_protobuf_sortkeys.Uint32s(keysForUint32Map) + for iNdEx := len(keysForUint32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Uint32Map[uint32(keysForUint32Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- dAtA[i] = 0x10 - i++ - if v { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintMapsproto2(dAtA, i, uint64(keysForUint32Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.StringMap) > 0 { - keysForStringMap := make([]string, 0, len(m.StringMap)) - for k := range m.StringMap { - keysForStringMap = append(keysForStringMap, string(k)) + if len(m.Int64Map) > 0 { + keysForInt64Map := make([]int64, 0, len(m.Int64Map)) + for k := range m.Int64Map { + keysForInt64Map = append(keysForInt64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap) - for _, k := range keysForStringMap { - dAtA[i] = 0x72 - i++ - v := m.StringMap[string(k)] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + len(v) + sovMapsproto2(uint64(len(v))) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) + github_com_gogo_protobuf_sortkeys.Int64s(keysForInt64Map) + for iNdEx := len(keysForInt64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Int64Map[int64(keysForInt64Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(keysForInt64Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.StringToBytesMap) > 0 { - keysForStringToBytesMap := make([]string, 0, len(m.StringToBytesMap)) - for k := range m.StringToBytesMap { - keysForStringToBytesMap = append(keysForStringToBytesMap, string(k)) + if len(m.Int32Map) > 0 { + keysForInt32Map := make([]int32, 0, len(m.Int32Map)) + for k := range m.Int32Map { + keysForInt32Map = append(keysForInt32Map, int32(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToBytesMap) - for _, k := range keysForStringToBytesMap { - dAtA[i] = 0x7a - i++ - v := m.StringToBytesMap[string(k)] - byteSize := 0 - if v != nil { - byteSize = 1 + len(v) + sovMapsproto2(uint64(len(v))) - } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + byteSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } + github_com_gogo_protobuf_sortkeys.Int32s(keysForInt32Map) + for iNdEx := len(keysForInt32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Int32Map[int32(keysForInt32Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(keysForInt32Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.StringToEnumMap) > 0 { - keysForStringToEnumMap := make([]string, 0, len(m.StringToEnumMap)) - for k := range m.StringToEnumMap { - keysForStringToEnumMap = append(keysForStringToEnumMap, string(k)) + if len(m.StringToFloatMap) > 0 { + keysForStringToFloatMap := make([]string, 0, len(m.StringToFloatMap)) + for k := range m.StringToFloatMap { + keysForStringToFloatMap = append(keysForStringToFloatMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToEnumMap) - for _, k := range keysForStringToEnumMap { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToEnumMap[string(k)] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToFloatMap) + for iNdEx := len(keysForStringToFloatMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToFloatMap[string(keysForStringToFloatMap[iNdEx])] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) + i-- + dAtA[i] = 0x15 + i -= len(keysForStringToFloatMap[iNdEx]) + copy(dAtA[i:], keysForStringToFloatMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringToFloatMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 } } - if len(m.StringToMsgMap) > 0 { - keysForStringToMsgMap := make([]string, 0, len(m.StringToMsgMap)) - for k := range m.StringToMsgMap { - keysForStringToMsgMap = append(keysForStringToMsgMap, string(k)) + if len(m.StringToDoubleMap) > 0 { + keysForStringToDoubleMap := make([]string, 0, len(m.StringToDoubleMap)) + for k := range m.StringToDoubleMap { + keysForStringToDoubleMap = append(keysForStringToDoubleMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToMsgMap) - for _, k := range keysForStringToMsgMap { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToMsgMap[string(k)] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovMapsproto2(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + msgSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToDoubleMap) + for iNdEx := len(keysForStringToDoubleMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToDoubleMap[string(keysForStringToDoubleMap[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) + i-- + dAtA[i] = 0x11 + i -= len(keysForStringToDoubleMap[iNdEx]) + copy(dAtA[i:], keysForStringToDoubleMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringToDoubleMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n6, err6 := v.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 - } - i += n6 - } } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintMapsproto2(dAtA []byte, offset int, v uint64) int { + offset -= sovMapsproto2(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedFloatingPoint(r randyMapsproto2, easy bool) *FloatingPoint { this := &FloatingPoint{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := float64(r.Float64()) if r.Intn(2) == 0 { v1 *= -1 @@ -3342,28 +3366,28 @@ func NewPopulatedCustomMap(r randyMapsproto2, easy bool) *CustomMap { this := &CustomMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.Nullable128S = make(map[string]*github_com_gogo_protobuf_test_custom.Uint128) for i := 0; i < v2; i++ { this.Nullable128S[randStringMapsproto2(r)] = (*github_com_gogo_protobuf_test_custom.Uint128)(github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.Uint128S = make(map[string]github_com_gogo_protobuf_test_custom.Uint128) for i := 0; i < v3; i++ { this.Uint128S[randStringMapsproto2(r)] = (github_com_gogo_protobuf_test_custom.Uint128)(*github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(10) this.NullableIds = make(map[string]*github_com_gogo_protobuf_test.Uuid) for i := 0; i < v4; i++ { this.NullableIds[randStringMapsproto2(r)] = (*github_com_gogo_protobuf_test.Uuid)(github_com_gogo_protobuf_test.NewPopulatedUuid(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.Ids = make(map[string]github_com_gogo_protobuf_test.Uuid) for i := 0; i < v5; i++ { @@ -3378,7 +3402,7 @@ func NewPopulatedAllMaps(r randyMapsproto2, easy bool) *AllMaps { this := &AllMaps{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v6; i++ { @@ -3389,7 +3413,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v8; i++ { @@ -3400,7 +3424,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v10; i++ { @@ -3411,7 +3435,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v12; i++ { @@ -3422,7 +3446,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v14; i++ { @@ -3430,7 +3454,7 @@ this.Uint32Map[v15] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v16; i++ { @@ -3438,7 +3462,7 @@ this.Uint64Map[v17] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v18; i++ { @@ -3449,7 +3473,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v20; i++ { @@ -3460,7 +3484,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v22; i++ { @@ -3468,7 +3492,7 @@ this.Fixed32Map[v23] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v24; i++ { @@ -3479,7 +3503,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v26 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v26; i++ { @@ -3487,7 +3511,7 @@ this.Fixed64Map[v27] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v28 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v28; i++ { @@ -3498,7 +3522,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v30; i++ { @@ -3506,14 +3530,14 @@ this.BoolMap[v31] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v32; i++ { this.StringMap[randStringMapsproto2(r)] = randStringMapsproto2(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v33; i++ { @@ -3525,14 +3549,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v36; i++ { this.StringToEnumMap[randStringMapsproto2(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v37; i++ { @@ -3547,7 +3571,7 @@ func NewPopulatedAllMapsOrdered(r randyMapsproto2, easy bool) *AllMapsOrdered { this := &AllMapsOrdered{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v38; i++ { @@ -3558,7 +3582,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v40 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v40; i++ { @@ -3569,7 +3593,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v42; i++ { @@ -3580,7 +3604,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v44; i++ { @@ -3591,7 +3615,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v46 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v46; i++ { @@ -3599,7 +3623,7 @@ this.Uint32Map[v47] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v48 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v48; i++ { @@ -3607,7 +3631,7 @@ this.Uint64Map[v49] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v50; i++ { @@ -3618,7 +3642,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v52 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v52; i++ { @@ -3629,7 +3653,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v54; i++ { @@ -3637,7 +3661,7 @@ this.Fixed32Map[v55] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v56; i++ { @@ -3648,7 +3672,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v58; i++ { @@ -3656,7 +3680,7 @@ this.Fixed64Map[v59] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v60; i++ { @@ -3667,7 +3691,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v62; i++ { @@ -3675,14 +3699,14 @@ this.BoolMap[v63] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v64; i++ { this.StringMap[randStringMapsproto2(r)] = randStringMapsproto2(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v65; i++ { @@ -3694,14 +3718,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v68; i++ { this.StringToEnumMap[randStringMapsproto2(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v69; i++ { @@ -8883,6 +8907,7 @@ func skipMapsproto2(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -8914,10 +8939,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -8938,55 +8961,30 @@ return 0, ErrInvalidLengthMapsproto2 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthMapsproto2 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowMapsproto2 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipMapsproto2(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthMapsproto2 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupMapsproto2 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthMapsproto2 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthMapsproto2 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowMapsproto2 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthMapsproto2 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowMapsproto2 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupMapsproto2 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapsproto2/combos/marshaler/mapsproto2.pb.go golang-gogoprotobuf-1.3.1/test/mapsproto2/combos/marshaler/mapsproto2.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapsproto2/combos/marshaler/mapsproto2.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/mapsproto2/combos/marshaler/mapsproto2.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -32,7 +32,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapEnum int32 @@ -97,7 +97,7 @@ return xxx_messageInfo_FloatingPoint.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -139,7 +139,7 @@ return xxx_messageInfo_CustomMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -194,7 +194,7 @@ return xxx_messageInfo_AllMaps.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -246,7 +246,7 @@ } func (m *AllMapsOrdered) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2429,7 +2429,7 @@ func (m *FloatingPoint) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2437,26 +2437,32 @@ } func (m *FloatingPoint) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FloatingPoint) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.F != nil { - dAtA[i] = 0x9 - i++ + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.F)))) - i += 8 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *CustomMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2464,124 +2470,126 @@ } func (m *CustomMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Nullable128S) > 0 { - for k := range m.Nullable128S { - dAtA[i] = 0xa - i++ - v := m.Nullable128S[k] - cSize := 0 - if v != nil { - cSize = v.Size() - cSize += 1 + sovMapsproto2(uint64(cSize)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.Ids) > 0 { + for k := range m.Ids { + v := m.Ids[k] + baseI := i + { + size := v.Size() + i -= size + if _, err := v.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + cSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 + } + } + if len(m.NullableIds) > 0 { + for k := range m.NullableIds { + v := m.NullableIds[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n1, err1 := v.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + { + size := v.Size() + i -= size + if _, err := v.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) } - i += n1 + i-- + dAtA[i] = 0x12 } + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } if len(m.Uint128S) > 0 { for k := range m.Uint128S { - dAtA[i] = 0x12 - i++ v := m.Uint128S[k] - cSize := 0 - cSize = v.Size() - cSize += 1 + sovMapsproto2(uint64(cSize)) - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + cSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + baseI := i + { + size := v.Size() + i -= size + if _, err := v.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n2, err2 := v.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 - } - i += n2 } } - if len(m.NullableIds) > 0 { - for k := range m.NullableIds { - dAtA[i] = 0x1a - i++ - v := m.NullableIds[k] - cSize := 0 - if v != nil { - cSize = v.Size() - cSize += 1 + sovMapsproto2(uint64(cSize)) - } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + cSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) + if len(m.Nullable128S) > 0 { + for k := range m.Nullable128S { + v := m.Nullable128S[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n3, err3 := v.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + { + size := v.Size() + i -= size + if _, err := v.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) } - i += n3 + i-- + dAtA[i] = 0x12 } - } - } - if len(m.Ids) > 0 { - for k := range m.Ids { - dAtA[i] = 0x22 - i++ - v := m.Ids[k] - cSize := 0 - cSize = v.Size() - cSize += 1 + sovMapsproto2(uint64(cSize)) - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + cSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n4, err4 := v.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 - } - i += n4 + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *AllMaps) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2589,325 +2597,332 @@ } func (m *AllMaps) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllMaps) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.StringToDoubleMap) > 0 { - for k := range m.StringToDoubleMap { + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.StringToMsgMap) > 0 { + for k := range m.StringToMsgMap { + v := m.StringToMsgMap[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) + i-- dAtA[i] = 0xa - i++ - v := m.StringToDoubleMap[k] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + } + if len(m.StringToEnumMap) > 0 { + for k := range m.StringToEnumMap { + v := m.StringToEnumMap[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) + i-- dAtA[i] = 0xa - i++ + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + } + if len(m.StringToBytesMap) > 0 { + for k := range m.StringToBytesMap { + v := m.StringToBytesMap[k] + baseI := i + if v != nil { + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.StringToFloatMap) > 0 { - for k := range m.StringToFloatMap { + if len(m.StringMap) > 0 { + for k := range m.StringMap { + v := m.StringMap[k] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) + i-- dAtA[i] = 0x12 - i++ - v := m.StringToFloatMap[k] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) - i += 4 + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.Int32Map) > 0 { - for k := range m.Int32Map { - dAtA[i] = 0x1a - i++ - v := m.Int32Map[k] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + if len(m.BoolMap) > 0 { + for k := range m.BoolMap { + v := m.BoolMap[k] + baseI := i + i-- + if v { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + if k { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } - if len(m.Int64Map) > 0 { - for k := range m.Int64Map { - dAtA[i] = 0x22 - i++ - v := m.Int64Map[k] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + if len(m.Sfixed64Map) > 0 { + for k := range m.Sfixed64Map { + v := m.Sfixed64Map[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) + i-- + dAtA[i] = 0x9 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.Uint32Map) > 0 { - for k := range m.Uint32Map { - dAtA[i] = 0x2a - i++ - v := m.Uint32Map[k] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + if len(m.Fixed64Map) > 0 { + for k := range m.Fixed64Map { + v := m.Fixed64Map[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) + i-- + dAtA[i] = 0x9 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a } } - if len(m.Uint64Map) > 0 { - for k := range m.Uint64Map { - dAtA[i] = 0x32 - i++ - v := m.Uint64Map[k] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + if len(m.Sfixed32Map) > 0 { + for k := range m.Sfixed32Map { + v := m.Sfixed32Map[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) + i-- + dAtA[i] = 0xd + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } - if len(m.Sint32Map) > 0 { - for k := range m.Sint32Map { - dAtA[i] = 0x3a - i++ - v := m.Sint32Map[k] - mapSize := 1 + sozMapsproto2(uint64(k)) + 1 + sozMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + if len(m.Fixed32Map) > 0 { + for k := range m.Fixed32Map { + v := m.Fixed32Map[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) + i-- + dAtA[i] = 0xd + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } if len(m.Sint64Map) > 0 { for k := range m.Sint64Map { - dAtA[i] = 0x42 - i++ v := m.Sint64Map[k] - mapSize := 1 + sozMapsproto2(uint64(k)) + 1 + sozMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) - dAtA[i] = 0x10 - i++ + baseI := i i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.Fixed32Map) > 0 { - for k := range m.Fixed32Map { - dAtA[i] = 0x4a - i++ - v := m.Fixed32Map[k] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + if len(m.Sint32Map) > 0 { + for k := range m.Sint32Map { + v := m.Sint32Map[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.Sfixed32Map) > 0 { - for k := range m.Sfixed32Map { - dAtA[i] = 0x52 - i++ - v := m.Sfixed32Map[k] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + if len(m.Uint64Map) > 0 { + for k := range m.Uint64Map { + v := m.Uint64Map[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.Fixed64Map) > 0 { - for k := range m.Fixed64Map { - dAtA[i] = 0x5a - i++ - v := m.Fixed64Map[k] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + if len(m.Uint32Map) > 0 { + for k := range m.Uint32Map { + v := m.Uint32Map[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.Sfixed64Map) > 0 { - for k := range m.Sfixed64Map { - dAtA[i] = 0x62 - i++ - v := m.Sfixed64Map[k] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + if len(m.Int64Map) > 0 { + for k := range m.Int64Map { + v := m.Int64Map[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.BoolMap) > 0 { - for k := range m.BoolMap { - dAtA[i] = 0x6a - i++ - v := m.BoolMap[k] - mapSize := 1 + 1 + 1 + 1 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - if k { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Int32Map) > 0 { + for k := range m.Int32Map { + v := m.Int32Map[k] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- dAtA[i] = 0x10 - i++ - if v { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.StringMap) > 0 { - for k := range m.StringMap { - dAtA[i] = 0x72 - i++ - v := m.StringMap[k] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + len(v) + sovMapsproto2(uint64(len(v))) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + if len(m.StringToFloatMap) > 0 { + for k := range m.StringToFloatMap { + v := m.StringToFloatMap[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) + i-- + dAtA[i] = 0x15 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) } } - if len(m.StringToBytesMap) > 0 { - for k := range m.StringToBytesMap { - dAtA[i] = 0x7a - i++ - v := m.StringToBytesMap[k] - byteSize := 0 - if v != nil { - byteSize = 1 + len(v) + sovMapsproto2(uint64(len(v))) - } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + byteSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + if len(m.StringToDoubleMap) > 0 { + for k := range m.StringToDoubleMap { + v := m.StringToDoubleMap[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) + i-- + dAtA[i] = 0x11 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } - } - } - if len(m.StringToEnumMap) > 0 { - for k := range m.StringToEnumMap { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToEnumMap[k] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) - } - } - if len(m.StringToMsgMap) > 0 { - for k := range m.StringToMsgMap { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToMsgMap[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovMapsproto2(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + msgSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n5, err5 := v.MarshalTo(dAtA[i:]) - if err5 != nil { - return 0, err5 - } - i += n5 - } } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *AllMapsOrdered) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2915,172 +2930,220 @@ } func (m *AllMapsOrdered) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllMapsOrdered) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.StringToDoubleMap) > 0 { - keysForStringToDoubleMap := make([]string, 0, len(m.StringToDoubleMap)) - for k := range m.StringToDoubleMap { - keysForStringToDoubleMap = append(keysForStringToDoubleMap, string(k)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.StringToMsgMap) > 0 { + keysForStringToMsgMap := make([]string, 0, len(m.StringToMsgMap)) + for k := range m.StringToMsgMap { + keysForStringToMsgMap = append(keysForStringToMsgMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToDoubleMap) - for _, k := range keysForStringToDoubleMap { - dAtA[i] = 0xa - i++ - v := m.StringToDoubleMap[string(k)] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToMsgMap) + for iNdEx := len(keysForStringToMsgMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToMsgMap[string(keysForStringToMsgMap[iNdEx])] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMapsproto2(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(keysForStringToMsgMap[iNdEx]) + copy(dAtA[i:], keysForStringToMsgMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringToMsgMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.StringToFloatMap) > 0 { - keysForStringToFloatMap := make([]string, 0, len(m.StringToFloatMap)) - for k := range m.StringToFloatMap { - keysForStringToFloatMap = append(keysForStringToFloatMap, string(k)) + if len(m.StringToEnumMap) > 0 { + keysForStringToEnumMap := make([]string, 0, len(m.StringToEnumMap)) + for k := range m.StringToEnumMap { + keysForStringToEnumMap = append(keysForStringToEnumMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToFloatMap) - for _, k := range keysForStringToFloatMap { - dAtA[i] = 0x12 - i++ - v := m.StringToFloatMap[string(k)] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToEnumMap) + for iNdEx := len(keysForStringToEnumMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToEnumMap[string(keysForStringToEnumMap[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(keysForStringToEnumMap[iNdEx]) + copy(dAtA[i:], keysForStringToEnumMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringToEnumMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) - i += 4 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.Int32Map) > 0 { - keysForInt32Map := make([]int32, 0, len(m.Int32Map)) - for k := range m.Int32Map { - keysForInt32Map = append(keysForInt32Map, int32(k)) + if len(m.StringToBytesMap) > 0 { + keysForStringToBytesMap := make([]string, 0, len(m.StringToBytesMap)) + for k := range m.StringToBytesMap { + keysForStringToBytesMap = append(keysForStringToBytesMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Int32s(keysForInt32Map) - for _, k := range keysForInt32Map { - dAtA[i] = 0x1a - i++ - v := m.Int32Map[int32(k)] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToBytesMap) + for iNdEx := len(keysForStringToBytesMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToBytesMap[string(keysForStringToBytesMap[iNdEx])] + baseI := i + if v != nil { + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + } + i -= len(keysForStringToBytesMap[iNdEx]) + copy(dAtA[i:], keysForStringToBytesMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringToBytesMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.Int64Map) > 0 { - keysForInt64Map := make([]int64, 0, len(m.Int64Map)) - for k := range m.Int64Map { - keysForInt64Map = append(keysForInt64Map, int64(k)) + if len(m.StringMap) > 0 { + keysForStringMap := make([]string, 0, len(m.StringMap)) + for k := range m.StringMap { + keysForStringMap = append(keysForStringMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForInt64Map) - for _, k := range keysForInt64Map { - dAtA[i] = 0x22 - i++ - v := m.Int64Map[int64(k)] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap) + for iNdEx := len(keysForStringMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringMap[string(keysForStringMap[iNdEx])] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(keysForStringMap[iNdEx]) + copy(dAtA[i:], keysForStringMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.Uint32Map) > 0 { - keysForUint32Map := make([]uint32, 0, len(m.Uint32Map)) - for k := range m.Uint32Map { - keysForUint32Map = append(keysForUint32Map, uint32(k)) + if len(m.BoolMap) > 0 { + keysForBoolMap := make([]bool, 0, len(m.BoolMap)) + for k := range m.BoolMap { + keysForBoolMap = append(keysForBoolMap, bool(k)) } - github_com_gogo_protobuf_sortkeys.Uint32s(keysForUint32Map) - for _, k := range keysForUint32Map { - dAtA[i] = 0x2a - i++ - v := m.Uint32Map[uint32(k)] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) + github_com_gogo_protobuf_sortkeys.Bools(keysForBoolMap) + for iNdEx := len(keysForBoolMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.BoolMap[bool(keysForBoolMap[iNdEx])] + baseI := i + i-- + if v { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + if keysForBoolMap[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } - if len(m.Uint64Map) > 0 { - keysForUint64Map := make([]uint64, 0, len(m.Uint64Map)) - for k := range m.Uint64Map { - keysForUint64Map = append(keysForUint64Map, uint64(k)) + if len(m.Sfixed64Map) > 0 { + keysForSfixed64Map := make([]int64, 0, len(m.Sfixed64Map)) + for k := range m.Sfixed64Map { + keysForSfixed64Map = append(keysForSfixed64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Uint64s(keysForUint64Map) - for _, k := range keysForUint64Map { - dAtA[i] = 0x32 - i++ - v := m.Uint64Map[uint64(k)] - mapSize := 1 + sovMapsproto2(uint64(k)) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Int64s(keysForSfixed64Map) + for iNdEx := len(keysForSfixed64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sfixed64Map[int64(keysForSfixed64Map[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(keysForSfixed64Map[iNdEx])) + i-- + dAtA[i] = 0x9 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.Sint32Map) > 0 { - keysForSint32Map := make([]int32, 0, len(m.Sint32Map)) - for k := range m.Sint32Map { - keysForSint32Map = append(keysForSint32Map, int32(k)) + if len(m.Fixed64Map) > 0 { + keysForFixed64Map := make([]uint64, 0, len(m.Fixed64Map)) + for k := range m.Fixed64Map { + keysForFixed64Map = append(keysForFixed64Map, uint64(k)) } - github_com_gogo_protobuf_sortkeys.Int32s(keysForSint32Map) - for _, k := range keysForSint32Map { - dAtA[i] = 0x3a - i++ - v := m.Sint32Map[int32(k)] - mapSize := 1 + sozMapsproto2(uint64(k)) + 1 + sozMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + github_com_gogo_protobuf_sortkeys.Uint64s(keysForFixed64Map) + for iNdEx := len(keysForFixed64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Fixed64Map[uint64(keysForFixed64Map[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(keysForFixed64Map[iNdEx])) + i-- + dAtA[i] = 0x9 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a } } - if len(m.Sint64Map) > 0 { - keysForSint64Map := make([]int64, 0, len(m.Sint64Map)) - for k := range m.Sint64Map { - keysForSint64Map = append(keysForSint64Map, int64(k)) + if len(m.Sfixed32Map) > 0 { + keysForSfixed32Map := make([]int32, 0, len(m.Sfixed32Map)) + for k := range m.Sfixed32Map { + keysForSfixed32Map = append(keysForSfixed32Map, int32(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForSint64Map) - for _, k := range keysForSint64Map { - dAtA[i] = 0x42 - i++ - v := m.Sint64Map[int64(k)] - mapSize := 1 + sozMapsproto2(uint64(k)) + 1 + sozMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + github_com_gogo_protobuf_sortkeys.Int32s(keysForSfixed32Map) + for iNdEx := len(keysForSfixed32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sfixed32Map[int32(keysForSfixed32Map[iNdEx])] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(keysForSfixed32Map[iNdEx])) + i-- + dAtA[i] = 0xd + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } if len(m.Fixed32Map) > 0 { @@ -3089,244 +3152,205 @@ keysForFixed32Map = append(keysForFixed32Map, uint32(k)) } github_com_gogo_protobuf_sortkeys.Uint32s(keysForFixed32Map) - for _, k := range keysForFixed32Map { - dAtA[i] = 0x4a - i++ - v := m.Fixed32Map[uint32(k)] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ + for iNdEx := len(keysForFixed32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Fixed32Map[uint32(keysForFixed32Map[iNdEx])] + baseI := i + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(keysForFixed32Map[iNdEx])) + i-- + dAtA[i] = 0xd + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } - if len(m.Sfixed32Map) > 0 { - keysForSfixed32Map := make([]int32, 0, len(m.Sfixed32Map)) - for k := range m.Sfixed32Map { - keysForSfixed32Map = append(keysForSfixed32Map, int32(k)) + if len(m.Sint64Map) > 0 { + keysForSint64Map := make([]int64, 0, len(m.Sint64Map)) + for k := range m.Sint64Map { + keysForSint64Map = append(keysForSint64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Int32s(keysForSfixed32Map) - for _, k := range keysForSfixed32Map { - dAtA[i] = 0x52 - i++ - v := m.Sfixed32Map[int32(k)] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + github_com_gogo_protobuf_sortkeys.Int64s(keysForSint64Map) + for iNdEx := len(keysForSint64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sint64Map[int64(keysForSint64Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64((uint64(keysForSint64Map[iNdEx])<<1)^uint64((keysForSint64Map[iNdEx]>>63)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.Fixed64Map) > 0 { - keysForFixed64Map := make([]uint64, 0, len(m.Fixed64Map)) - for k := range m.Fixed64Map { - keysForFixed64Map = append(keysForFixed64Map, uint64(k)) + if len(m.Sint32Map) > 0 { + keysForSint32Map := make([]int32, 0, len(m.Sint32Map)) + for k := range m.Sint32Map { + keysForSint32Map = append(keysForSint32Map, int32(k)) } - github_com_gogo_protobuf_sortkeys.Uint64s(keysForFixed64Map) - for _, k := range keysForFixed64Map { - dAtA[i] = 0x5a - i++ - v := m.Fixed64Map[uint64(k)] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + github_com_gogo_protobuf_sortkeys.Int32s(keysForSint32Map) + for iNdEx := len(keysForSint32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sint32Map[int32(keysForSint32Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64((uint32(keysForSint32Map[iNdEx])<<1)^uint32((keysForSint32Map[iNdEx]>>31)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.Sfixed64Map) > 0 { - keysForSfixed64Map := make([]int64, 0, len(m.Sfixed64Map)) - for k := range m.Sfixed64Map { - keysForSfixed64Map = append(keysForSfixed64Map, int64(k)) + if len(m.Uint64Map) > 0 { + keysForUint64Map := make([]uint64, 0, len(m.Uint64Map)) + for k := range m.Uint64Map { + keysForUint64Map = append(keysForUint64Map, uint64(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForSfixed64Map) - for _, k := range keysForSfixed64Map { - dAtA[i] = 0x62 - i++ - v := m.Sfixed64Map[int64(k)] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + github_com_gogo_protobuf_sortkeys.Uint64s(keysForUint64Map) + for iNdEx := len(keysForUint64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Uint64Map[uint64(keysForUint64Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(keysForUint64Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.BoolMap) > 0 { - keysForBoolMap := make([]bool, 0, len(m.BoolMap)) - for k := range m.BoolMap { - keysForBoolMap = append(keysForBoolMap, bool(k)) + if len(m.Uint32Map) > 0 { + keysForUint32Map := make([]uint32, 0, len(m.Uint32Map)) + for k := range m.Uint32Map { + keysForUint32Map = append(keysForUint32Map, uint32(k)) } - github_com_gogo_protobuf_sortkeys.Bools(keysForBoolMap) - for _, k := range keysForBoolMap { - dAtA[i] = 0x6a - i++ - v := m.BoolMap[bool(k)] - mapSize := 1 + 1 + 1 + 1 - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - if k { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + github_com_gogo_protobuf_sortkeys.Uint32s(keysForUint32Map) + for iNdEx := len(keysForUint32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Uint32Map[uint32(keysForUint32Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- dAtA[i] = 0x10 - i++ - if v { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintMapsproto2(dAtA, i, uint64(keysForUint32Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.StringMap) > 0 { - keysForStringMap := make([]string, 0, len(m.StringMap)) - for k := range m.StringMap { - keysForStringMap = append(keysForStringMap, string(k)) + if len(m.Int64Map) > 0 { + keysForInt64Map := make([]int64, 0, len(m.Int64Map)) + for k := range m.Int64Map { + keysForInt64Map = append(keysForInt64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap) - for _, k := range keysForStringMap { - dAtA[i] = 0x72 - i++ - v := m.StringMap[string(k)] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + len(v) + sovMapsproto2(uint64(len(v))) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) + github_com_gogo_protobuf_sortkeys.Int64s(keysForInt64Map) + for iNdEx := len(keysForInt64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Int64Map[int64(keysForInt64Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(keysForInt64Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.StringToBytesMap) > 0 { - keysForStringToBytesMap := make([]string, 0, len(m.StringToBytesMap)) - for k := range m.StringToBytesMap { - keysForStringToBytesMap = append(keysForStringToBytesMap, string(k)) + if len(m.Int32Map) > 0 { + keysForInt32Map := make([]int32, 0, len(m.Int32Map)) + for k := range m.Int32Map { + keysForInt32Map = append(keysForInt32Map, int32(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToBytesMap) - for _, k := range keysForStringToBytesMap { - dAtA[i] = 0x7a - i++ - v := m.StringToBytesMap[string(k)] - byteSize := 0 - if v != nil { - byteSize = 1 + len(v) + sovMapsproto2(uint64(len(v))) - } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + byteSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } + github_com_gogo_protobuf_sortkeys.Int32s(keysForInt32Map) + for iNdEx := len(keysForInt32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Int32Map[int32(keysForInt32Map[iNdEx])] + baseI := i + i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintMapsproto2(dAtA, i, uint64(keysForInt32Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.StringToEnumMap) > 0 { - keysForStringToEnumMap := make([]string, 0, len(m.StringToEnumMap)) - for k := range m.StringToEnumMap { - keysForStringToEnumMap = append(keysForStringToEnumMap, string(k)) + if len(m.StringToFloatMap) > 0 { + keysForStringToFloatMap := make([]string, 0, len(m.StringToFloatMap)) + for k := range m.StringToFloatMap { + keysForStringToFloatMap = append(keysForStringToFloatMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToEnumMap) - for _, k := range keysForStringToEnumMap { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToEnumMap[string(k)] - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + 1 + sovMapsproto2(uint64(v)) - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToFloatMap) + for iNdEx := len(keysForStringToFloatMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToFloatMap[string(keysForStringToFloatMap[iNdEx])] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) + i-- + dAtA[i] = 0x15 + i -= len(keysForStringToFloatMap[iNdEx]) + copy(dAtA[i:], keysForStringToFloatMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringToFloatMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v)) + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 } } - if len(m.StringToMsgMap) > 0 { - keysForStringToMsgMap := make([]string, 0, len(m.StringToMsgMap)) - for k := range m.StringToMsgMap { - keysForStringToMsgMap = append(keysForStringToMsgMap, string(k)) + if len(m.StringToDoubleMap) > 0 { + keysForStringToDoubleMap := make([]string, 0, len(m.StringToDoubleMap)) + for k := range m.StringToDoubleMap { + keysForStringToDoubleMap = append(keysForStringToDoubleMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToMsgMap) - for _, k := range keysForStringToMsgMap { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToMsgMap[string(k)] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovMapsproto2(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovMapsproto2(uint64(len(k))) + msgSize - i = encodeVarintMapsproto2(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToDoubleMap) + for iNdEx := len(keysForStringToDoubleMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToDoubleMap[string(keysForStringToDoubleMap[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) + i-- + dAtA[i] = 0x11 + i -= len(keysForStringToDoubleMap[iNdEx]) + copy(dAtA[i:], keysForStringToDoubleMap[iNdEx]) + i = encodeVarintMapsproto2(dAtA, i, uint64(len(keysForStringToDoubleMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintMapsproto2(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintMapsproto2(dAtA, i, uint64(v.Size())) - n6, err6 := v.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 - } - i += n6 - } } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintMapsproto2(dAtA []byte, offset int, v uint64) int { + offset -= sovMapsproto2(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedFloatingPoint(r randyMapsproto2, easy bool) *FloatingPoint { this := &FloatingPoint{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := float64(r.Float64()) if r.Intn(2) == 0 { v1 *= -1 @@ -3341,28 +3365,28 @@ func NewPopulatedCustomMap(r randyMapsproto2, easy bool) *CustomMap { this := &CustomMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.Nullable128S = make(map[string]*github_com_gogo_protobuf_test_custom.Uint128) for i := 0; i < v2; i++ { this.Nullable128S[randStringMapsproto2(r)] = (*github_com_gogo_protobuf_test_custom.Uint128)(github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.Uint128S = make(map[string]github_com_gogo_protobuf_test_custom.Uint128) for i := 0; i < v3; i++ { this.Uint128S[randStringMapsproto2(r)] = (github_com_gogo_protobuf_test_custom.Uint128)(*github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(10) this.NullableIds = make(map[string]*github_com_gogo_protobuf_test.Uuid) for i := 0; i < v4; i++ { this.NullableIds[randStringMapsproto2(r)] = (*github_com_gogo_protobuf_test.Uuid)(github_com_gogo_protobuf_test.NewPopulatedUuid(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.Ids = make(map[string]github_com_gogo_protobuf_test.Uuid) for i := 0; i < v5; i++ { @@ -3377,7 +3401,7 @@ func NewPopulatedAllMaps(r randyMapsproto2, easy bool) *AllMaps { this := &AllMaps{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v6; i++ { @@ -3388,7 +3412,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v8; i++ { @@ -3399,7 +3423,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v10; i++ { @@ -3410,7 +3434,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v12; i++ { @@ -3421,7 +3445,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v14; i++ { @@ -3429,7 +3453,7 @@ this.Uint32Map[v15] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v16; i++ { @@ -3437,7 +3461,7 @@ this.Uint64Map[v17] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v18; i++ { @@ -3448,7 +3472,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v20; i++ { @@ -3459,7 +3483,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v22; i++ { @@ -3467,7 +3491,7 @@ this.Fixed32Map[v23] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v24; i++ { @@ -3478,7 +3502,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v26 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v26; i++ { @@ -3486,7 +3510,7 @@ this.Fixed64Map[v27] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v28 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v28; i++ { @@ -3497,7 +3521,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v30; i++ { @@ -3505,14 +3529,14 @@ this.BoolMap[v31] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v32; i++ { this.StringMap[randStringMapsproto2(r)] = randStringMapsproto2(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v33; i++ { @@ -3524,14 +3548,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v36; i++ { this.StringToEnumMap[randStringMapsproto2(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v37; i++ { @@ -3546,7 +3570,7 @@ func NewPopulatedAllMapsOrdered(r randyMapsproto2, easy bool) *AllMapsOrdered { this := &AllMapsOrdered{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v38; i++ { @@ -3557,7 +3581,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v40 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v40; i++ { @@ -3568,7 +3592,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v42; i++ { @@ -3579,7 +3603,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v44; i++ { @@ -3590,7 +3614,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v46 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v46; i++ { @@ -3598,7 +3622,7 @@ this.Uint32Map[v47] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v48 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v48; i++ { @@ -3606,7 +3630,7 @@ this.Uint64Map[v49] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v50; i++ { @@ -3617,7 +3641,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v52 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v52; i++ { @@ -3628,7 +3652,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v54; i++ { @@ -3636,7 +3660,7 @@ this.Fixed32Map[v55] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v56; i++ { @@ -3647,7 +3671,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v58; i++ { @@ -3655,7 +3679,7 @@ this.Fixed64Map[v59] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v60; i++ { @@ -3666,7 +3690,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v62; i++ { @@ -3674,14 +3698,14 @@ this.BoolMap[v63] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v64; i++ { this.StringMap[randStringMapsproto2(r)] = randStringMapsproto2(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v65; i++ { @@ -3693,14 +3717,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v68; i++ { this.StringToEnumMap[randStringMapsproto2(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v69; i++ { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapsproto2/combos/neither/mapsproto2.pb.go golang-gogoprotobuf-1.3.1/test/mapsproto2/combos/neither/mapsproto2.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapsproto2/combos/neither/mapsproto2.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/mapsproto2/combos/neither/mapsproto2.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -31,7 +31,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapEnum int32 @@ -2395,7 +2395,7 @@ } func NewPopulatedFloatingPoint(r randyMapsproto2, easy bool) *FloatingPoint { this := &FloatingPoint{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := float64(r.Float64()) if r.Intn(2) == 0 { v1 *= -1 @@ -2410,28 +2410,28 @@ func NewPopulatedCustomMap(r randyMapsproto2, easy bool) *CustomMap { this := &CustomMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.Nullable128S = make(map[string]*github_com_gogo_protobuf_test_custom.Uint128) for i := 0; i < v2; i++ { this.Nullable128S[randStringMapsproto2(r)] = (*github_com_gogo_protobuf_test_custom.Uint128)(github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.Uint128S = make(map[string]github_com_gogo_protobuf_test_custom.Uint128) for i := 0; i < v3; i++ { this.Uint128S[randStringMapsproto2(r)] = (github_com_gogo_protobuf_test_custom.Uint128)(*github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(10) this.NullableIds = make(map[string]*github_com_gogo_protobuf_test.Uuid) for i := 0; i < v4; i++ { this.NullableIds[randStringMapsproto2(r)] = (*github_com_gogo_protobuf_test.Uuid)(github_com_gogo_protobuf_test.NewPopulatedUuid(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.Ids = make(map[string]github_com_gogo_protobuf_test.Uuid) for i := 0; i < v5; i++ { @@ -2446,7 +2446,7 @@ func NewPopulatedAllMaps(r randyMapsproto2, easy bool) *AllMaps { this := &AllMaps{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v6; i++ { @@ -2457,7 +2457,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v8; i++ { @@ -2468,7 +2468,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v10; i++ { @@ -2479,7 +2479,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v12; i++ { @@ -2490,7 +2490,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v14; i++ { @@ -2498,7 +2498,7 @@ this.Uint32Map[v15] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v16; i++ { @@ -2506,7 +2506,7 @@ this.Uint64Map[v17] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v18; i++ { @@ -2517,7 +2517,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v20; i++ { @@ -2528,7 +2528,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v22; i++ { @@ -2536,7 +2536,7 @@ this.Fixed32Map[v23] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v24; i++ { @@ -2547,7 +2547,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v26 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v26; i++ { @@ -2555,7 +2555,7 @@ this.Fixed64Map[v27] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v28 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v28; i++ { @@ -2566,7 +2566,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v30; i++ { @@ -2574,14 +2574,14 @@ this.BoolMap[v31] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v32; i++ { this.StringMap[randStringMapsproto2(r)] = randStringMapsproto2(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v33; i++ { @@ -2593,14 +2593,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v36; i++ { this.StringToEnumMap[randStringMapsproto2(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v37; i++ { @@ -2615,7 +2615,7 @@ func NewPopulatedAllMapsOrdered(r randyMapsproto2, easy bool) *AllMapsOrdered { this := &AllMapsOrdered{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v38; i++ { @@ -2626,7 +2626,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v40 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v40; i++ { @@ -2637,7 +2637,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v42; i++ { @@ -2648,7 +2648,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v44; i++ { @@ -2659,7 +2659,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v46 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v46; i++ { @@ -2667,7 +2667,7 @@ this.Uint32Map[v47] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v48 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v48; i++ { @@ -2675,7 +2675,7 @@ this.Uint64Map[v49] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v50; i++ { @@ -2686,7 +2686,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v52 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v52; i++ { @@ -2697,7 +2697,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v54; i++ { @@ -2705,7 +2705,7 @@ this.Fixed32Map[v55] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v56; i++ { @@ -2716,7 +2716,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v58; i++ { @@ -2724,7 +2724,7 @@ this.Fixed64Map[v59] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v60; i++ { @@ -2735,7 +2735,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v62; i++ { @@ -2743,14 +2743,14 @@ this.BoolMap[v63] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v64; i++ { this.StringMap[randStringMapsproto2(r)] = randStringMapsproto2(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v65; i++ { @@ -2762,14 +2762,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v68; i++ { this.StringToEnumMap[randStringMapsproto2(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v69; i++ { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go golang-gogoprotobuf-1.3.1/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/mapsproto2/combos/unmarshaler/mapsproto2.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -33,7 +33,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapEnum int32 @@ -2399,7 +2399,7 @@ } func NewPopulatedFloatingPoint(r randyMapsproto2, easy bool) *FloatingPoint { this := &FloatingPoint{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := float64(r.Float64()) if r.Intn(2) == 0 { v1 *= -1 @@ -2414,28 +2414,28 @@ func NewPopulatedCustomMap(r randyMapsproto2, easy bool) *CustomMap { this := &CustomMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.Nullable128S = make(map[string]*github_com_gogo_protobuf_test_custom.Uint128) for i := 0; i < v2; i++ { this.Nullable128S[randStringMapsproto2(r)] = (*github_com_gogo_protobuf_test_custom.Uint128)(github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.Uint128S = make(map[string]github_com_gogo_protobuf_test_custom.Uint128) for i := 0; i < v3; i++ { this.Uint128S[randStringMapsproto2(r)] = (github_com_gogo_protobuf_test_custom.Uint128)(*github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(10) this.NullableIds = make(map[string]*github_com_gogo_protobuf_test.Uuid) for i := 0; i < v4; i++ { this.NullableIds[randStringMapsproto2(r)] = (*github_com_gogo_protobuf_test.Uuid)(github_com_gogo_protobuf_test.NewPopulatedUuid(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.Ids = make(map[string]github_com_gogo_protobuf_test.Uuid) for i := 0; i < v5; i++ { @@ -2450,7 +2450,7 @@ func NewPopulatedAllMaps(r randyMapsproto2, easy bool) *AllMaps { this := &AllMaps{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v6; i++ { @@ -2461,7 +2461,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v8; i++ { @@ -2472,7 +2472,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v10; i++ { @@ -2483,7 +2483,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v12; i++ { @@ -2494,7 +2494,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v14; i++ { @@ -2502,7 +2502,7 @@ this.Uint32Map[v15] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v16; i++ { @@ -2510,7 +2510,7 @@ this.Uint64Map[v17] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v18; i++ { @@ -2521,7 +2521,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v20; i++ { @@ -2532,7 +2532,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v22; i++ { @@ -2540,7 +2540,7 @@ this.Fixed32Map[v23] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v24; i++ { @@ -2551,7 +2551,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v26 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v26; i++ { @@ -2559,7 +2559,7 @@ this.Fixed64Map[v27] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v28 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v28; i++ { @@ -2570,7 +2570,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v30; i++ { @@ -2578,14 +2578,14 @@ this.BoolMap[v31] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v32; i++ { this.StringMap[randStringMapsproto2(r)] = randStringMapsproto2(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v33; i++ { @@ -2597,14 +2597,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v36; i++ { this.StringToEnumMap[randStringMapsproto2(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v37; i++ { @@ -2619,7 +2619,7 @@ func NewPopulatedAllMapsOrdered(r randyMapsproto2, easy bool) *AllMapsOrdered { this := &AllMapsOrdered{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v38; i++ { @@ -2630,7 +2630,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v40 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v40; i++ { @@ -2641,7 +2641,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v42; i++ { @@ -2652,7 +2652,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v44; i++ { @@ -2663,7 +2663,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v46 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v46; i++ { @@ -2671,7 +2671,7 @@ this.Uint32Map[v47] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v48 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v48; i++ { @@ -2679,7 +2679,7 @@ this.Uint64Map[v49] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v50; i++ { @@ -2690,7 +2690,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v52 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v52; i++ { @@ -2701,7 +2701,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v54; i++ { @@ -2709,7 +2709,7 @@ this.Fixed32Map[v55] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v56; i++ { @@ -2720,7 +2720,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v58; i++ { @@ -2728,7 +2728,7 @@ this.Fixed64Map[v59] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v60; i++ { @@ -2739,7 +2739,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v62; i++ { @@ -2747,14 +2747,14 @@ this.BoolMap[v63] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v64; i++ { this.StringMap[randStringMapsproto2(r)] = randStringMapsproto2(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v65; i++ { @@ -2766,14 +2766,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v68; i++ { this.StringToEnumMap[randStringMapsproto2(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v69; i++ { @@ -7955,6 +7955,7 @@ func skipMapsproto2(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -7986,10 +7987,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -8010,55 +8009,30 @@ return 0, ErrInvalidLengthMapsproto2 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthMapsproto2 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowMapsproto2 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipMapsproto2(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthMapsproto2 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupMapsproto2 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthMapsproto2 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthMapsproto2 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowMapsproto2 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthMapsproto2 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowMapsproto2 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupMapsproto2 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/merge/merge.pb.go golang-gogoprotobuf-1.3.1/test/merge/merge.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/merge/merge.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/merge/merge.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,10 +19,11 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type A struct { B B `protobuf:"bytes,1,opt,name=B,proto3" json:"B"` + C []C `protobuf:"bytes,2,rep,name=c,proto3" json:"c"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -59,6 +60,13 @@ return B{} } +func (m *A) GetC() []C { + if m != nil { + return m.C + } + return nil +} + type B struct { C int64 `protobuf:"varint,1,opt,name=c,proto3" json:"c,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -97,21 +105,61 @@ return 0 } +type C struct { + D int64 `protobuf:"varint,1,opt,name=d,proto3" json:"d,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *C) Reset() { *m = C{} } +func (m *C) String() string { return proto.CompactTextString(m) } +func (*C) ProtoMessage() {} +func (*C) Descriptor() ([]byte, []int) { + return fileDescriptor_82caea6f5430298b, []int{2} +} +func (m *C) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_C.Unmarshal(m, b) +} +func (m *C) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_C.Marshal(b, m, deterministic) +} +func (m *C) XXX_Merge(src proto.Message) { + xxx_messageInfo_C.Merge(m, src) +} +func (m *C) XXX_Size() int { + return xxx_messageInfo_C.Size(m) +} +func (m *C) XXX_DiscardUnknown() { + xxx_messageInfo_C.DiscardUnknown(m) +} + +var xxx_messageInfo_C proto.InternalMessageInfo + +func (m *C) GetD() int64 { + if m != nil { + return m.D + } + return 0 +} + func init() { proto.RegisterType((*A)(nil), "merge.A") proto.RegisterType((*B)(nil), "merge.B") + proto.RegisterType((*C)(nil), "merge.C") } func init() { proto.RegisterFile("merge.proto", fileDescriptor_82caea6f5430298b) } var fileDescriptor_82caea6f5430298b = []byte{ - // 123 bytes of a gzipped FileDescriptorProto + // 141 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xce, 0x4d, 0x2d, 0x4a, 0x4f, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0x73, 0xa4, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5, 0xc1, 0xb2, 0x49, - 0xa5, 0x69, 0x60, 0x1e, 0x98, 0x03, 0x66, 0x41, 0x74, 0x29, 0x29, 0x72, 0x31, 0x3a, 0x0a, 0xc9, + 0xa5, 0x69, 0x60, 0x1e, 0x98, 0x03, 0x66, 0x41, 0x74, 0x29, 0xd9, 0x73, 0x31, 0x3a, 0x0a, 0xc9, 0x70, 0x31, 0x3a, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0x71, 0xe8, 0x41, 0xcc, 0x74, 0x72, - 0x62, 0x39, 0x71, 0x4f, 0x9e, 0x21, 0x88, 0xd1, 0x49, 0x49, 0x90, 0x8b, 0xd1, 0x49, 0x88, 0x87, - 0x8b, 0x31, 0x19, 0xac, 0x84, 0x39, 0x88, 0x31, 0x39, 0x89, 0x0d, 0xac, 0xd9, 0x18, 0x10, 0x00, - 0x00, 0xff, 0xff, 0x86, 0x7b, 0xb3, 0xe7, 0x81, 0x00, 0x00, 0x00, + 0x62, 0x39, 0x71, 0x4f, 0x9e, 0x21, 0x88, 0xd1, 0x09, 0x24, 0x9b, 0x2c, 0xc1, 0xa4, 0xc0, 0x8c, + 0x24, 0xeb, 0x0c, 0x93, 0x4d, 0x56, 0x12, 0xe4, 0x62, 0x74, 0x12, 0xe2, 0x01, 0x29, 0x01, 0x19, + 0xc0, 0x0c, 0x15, 0x72, 0x06, 0x09, 0xa5, 0xc0, 0x84, 0x52, 0x92, 0xd8, 0xc0, 0xb6, 0x19, 0x03, + 0x02, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xc5, 0xc3, 0x5b, 0xb2, 0x00, 0x00, 0x00, } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/merge/merge.proto golang-gogoprotobuf-1.3.1/test/merge/merge.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/merge/merge.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/merge/merge.proto 2020-05-17 12:22:58.000000000 +0000 @@ -5,8 +5,13 @@ message A { B B = 1 [(gogoproto.nullable) = false]; + repeated C c = 2 [(gogoproto.nullable) = false]; } message B { int64 c = 1; -} \ No newline at end of file +} + +message C { + int64 d = 1; +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/merge/merge_test.go golang-gogoprotobuf-1.3.1/test/merge/merge_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/merge/merge_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/merge/merge_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -1,6 +1,8 @@ package merge import ( + "fmt" + "reflect" "testing" "github.com/gogo/protobuf/proto" @@ -11,6 +13,17 @@ proto.Clone(f1) } +func TestClone2(t *testing.T) { + f1 := &A{C: []C{{D: 1}, {D: 2}}} + f2 := proto.Clone(f1).(*A) + if !reflect.DeepEqual(f1.C, f2.C) { + t.Fatalf("got %v want %v", f2, f1) + } + if fmt.Sprintf("%p", f1.C) == fmt.Sprintf("%p", f2.C) { + t.Fatalf("slice is not deep copied") + } +} + func TestMerge1(t *testing.T) { f1 := &A{} f2 := &A{} @@ -34,3 +47,22 @@ t.Fatalf("got %d want %d", f1.B.C, 1) } } + +func TestMerge4(t *testing.T) { + f1 := &A{} + f2 := &A{C: []C{}} + proto.Merge(f1, f2) + if f1.C == nil { + t.Fatalf("got %v want %v", f1, []C{}) + } +} + +func TestMerge5(t *testing.T) { + f1 := &A{C: []C{{D: 1}, {D: 2}}} + f2 := &A{C: []C{{D: 3}, {D: 4}}} + f3 := &A{C: []C{{D: 1}, {D: 2}, {D: 3}, {D: 4}}} + proto.Merge(f1, f2) + if !reflect.DeepEqual(f1, f3) { + t.Fatalf("got %v want %v", f1, f3) + } +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/moredefaults/md.pb.go golang-gogoprotobuf-1.3.1/test/moredefaults/md.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/moredefaults/md.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/moredefaults/md.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MoreDefaultsB struct { Field1 *string `protobuf:"bytes,1,opt,name=Field1" json:"Field1,omitempty"` @@ -252,7 +252,7 @@ } func NewPopulatedMoreDefaultsB(r randyMd, easy bool) *MoreDefaultsB { this := &MoreDefaultsB{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := string(randStringMd(r)) this.Field1 = &v1 } @@ -264,7 +264,7 @@ func NewPopulatedMoreDefaultsA(r randyMd, easy bool) *MoreDefaultsA { this := &MoreDefaultsA{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := int64(r.Int63()) if r.Intn(2) == 0 { v2 *= -1 @@ -275,12 +275,12 @@ if r.Intn(2) == 0 { this.Field2 *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.B1 = NewPopulatedMoreDefaultsB(r, easy) } v3 := NewPopulatedMoreDefaultsB(r, easy) this.B2 = *v3 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.A1 = example.NewPopulatedA(r, easy) } v4 := example.NewPopulatedA(r, easy) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/nopackage/nopackage.pb.go golang-gogoprotobuf-1.3.1/test/nopackage/nopackage.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/nopackage/nopackage.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/nopackage/nopackage.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type M struct { F map[string]float64 `protobuf:"bytes,1,rep,name=f,proto3" json:"f,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` @@ -44,7 +44,7 @@ return xxx_messageInfo_M.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -93,7 +93,7 @@ func (m *M) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -101,41 +101,50 @@ } func (m *M) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *M) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.F) > 0 { for k := range m.F { - dAtA[i] = 0xa - i++ v := m.F[k] - mapSize := 1 + len(k) + sovNopackage(uint64(len(k))) + 1 + 8 - i = encodeVarintNopackage(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintNopackage(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ + baseI := i + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 + i-- + dAtA[i] = 0x11 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintNopackage(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintNopackage(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintNopackage(dAtA []byte, offset int, v uint64) int { + offset -= sovNopackage(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *M) Size() (n int) { if m == nil { @@ -326,6 +335,7 @@ func skipNopackage(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -357,10 +367,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -381,55 +389,30 @@ return 0, ErrInvalidLengthNopackage } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthNopackage - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowNopackage - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipNopackage(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthNopackage - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupNopackage + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthNopackage + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthNopackage = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowNopackage = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthNopackage = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowNopackage = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupNopackage = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/both/one.pb.go golang-gogoprotobuf-1.3.1/test/oneof/combos/both/one.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/both/one.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/both/one.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -31,7 +31,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Subby struct { Sub *string `protobuf:"bytes,1,opt,name=sub" json:"sub,omitempty"` @@ -53,7 +53,7 @@ return xxx_messageInfo_Subby.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -109,7 +109,7 @@ return xxx_messageInfo_AllTypesOneOf.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -134,55 +134,56 @@ VerboseEqual(interface{}) error MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type AllTypesOneOf_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof" json:"Field1,omitempty"` } type AllTypesOneOf_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof" json:"Field2,omitempty"` } type AllTypesOneOf_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof" json:"Field3,omitempty"` } type AllTypesOneOf_Field4 struct { - Field4 int64 `protobuf:"varint,4,opt,name=Field4,oneof"` + Field4 int64 `protobuf:"varint,4,opt,name=Field4,oneof" json:"Field4,omitempty"` } type AllTypesOneOf_Field5 struct { - Field5 uint32 `protobuf:"varint,5,opt,name=Field5,oneof"` + Field5 uint32 `protobuf:"varint,5,opt,name=Field5,oneof" json:"Field5,omitempty"` } type AllTypesOneOf_Field6 struct { - Field6 uint64 `protobuf:"varint,6,opt,name=Field6,oneof"` + Field6 uint64 `protobuf:"varint,6,opt,name=Field6,oneof" json:"Field6,omitempty"` } type AllTypesOneOf_Field7 struct { - Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,oneof"` + Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,oneof" json:"Field7,omitempty"` } type AllTypesOneOf_Field8 struct { - Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,oneof"` + Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,oneof" json:"Field8,omitempty"` } type AllTypesOneOf_Field9 struct { - Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,oneof"` + Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,oneof" json:"Field9,omitempty"` } type AllTypesOneOf_Field10 struct { - Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,oneof"` + Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,oneof" json:"Field10,omitempty"` } type AllTypesOneOf_Field11 struct { - Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,oneof"` + Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,oneof" json:"Field11,omitempty"` } type AllTypesOneOf_Field12 struct { - Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,oneof"` + Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,oneof" json:"Field12,omitempty"` } type AllTypesOneOf_Field13 struct { - Field13 bool `protobuf:"varint,13,opt,name=Field13,oneof"` + Field13 bool `protobuf:"varint,13,opt,name=Field13,oneof" json:"Field13,omitempty"` } type AllTypesOneOf_Field14 struct { - Field14 string `protobuf:"bytes,14,opt,name=Field14,oneof"` + Field14 string `protobuf:"bytes,14,opt,name=Field14,oneof" json:"Field14,omitempty"` } type AllTypesOneOf_Field15 struct { - Field15 []byte `protobuf:"bytes,15,opt,name=Field15,oneof"` + Field15 []byte `protobuf:"bytes,15,opt,name=Field15,oneof" json:"Field15,omitempty"` } type AllTypesOneOf_SubMessage struct { - SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,oneof"` + SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,oneof" json:"sub_message,omitempty"` } func (*AllTypesOneOf_Field1) isAllTypesOneOf_TestOneof() {} @@ -321,9 +322,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*AllTypesOneOf) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _AllTypesOneOf_OneofMarshaler, _AllTypesOneOf_OneofUnmarshaler, _AllTypesOneOf_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*AllTypesOneOf) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*AllTypesOneOf_Field1)(nil), (*AllTypesOneOf_Field2)(nil), (*AllTypesOneOf_Field3)(nil), @@ -343,255 +344,6 @@ } } -func _AllTypesOneOf_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*AllTypesOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *AllTypesOneOf_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *AllTypesOneOf_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *AllTypesOneOf_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case *AllTypesOneOf_Field4: - _ = b.EncodeVarint(4<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field4)) - case *AllTypesOneOf_Field5: - _ = b.EncodeVarint(5<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field5)) - case *AllTypesOneOf_Field6: - _ = b.EncodeVarint(6<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field6)) - case *AllTypesOneOf_Field7: - _ = b.EncodeVarint(7<<3 | proto.WireVarint) - _ = b.EncodeZigzag32(uint64(x.Field7)) - case *AllTypesOneOf_Field8: - _ = b.EncodeVarint(8<<3 | proto.WireVarint) - _ = b.EncodeZigzag64(uint64(x.Field8)) - case *AllTypesOneOf_Field9: - _ = b.EncodeVarint(9<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field9)) - case *AllTypesOneOf_Field10: - _ = b.EncodeVarint(10<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field10)) - case *AllTypesOneOf_Field11: - _ = b.EncodeVarint(11<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field11)) - case *AllTypesOneOf_Field12: - _ = b.EncodeVarint(12<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field12)) - case *AllTypesOneOf_Field13: - t := uint64(0) - if x.Field13 { - t = 1 - } - _ = b.EncodeVarint(13<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *AllTypesOneOf_Field14: - _ = b.EncodeVarint(14<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field14) - case *AllTypesOneOf_Field15: - _ = b.EncodeVarint(15<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field15) - case *AllTypesOneOf_SubMessage: - _ = b.EncodeVarint(16<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("AllTypesOneOf.TestOneof has unexpected type %T", x) - } - return nil -} - -func _AllTypesOneOf_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*AllTypesOneOf) - switch tag { - case 1: // test_oneof.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field1{math.Float64frombits(x)} - return true, err - case 2: // test_oneof.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // test_oneof.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field3{int32(x)} - return true, err - case 4: // test_oneof.Field4 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field4{int64(x)} - return true, err - case 5: // test_oneof.Field5 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field5{uint32(x)} - return true, err - case 6: // test_oneof.Field6 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field6{x} - return true, err - case 7: // test_oneof.Field7 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag32() - m.TestOneof = &AllTypesOneOf_Field7{int32(x)} - return true, err - case 8: // test_oneof.Field8 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag64() - m.TestOneof = &AllTypesOneOf_Field8{int64(x)} - return true, err - case 9: // test_oneof.Field9 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field9{uint32(x)} - return true, err - case 10: // test_oneof.Field10 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field10{int32(x)} - return true, err - case 11: // test_oneof.Field11 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field11{x} - return true, err - case 12: // test_oneof.Field12 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field12{int64(x)} - return true, err - case 13: // test_oneof.Field13 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field13{x != 0} - return true, err - case 14: // test_oneof.Field14 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.TestOneof = &AllTypesOneOf_Field14{x} - return true, err - case 15: // test_oneof.Field15 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.TestOneof = &AllTypesOneOf_Field15{x} - return true, err - case 16: // test_oneof.sub_message - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.TestOneof = &AllTypesOneOf_SubMessage{msg} - return true, err - default: - return false, nil - } -} - -func _AllTypesOneOf_OneofSizer(msg proto.Message) (n int) { - m := msg.(*AllTypesOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *AllTypesOneOf_Field1: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field2: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case *AllTypesOneOf_Field4: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field4)) - case *AllTypesOneOf_Field5: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field5)) - case *AllTypesOneOf_Field6: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field6)) - case *AllTypesOneOf_Field7: - n += 1 // tag and wire - n += proto.SizeVarint(uint64((uint32(x.Field7) << 1) ^ uint32((int32(x.Field7) >> 31)))) - case *AllTypesOneOf_Field8: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(uint64(x.Field8<<1) ^ uint64((int64(x.Field8) >> 63)))) - case *AllTypesOneOf_Field9: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field10: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field11: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field12: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field13: - n += 1 // tag and wire - n += 1 - case *AllTypesOneOf_Field14: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field14))) - n += len(x.Field14) - case *AllTypesOneOf_Field15: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field15))) - n += len(x.Field15) - case *AllTypesOneOf_SubMessage: - s := proto.Size(x.SubMessage) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type TwoOneofs struct { // Types that are valid to be assigned to One: // *TwoOneofs_Field1 @@ -621,7 +373,7 @@ return xxx_messageInfo_TwoOneofs.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -646,6 +398,7 @@ VerboseEqual(interface{}) error MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type isTwoOneofs_Two interface { isTwoOneofs_Two() @@ -653,25 +406,26 @@ VerboseEqual(interface{}) error MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type TwoOneofs_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof" json:"Field1,omitempty"` } type TwoOneofs_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof" json:"Field2,omitempty"` } type TwoOneofs_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof" json:"Field3,omitempty"` } type TwoOneofs_Field34 struct { - Field34 string `protobuf:"bytes,34,opt,name=Field34,oneof"` + Field34 string `protobuf:"bytes,34,opt,name=Field34,oneof" json:"Field34,omitempty"` } type TwoOneofs_Field35 struct { - Field35 []byte `protobuf:"bytes,35,opt,name=Field35,oneof"` + Field35 []byte `protobuf:"bytes,35,opt,name=Field35,oneof" json:"Field35,omitempty"` } type TwoOneofs_SubMessage2 struct { - SubMessage2 *Subby `protobuf:"bytes,36,opt,name=sub_message2,json=subMessage2,oneof"` + SubMessage2 *Subby `protobuf:"bytes,36,opt,name=sub_message2,json=subMessage2,oneof" json:"sub_message2,omitempty"` } func (*TwoOneofs_Field1) isTwoOneofs_One() {} @@ -736,9 +490,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*TwoOneofs) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _TwoOneofs_OneofMarshaler, _TwoOneofs_OneofUnmarshaler, _TwoOneofs_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TwoOneofs) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*TwoOneofs_Field1)(nil), (*TwoOneofs_Field2)(nil), (*TwoOneofs_Field3)(nil), @@ -748,133 +502,6 @@ } } -func _TwoOneofs_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*TwoOneofs) - // one - switch x := m.One.(type) { - case *TwoOneofs_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *TwoOneofs_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *TwoOneofs_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case nil: - default: - return fmt.Errorf("TwoOneofs.One has unexpected type %T", x) - } - // two - switch x := m.Two.(type) { - case *TwoOneofs_Field34: - _ = b.EncodeVarint(34<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field34) - case *TwoOneofs_Field35: - _ = b.EncodeVarint(35<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field35) - case *TwoOneofs_SubMessage2: - _ = b.EncodeVarint(36<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage2); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("TwoOneofs.Two has unexpected type %T", x) - } - return nil -} - -func _TwoOneofs_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*TwoOneofs) - switch tag { - case 1: // one.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.One = &TwoOneofs_Field1{math.Float64frombits(x)} - return true, err - case 2: // one.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.One = &TwoOneofs_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // one.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.One = &TwoOneofs_Field3{int32(x)} - return true, err - case 34: // two.Field34 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Two = &TwoOneofs_Field34{x} - return true, err - case 35: // two.Field35 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.Two = &TwoOneofs_Field35{x} - return true, err - case 36: // two.sub_message2 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.Two = &TwoOneofs_SubMessage2{msg} - return true, err - default: - return false, nil - } -} - -func _TwoOneofs_OneofSizer(msg proto.Message) (n int) { - m := msg.(*TwoOneofs) - // one - switch x := m.One.(type) { - case *TwoOneofs_Field1: - n += 1 // tag and wire - n += 8 - case *TwoOneofs_Field2: - n += 1 // tag and wire - n += 4 - case *TwoOneofs_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - // two - switch x := m.Two.(type) { - case *TwoOneofs_Field34: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field34))) - n += len(x.Field34) - case *TwoOneofs_Field35: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field35))) - n += len(x.Field35) - case *TwoOneofs_SubMessage2: - s := proto.Size(x.SubMessage2) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type CustomOneof struct { // Types that are valid to be assigned to Custom: // *CustomOneof_Stringy @@ -900,7 +527,7 @@ return xxx_messageInfo_CustomOneof.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -925,19 +552,20 @@ VerboseEqual(interface{}) error MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type CustomOneof_Stringy struct { - Stringy string `protobuf:"bytes,34,opt,name=Stringy,oneof"` + Stringy string `protobuf:"bytes,34,opt,name=Stringy,oneof" json:"Stringy,omitempty"` } type CustomOneof_CustomType struct { - CustomType github_com_gogo_protobuf_test_custom.Uint128 `protobuf:"bytes,35,opt,name=CustomType,oneof,customtype=github.com/gogo/protobuf/test/custom.Uint128"` + CustomType github_com_gogo_protobuf_test_custom.Uint128 `protobuf:"bytes,35,opt,name=CustomType,oneof,customtype=github.com/gogo/protobuf/test/custom.Uint128" json:"CustomType,omitempty"` } type CustomOneof_CastType struct { - CastType github_com_gogo_protobuf_test_casttype.MyUint64Type `protobuf:"varint,36,opt,name=CastType,oneof,casttype=github.com/gogo/protobuf/test/casttype.MyUint64Type"` + CastType github_com_gogo_protobuf_test_casttype.MyUint64Type `protobuf:"varint,36,opt,name=CastType,oneof,casttype=github.com/gogo/protobuf/test/casttype.MyUint64Type" json:"CastType,omitempty"` } type CustomOneof_MyCustomName struct { - MyCustomName int64 `protobuf:"varint,37,opt,name=CustomName,oneof"` + MyCustomName int64 `protobuf:"varint,37,opt,name=CustomName,oneof" json:"CustomName,omitempty"` } func (*CustomOneof_Stringy) isCustomOneof_Custom() {} @@ -970,164 +598,1257 @@ if x, ok := m.GetCustom().(*CustomOneof_MyCustomName); ok { return x.MyCustomName } - return 0 -} - -// XXX_OneofFuncs is for the internal use of the proto package. -func (*CustomOneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _CustomOneof_OneofMarshaler, _CustomOneof_OneofUnmarshaler, _CustomOneof_OneofSizer, []interface{}{ - (*CustomOneof_Stringy)(nil), - (*CustomOneof_CustomType)(nil), - (*CustomOneof_CastType)(nil), - (*CustomOneof_MyCustomName)(nil), + return 0 +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*CustomOneof) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*CustomOneof_Stringy)(nil), + (*CustomOneof_CustomType)(nil), + (*CustomOneof_CastType)(nil), + (*CustomOneof_MyCustomName)(nil), + } +} + +func init() { + proto.RegisterType((*Subby)(nil), "one.Subby") + proto.RegisterType((*AllTypesOneOf)(nil), "one.AllTypesOneOf") + proto.RegisterType((*TwoOneofs)(nil), "one.TwoOneofs") + proto.RegisterType((*CustomOneof)(nil), "one.CustomOneof") +} + +func init() { proto.RegisterFile("combos/both/one.proto", fileDescriptor_5ca5df6bbfd2f47d) } + +var fileDescriptor_5ca5df6bbfd2f47d = []byte{ + // 600 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0xd3, 0xbf, 0x4f, 0xdb, 0x4e, + 0x14, 0x00, 0x70, 0x3f, 0x42, 0x42, 0xb8, 0x84, 0x2f, 0xf9, 0x5a, 0xaa, 0x74, 0x65, 0x38, 0x4e, + 0x69, 0x2b, 0xdd, 0x50, 0x12, 0xe2, 0xd8, 0xfc, 0x18, 0x6b, 0xa4, 0x2a, 0x0b, 0x45, 0x32, 0x30, + 0xa3, 0x98, 0x9a, 0x10, 0x89, 0xf8, 0x10, 0x77, 0x16, 0xf2, 0xc6, 0xdf, 0xd0, 0xbf, 0x82, 0xb1, + 0x63, 0xff, 0x04, 0xc6, 0x8c, 0x55, 0x87, 0x08, 0x9b, 0xa5, 0x23, 0x23, 0xea, 0x54, 0x9d, 0x4d, + 0xee, 0x2a, 0x55, 0x55, 0x97, 0x4e, 0xf1, 0x7b, 0x1f, 0xdf, 0xcb, 0x7b, 0xbe, 0x3b, 0xf4, 0xe2, + 0x94, 0x4f, 0x42, 0x2e, 0xba, 0x21, 0x97, 0xe7, 0x5d, 0x1e, 0x47, 0x9d, 0xcb, 0x2b, 0x2e, 0xb9, + 0x5d, 0xe1, 0x71, 0xb4, 0xb6, 0x31, 0x1a, 0xcb, 0xf3, 0x24, 0xec, 0x9c, 0xf2, 0x49, 0x77, 0xc4, + 0x47, 0xbc, 0x5b, 0x58, 0x98, 0x9c, 0x15, 0x51, 0x11, 0x14, 0x4f, 0xe5, 0x9a, 0xf6, 0x4b, 0x54, + 0x3d, 0x4c, 0xc2, 0x30, 0xb5, 0x5b, 0xa8, 0x22, 0x92, 0x10, 0x03, 0x05, 0xb6, 0x1c, 0xa8, 0xc7, + 0xf6, 0xac, 0x82, 0x56, 0xde, 0x5d, 0x5c, 0x1c, 0xa5, 0x97, 0x91, 0x38, 0x88, 0xa3, 0x83, 0x33, + 0x1b, 0xa3, 0xda, 0xfb, 0x71, 0x74, 0xf1, 0xb1, 0x57, 0xbc, 0x06, 0x03, 0x2b, 0x78, 0x8e, 0xb5, + 0x38, 0x78, 0x81, 0x02, 0x5b, 0xd0, 0xe2, 0x68, 0xe9, 0xe3, 0x0a, 0x05, 0x56, 0xd5, 0xd2, 0xd7, + 0xe2, 0xe2, 0x45, 0x0a, 0xac, 0xa2, 0xc5, 0xd5, 0xe2, 0xe1, 0x2a, 0x05, 0xb6, 0xa2, 0xc5, 0xd3, + 0xb2, 0x85, 0x6b, 0x14, 0xd8, 0xa2, 0x96, 0x2d, 0x2d, 0xdb, 0x78, 0x89, 0x02, 0xfb, 0x5f, 0xcb, + 0xb6, 0x96, 0x1d, 0x5c, 0xa7, 0xc0, 0x6c, 0x2d, 0x3b, 0x5a, 0x76, 0xf1, 0x32, 0x05, 0xb6, 0xa4, + 0x65, 0xd7, 0x5e, 0x43, 0x4b, 0xe5, 0x64, 0x9b, 0x18, 0x51, 0x60, 0xab, 0x03, 0x2b, 0x98, 0x27, + 0x8c, 0xf5, 0x70, 0x83, 0x02, 0xab, 0x19, 0xeb, 0x19, 0x73, 0x70, 0x93, 0x02, 0x6b, 0x19, 0x73, + 0x8c, 0xf5, 0xf1, 0x0a, 0x05, 0x56, 0x37, 0xd6, 0x37, 0xe6, 0xe2, 0xff, 0xd4, 0x0e, 0x18, 0x73, + 0x8d, 0x79, 0x78, 0x95, 0x02, 0x6b, 0x1a, 0xf3, 0xec, 0x0d, 0xd4, 0x10, 0x49, 0x78, 0x32, 0x89, + 0x84, 0x18, 0x8e, 0x22, 0xdc, 0xa2, 0xc0, 0x1a, 0x0e, 0xea, 0xa8, 0x33, 0x51, 0x6c, 0xeb, 0xc0, + 0x0a, 0x90, 0x48, 0xc2, 0xfd, 0xd2, 0xfd, 0x26, 0x42, 0x32, 0x12, 0xf2, 0x84, 0xc7, 0x11, 0x3f, + 0x6b, 0x4f, 0x01, 0x2d, 0x1f, 0x5d, 0xf3, 0x03, 0x15, 0x88, 0x7f, 0xbc, 0xb9, 0xf3, 0xa6, 0xfb, + 0x2e, 0x6e, 0x17, 0x03, 0x41, 0x30, 0x4f, 0x18, 0xf3, 0xf0, 0xab, 0x62, 0x20, 0x6d, 0x9e, 0xdd, + 0x45, 0xcd, 0x5f, 0x06, 0x72, 0xf0, 0xeb, 0xdf, 0x26, 0x82, 0xa0, 0x61, 0x26, 0x72, 0xfc, 0x2a, + 0x52, 0xc7, 0x5e, 0xfd, 0xc8, 0x6b, 0xde, 0xfe, 0xb4, 0x80, 0x1a, 0x7b, 0x89, 0x90, 0x7c, 0x52, + 0x4c, 0xa5, 0xfe, 0xea, 0x50, 0x5e, 0x8d, 0xe3, 0x51, 0xfa, 0xdc, 0x86, 0x15, 0xcc, 0x13, 0x76, + 0x80, 0x50, 0xf9, 0xaa, 0x3a, 0xe1, 0x65, 0x27, 0xfe, 0xe6, 0xb7, 0xd9, 0xfa, 0xdb, 0x3f, 0xde, + 0x20, 0xf5, 0xed, 0xba, 0xa7, 0xc5, 0x9a, 0xce, 0xf1, 0x38, 0x96, 0x3d, 0x67, 0x47, 0x7d, 0x60, + 0x53, 0xc5, 0x3e, 0x46, 0xf5, 0xbd, 0xa1, 0x90, 0x45, 0x45, 0xd5, 0xfa, 0xa2, 0xbf, 0xfd, 0x63, + 0xb6, 0xde, 0xff, 0x4b, 0xc5, 0xa1, 0x90, 0x32, 0xbd, 0x8c, 0x3a, 0xfb, 0xa9, 0xaa, 0xba, 0xe5, + 0xaa, 0xe5, 0x03, 0x2b, 0xd0, 0xa5, 0x6c, 0x67, 0xde, 0xea, 0x87, 0xe1, 0x24, 0xc2, 0x6f, 0xd4, + 0x75, 0xf1, 0x5b, 0xf9, 0x6c, 0xbd, 0xb9, 0x9f, 0x9a, 0xbc, 0x69, 0x45, 0x45, 0x7e, 0x1d, 0xd5, + 0xca, 0x56, 0xfd, 0xc1, 0x5d, 0x46, 0xac, 0x69, 0x46, 0xac, 0xaf, 0x19, 0xb1, 0xee, 0x33, 0x02, + 0x8f, 0x19, 0x81, 0xa7, 0x8c, 0xc0, 0x4d, 0x4e, 0xe0, 0x36, 0x27, 0xf0, 0x39, 0x27, 0xf0, 0x25, + 0x27, 0x70, 0x97, 0x13, 0x98, 0xe6, 0x04, 0xee, 0x73, 0x02, 0xdf, 0x73, 0x62, 0x3d, 0xe6, 0x04, + 0x9e, 0x72, 0x62, 0xdd, 0x3c, 0x10, 0xeb, 0xf6, 0x81, 0xc0, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x65, 0x14, 0xd5, 0x6f, 0x79, 0x04, 0x00, 0x00, +} + +func (this *Subby) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Subby) + if !ok { + that2, ok := that.(Subby) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Sub != nil && that1.Sub != nil { + if *this.Sub != *that1.Sub { + if *this.Sub < *that1.Sub { + return -1 + } + return 1 + } + } else if this.Sub != nil { + return 1 + } else if that1.Sub != nil { + return -1 + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf) + if !ok { + that2, ok := that.(AllTypesOneOf) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.TestOneof == nil { + if this.TestOneof != nil { + return 1 + } + } else if this.TestOneof == nil { + return -1 + } else { + thisType := -1 + switch this.TestOneof.(type) { + case *AllTypesOneOf_Field1: + thisType = 0 + case *AllTypesOneOf_Field2: + thisType = 1 + case *AllTypesOneOf_Field3: + thisType = 2 + case *AllTypesOneOf_Field4: + thisType = 3 + case *AllTypesOneOf_Field5: + thisType = 4 + case *AllTypesOneOf_Field6: + thisType = 5 + case *AllTypesOneOf_Field7: + thisType = 6 + case *AllTypesOneOf_Field8: + thisType = 7 + case *AllTypesOneOf_Field9: + thisType = 8 + case *AllTypesOneOf_Field10: + thisType = 9 + case *AllTypesOneOf_Field11: + thisType = 10 + case *AllTypesOneOf_Field12: + thisType = 11 + case *AllTypesOneOf_Field13: + thisType = 12 + case *AllTypesOneOf_Field14: + thisType = 13 + case *AllTypesOneOf_Field15: + thisType = 14 + case *AllTypesOneOf_SubMessage: + thisType = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.TestOneof)) + } + that1Type := -1 + switch that1.TestOneof.(type) { + case *AllTypesOneOf_Field1: + that1Type = 0 + case *AllTypesOneOf_Field2: + that1Type = 1 + case *AllTypesOneOf_Field3: + that1Type = 2 + case *AllTypesOneOf_Field4: + that1Type = 3 + case *AllTypesOneOf_Field5: + that1Type = 4 + case *AllTypesOneOf_Field6: + that1Type = 5 + case *AllTypesOneOf_Field7: + that1Type = 6 + case *AllTypesOneOf_Field8: + that1Type = 7 + case *AllTypesOneOf_Field9: + that1Type = 8 + case *AllTypesOneOf_Field10: + that1Type = 9 + case *AllTypesOneOf_Field11: + that1Type = 10 + case *AllTypesOneOf_Field12: + that1Type = 11 + case *AllTypesOneOf_Field13: + that1Type = 12 + case *AllTypesOneOf_Field14: + that1Type = 13 + case *AllTypesOneOf_Field15: + that1Type = 14 + case *AllTypesOneOf_SubMessage: + that1Type = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.TestOneof)) + } + if thisType == that1Type { + if c := this.TestOneof.Compare(that1.TestOneof); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field1) + if !ok { + that2, ok := that.(AllTypesOneOf_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field2) + if !ok { + that2, ok := that.(AllTypesOneOf_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field3) + if !ok { + that2, ok := that.(AllTypesOneOf_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field4) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field4) + if !ok { + that2, ok := that.(AllTypesOneOf_Field4) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field4 != that1.Field4 { + if this.Field4 < that1.Field4 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field5) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field5) + if !ok { + that2, ok := that.(AllTypesOneOf_Field5) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field5 != that1.Field5 { + if this.Field5 < that1.Field5 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field6) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field6) + if !ok { + that2, ok := that.(AllTypesOneOf_Field6) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field6 != that1.Field6 { + if this.Field6 < that1.Field6 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field7) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field7) + if !ok { + that2, ok := that.(AllTypesOneOf_Field7) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field7 != that1.Field7 { + if this.Field7 < that1.Field7 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field8) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field8) + if !ok { + that2, ok := that.(AllTypesOneOf_Field8) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field8 != that1.Field8 { + if this.Field8 < that1.Field8 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field9) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field9) + if !ok { + that2, ok := that.(AllTypesOneOf_Field9) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field9 != that1.Field9 { + if this.Field9 < that1.Field9 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field10) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field10) + if !ok { + that2, ok := that.(AllTypesOneOf_Field10) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field10 != that1.Field10 { + if this.Field10 < that1.Field10 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field11) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field11) + if !ok { + that2, ok := that.(AllTypesOneOf_Field11) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field11 != that1.Field11 { + if this.Field11 < that1.Field11 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field12) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field12) + if !ok { + that2, ok := that.(AllTypesOneOf_Field12) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field12 != that1.Field12 { + if this.Field12 < that1.Field12 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field13) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field13) + if !ok { + that2, ok := that.(AllTypesOneOf_Field13) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field13 != that1.Field13 { + if !this.Field13 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field14) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field14) + if !ok { + that2, ok := that.(AllTypesOneOf_Field14) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field14 != that1.Field14 { + if this.Field14 < that1.Field14 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field15) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field15) + if !ok { + that2, ok := that.(AllTypesOneOf_Field15) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field15, that1.Field15); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf_SubMessage) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_SubMessage) + if !ok { + that2, ok := that.(AllTypesOneOf_SubMessage) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage.Compare(that1.SubMessage); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs) + if !ok { + that2, ok := that.(TwoOneofs) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.One == nil { + if this.One != nil { + return 1 + } + } else if this.One == nil { + return -1 + } else { + thisType := -1 + switch this.One.(type) { + case *TwoOneofs_Field1: + thisType = 0 + case *TwoOneofs_Field2: + thisType = 1 + case *TwoOneofs_Field3: + thisType = 2 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.One)) + } + that1Type := -1 + switch that1.One.(type) { + case *TwoOneofs_Field1: + that1Type = 0 + case *TwoOneofs_Field2: + that1Type = 1 + case *TwoOneofs_Field3: + that1Type = 2 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.One)) + } + if thisType == that1Type { + if c := this.One.Compare(that1.One); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if that1.Two == nil { + if this.Two != nil { + return 1 + } + } else if this.Two == nil { + return -1 + } else { + thisType := -1 + switch this.Two.(type) { + case *TwoOneofs_Field34: + thisType = 3 + case *TwoOneofs_Field35: + thisType = 4 + case *TwoOneofs_SubMessage2: + thisType = 5 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Two)) + } + that1Type := -1 + switch that1.Two.(type) { + case *TwoOneofs_Field34: + that1Type = 3 + case *TwoOneofs_Field35: + that1Type = 4 + case *TwoOneofs_SubMessage2: + that1Type = 5 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Two)) + } + if thisType == that1Type { + if c := this.Two.Compare(that1.Two); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field1) + if !ok { + that2, ok := that.(TwoOneofs_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field2) + if !ok { + that2, ok := that.(TwoOneofs_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field3) + if !ok { + that2, ok := that.(TwoOneofs_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field34) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field34) + if !ok { + that2, ok := that.(TwoOneofs_Field34) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field34 != that1.Field34 { + if this.Field34 < that1.Field34 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field35) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field35) + if !ok { + that2, ok := that.(TwoOneofs_Field35) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field35, that1.Field35); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs_SubMessage2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_SubMessage2) + if !ok { + that2, ok := that.(TwoOneofs_SubMessage2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage2.Compare(that1.SubMessage2); c != 0 { + return c + } + return 0 +} +func (this *CustomOneof) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof) + if !ok { + that2, ok := that.(CustomOneof) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.Custom == nil { + if this.Custom != nil { + return 1 + } + } else if this.Custom == nil { + return -1 + } else { + thisType := -1 + switch this.Custom.(type) { + case *CustomOneof_Stringy: + thisType = 0 + case *CustomOneof_CustomType: + thisType = 1 + case *CustomOneof_CastType: + thisType = 2 + case *CustomOneof_MyCustomName: + thisType = 3 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Custom)) + } + that1Type := -1 + switch that1.Custom.(type) { + case *CustomOneof_Stringy: + that1Type = 0 + case *CustomOneof_CustomType: + that1Type = 1 + case *CustomOneof_CastType: + that1Type = 2 + case *CustomOneof_MyCustomName: + that1Type = 3 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Custom)) + } + if thisType == that1Type { + if c := this.Custom.Compare(that1.Custom); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *CustomOneof_Stringy) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof_Stringy) + if !ok { + that2, ok := that.(CustomOneof_Stringy) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Stringy != that1.Stringy { + if this.Stringy < that1.Stringy { + return -1 + } + return 1 + } + return 0 +} +func (this *CustomOneof_CustomType) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof_CustomType) + if !ok { + that2, ok := that.(CustomOneof_CustomType) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.CustomType.Compare(that1.CustomType); c != 0 { + return c + } + return 0 +} +func (this *CustomOneof_CastType) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof_CastType) + if !ok { + that2, ok := that.(CustomOneof_CastType) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.CastType != that1.CastType { + if this.CastType < that1.CastType { + return -1 + } + return 1 } + return 0 } - -func _CustomOneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*CustomOneof) - // custom - switch x := m.Custom.(type) { - case *CustomOneof_Stringy: - _ = b.EncodeVarint(34<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Stringy) - case *CustomOneof_CustomType: - _ = b.EncodeVarint(35<<3 | proto.WireBytes) - dAtA, err := x.CustomType.Marshal() - if err != nil { - return err +func (this *CustomOneof_MyCustomName) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 } - _ = b.EncodeRawBytes(dAtA) - case *CustomOneof_CastType: - _ = b.EncodeVarint(36<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.CastType)) - case *CustomOneof_MyCustomName: - _ = b.EncodeVarint(37<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.MyCustomName)) - case nil: - default: - return fmt.Errorf("CustomOneof.Custom has unexpected type %T", x) + return 1 } - return nil -} -func _CustomOneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*CustomOneof) - switch tag { - case 34: // custom.Stringy - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Custom = &CustomOneof_Stringy{x} - return true, err - case 35: // custom.CustomType - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType + that1, ok := that.(*CustomOneof_MyCustomName) + if !ok { + that2, ok := that.(CustomOneof_MyCustomName) + if ok { + that1 = &that2 + } else { + return 1 } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err + } + if that1 == nil { + if this == nil { + return 0 } - var cc github_com_gogo_protobuf_test_custom.Uint128 - c := &cc - err = c.Unmarshal(x) - m.Custom = &CustomOneof_CustomType{*c} - return true, err - case 36: // custom.CastType - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Custom = &CustomOneof_CastType{github_com_gogo_protobuf_test_casttype.MyUint64Type(x)} - return true, err - case 37: // custom.CustomName - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Custom = &CustomOneof_MyCustomName{int64(x)} - return true, err - default: - return false, nil + return 1 + } else if this == nil { + return -1 } -} - -func _CustomOneof_OneofSizer(msg proto.Message) (n int) { - m := msg.(*CustomOneof) - // custom - switch x := m.Custom.(type) { - case *CustomOneof_Stringy: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Stringy))) - n += len(x.Stringy) - case *CustomOneof_CustomType: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.CustomType.Size())) - n += x.CustomType.Size() - case *CustomOneof_CastType: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.CastType)) - case *CustomOneof_MyCustomName: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.MyCustomName)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + if this.MyCustomName != that1.MyCustomName { + if this.MyCustomName < that1.MyCustomName { + return -1 + } + return 1 } - return n -} - -func init() { - proto.RegisterType((*Subby)(nil), "one.Subby") - proto.RegisterType((*AllTypesOneOf)(nil), "one.AllTypesOneOf") - proto.RegisterType((*TwoOneofs)(nil), "one.TwoOneofs") - proto.RegisterType((*CustomOneof)(nil), "one.CustomOneof") -} - -func init() { proto.RegisterFile("combos/both/one.proto", fileDescriptor_5ca5df6bbfd2f47d) } - -var fileDescriptor_5ca5df6bbfd2f47d = []byte{ - // 596 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0xd3, 0x3f, 0x4f, 0xdb, 0x40, - 0x14, 0x00, 0x70, 0x3f, 0x42, 0x42, 0xb8, 0x84, 0x92, 0x5a, 0xaa, 0x74, 0x65, 0x38, 0x4e, 0x69, - 0x2b, 0xdd, 0x50, 0x12, 0xe2, 0xd8, 0xfc, 0x19, 0x6b, 0xaa, 0x2a, 0x0b, 0x45, 0x32, 0x30, 0xa3, - 0x98, 0x9a, 0x10, 0x89, 0xf8, 0x10, 0x77, 0x16, 0xf2, 0xc6, 0x67, 0xe8, 0xa7, 0xe8, 0xd8, 0xb1, - 0x1f, 0x81, 0x31, 0x63, 0xd5, 0x21, 0xc2, 0xee, 0xd2, 0x91, 0x11, 0x75, 0xaa, 0xce, 0x26, 0x77, - 0x95, 0xaa, 0xaa, 0x4b, 0xa7, 0xf8, 0xbd, 0x9f, 0xef, 0xe5, 0x3d, 0xdf, 0x1d, 0x7a, 0x76, 0xca, - 0x27, 0x21, 0x17, 0xdd, 0x90, 0xcb, 0xf3, 0x2e, 0x8f, 0xa3, 0xce, 0xe5, 0x15, 0x97, 0xdc, 0xae, - 0xf0, 0x38, 0x5a, 0xdb, 0x18, 0x8d, 0xe5, 0x79, 0x12, 0x76, 0x4e, 0xf9, 0xa4, 0x3b, 0xe2, 0x23, - 0xde, 0x2d, 0x2c, 0x4c, 0xce, 0x8a, 0xa8, 0x08, 0x8a, 0xa7, 0x72, 0x4d, 0xfb, 0x39, 0xaa, 0x1e, - 0x26, 0x61, 0x98, 0xda, 0x2d, 0x54, 0x11, 0x49, 0x88, 0x81, 0x02, 0x5b, 0x0e, 0xd4, 0x63, 0x7b, - 0x56, 0x41, 0x2b, 0x6f, 0x2e, 0x2e, 0x8e, 0xd2, 0xcb, 0x48, 0x1c, 0xc4, 0xd1, 0xc1, 0x99, 0x8d, - 0x51, 0xed, 0xdd, 0x38, 0xba, 0xf8, 0xd0, 0x2b, 0x5e, 0x83, 0x81, 0x15, 0x3c, 0xc6, 0x5a, 0x1c, - 0xbc, 0x40, 0x81, 0x2d, 0x68, 0x71, 0xb4, 0xf4, 0x71, 0x85, 0x02, 0xab, 0x6a, 0xe9, 0x6b, 0x71, - 0xf1, 0x22, 0x05, 0x56, 0xd1, 0xe2, 0x6a, 0xf1, 0x70, 0x95, 0x02, 0x5b, 0xd1, 0xe2, 0x69, 0xd9, - 0xc2, 0x35, 0x0a, 0x6c, 0x51, 0xcb, 0x96, 0x96, 0x6d, 0xbc, 0x44, 0x81, 0x3d, 0xd5, 0xb2, 0xad, - 0x65, 0x07, 0xd7, 0x29, 0x30, 0x5b, 0xcb, 0x8e, 0x96, 0x5d, 0xbc, 0x4c, 0x81, 0x2d, 0x69, 0xd9, - 0xb5, 0xd7, 0xd0, 0x52, 0x39, 0xd9, 0x26, 0x46, 0x14, 0xd8, 0xea, 0xc0, 0x0a, 0xe6, 0x09, 0x63, - 0x3d, 0xdc, 0xa0, 0xc0, 0x6a, 0xc6, 0x7a, 0xc6, 0x1c, 0xdc, 0xa4, 0xc0, 0x5a, 0xc6, 0x1c, 0x63, - 0x7d, 0xbc, 0x42, 0x81, 0xd5, 0x8d, 0xf5, 0x8d, 0xb9, 0xf8, 0x89, 0xda, 0x01, 0x63, 0xae, 0x31, - 0x0f, 0xaf, 0x52, 0x60, 0x4d, 0x63, 0x9e, 0xbd, 0x81, 0x1a, 0x22, 0x09, 0x4f, 0x26, 0x91, 0x10, - 0xc3, 0x51, 0x84, 0x5b, 0x14, 0x58, 0xc3, 0x41, 0x1d, 0x75, 0x26, 0x8a, 0x6d, 0x1d, 0x58, 0x01, - 0x12, 0x49, 0xb8, 0x5f, 0xba, 0xdf, 0x44, 0x48, 0x46, 0x42, 0x9e, 0xf0, 0x38, 0xe2, 0x67, 0xed, - 0x29, 0xa0, 0xe5, 0xa3, 0x6b, 0x7e, 0xa0, 0x02, 0xf1, 0x9f, 0x37, 0x77, 0xde, 0x74, 0xdf, 0xc5, - 0xed, 0x62, 0x20, 0x08, 0xe6, 0x09, 0x63, 0x1e, 0x7e, 0x51, 0x0c, 0xa4, 0xcd, 0xb3, 0xbb, 0xa8, - 0xf9, 0xdb, 0x40, 0x0e, 0x7e, 0xf9, 0xc7, 0x44, 0x10, 0x34, 0xcc, 0x44, 0x8e, 0x5f, 0x45, 0xea, - 0xd8, 0xab, 0x1f, 0x79, 0xcd, 0xdb, 0x1f, 0x17, 0x50, 0x63, 0x2f, 0x11, 0x92, 0x4f, 0x8a, 0xa9, - 0xd4, 0x5f, 0x1d, 0xca, 0xab, 0x71, 0x3c, 0x4a, 0x1f, 0xdb, 0xb0, 0x82, 0x79, 0xc2, 0x0e, 0x10, - 0x2a, 0x5f, 0x55, 0x27, 0xbc, 0xec, 0xc4, 0xdf, 0xfc, 0x36, 0x5b, 0x7f, 0xfd, 0xd7, 0x1b, 0xa4, - 0xbe, 0x5d, 0xf7, 0xb4, 0x58, 0xd3, 0x39, 0x1e, 0xc7, 0xb2, 0xe7, 0xec, 0xa8, 0x0f, 0x6c, 0xaa, - 0xd8, 0xc7, 0xa8, 0xbe, 0x37, 0x14, 0xb2, 0xa8, 0xa8, 0x5a, 0x5f, 0xf4, 0xb7, 0x7f, 0xce, 0xd6, - 0xfb, 0xff, 0xa8, 0x38, 0x14, 0x52, 0xa6, 0x97, 0x51, 0x67, 0x3f, 0x55, 0x55, 0xb7, 0x5c, 0xb5, - 0x7c, 0x60, 0x05, 0xba, 0x94, 0xed, 0xcc, 0x5b, 0x7d, 0x3f, 0x9c, 0x44, 0xf8, 0x95, 0xba, 0x2e, - 0x7e, 0x2b, 0x9f, 0xad, 0x37, 0xf7, 0x53, 0x93, 0x37, 0xad, 0xa8, 0xc8, 0xaf, 0xa3, 0x5a, 0xd9, - 0xaa, 0xff, 0xf6, 0x36, 0x23, 0xd6, 0x34, 0x23, 0xd6, 0xd7, 0x8c, 0x58, 0x77, 0x19, 0x81, 0xfb, - 0x8c, 0xc0, 0x43, 0x46, 0xe0, 0x26, 0x27, 0xf0, 0x29, 0x27, 0xf0, 0x39, 0x27, 0xf0, 0x25, 0x27, - 0x70, 0x9b, 0x13, 0x98, 0xe6, 0x04, 0xee, 0x72, 0x02, 0x3f, 0x72, 0x62, 0xdd, 0xe7, 0x04, 0x1e, - 0x72, 0x62, 0xdd, 0x7c, 0x27, 0xd6, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x65, 0xb5, 0xca, - 0x75, 0x04, 0x00, 0x00, + return 0 } - func (this *Subby) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { return OneDescription() } @@ -1143,276 +1864,276 @@ func OneDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 4296 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x6b, 0x70, 0x1b, 0xd7, - 0x75, 0xe6, 0xe2, 0x41, 0x02, 0x07, 0x20, 0xb8, 0x5c, 0x52, 0x12, 0x44, 0xc7, 0x90, 0x04, 0xdb, - 0x31, 0xfd, 0x22, 0x6d, 0x8a, 0xa4, 0x24, 0xa8, 0x89, 0x0b, 0x92, 0x10, 0x45, 0x97, 0x24, 0x98, - 0x05, 0x19, 0x3f, 0x32, 0x9d, 0x9d, 0xc5, 0xe2, 0x12, 0x5c, 0x69, 0xb1, 0xbb, 0xd9, 0x5d, 0x48, - 0x86, 0xa6, 0x3f, 0xd4, 0x71, 0x1f, 0x93, 0xe9, 0x3b, 0xed, 0x4c, 0x13, 0xd7, 0x71, 0x9b, 0x74, - 0x1a, 0xa7, 0xe9, 0x2b, 0xe9, 0x23, 0x4d, 0xd2, 0x3f, 0xfd, 0x93, 0xd6, 0xbf, 0x3a, 0xce, 0xbf, - 0x4e, 0xa7, 0xe3, 0xb1, 0x18, 0xcf, 0x34, 0x6d, 0xdd, 0xd6, 0x6d, 0xd5, 0x19, 0x4f, 0xfd, 0xa7, - 0x73, 0x5f, 0xbb, 0x8b, 0x07, 0xb5, 0x60, 0xa6, 0xb6, 0x7f, 0x89, 0x7b, 0xce, 0xf9, 0xbe, 0x3d, - 0xf7, 0xdc, 0x73, 0xcf, 0x3d, 0xf7, 0x2e, 0x04, 0xaf, 0x97, 0xe0, 0x6c, 0xd3, 0xb2, 0x9a, 0x06, - 0x9a, 0xb7, 0x1d, 0xcb, 0xb3, 0xea, 0xed, 0xfd, 0xf9, 0x06, 0x72, 0x35, 0x47, 0xb7, 0x3d, 0xcb, - 0x99, 0x23, 0x32, 0x69, 0x82, 0x5a, 0xcc, 0x71, 0x8b, 0xe2, 0x16, 0x4c, 0x5e, 0xd1, 0x0d, 0xb4, - 0xe6, 0x1b, 0xd6, 0x90, 0x27, 0x5d, 0x84, 0xc4, 0xbe, 0x6e, 0xa0, 0xbc, 0x70, 0x36, 0x3e, 0x9b, - 0x59, 0x78, 0x70, 0xae, 0x07, 0x34, 0xd7, 0x8d, 0xd8, 0xc1, 0x62, 0x99, 0x20, 0x8a, 0x6f, 0x27, - 0x60, 0x6a, 0x80, 0x56, 0x92, 0x20, 0x61, 0xaa, 0x2d, 0xcc, 0x28, 0xcc, 0xa6, 0x65, 0xf2, 0xb7, - 0x94, 0x87, 0x31, 0x5b, 0xd5, 0xae, 0xab, 0x4d, 0x94, 0x8f, 0x11, 0x31, 0x7f, 0x94, 0x0a, 0x00, - 0x0d, 0x64, 0x23, 0xb3, 0x81, 0x4c, 0xad, 0x93, 0x8f, 0x9f, 0x8d, 0xcf, 0xa6, 0xe5, 0x90, 0x44, - 0x7a, 0x0c, 0x26, 0xed, 0x76, 0xdd, 0xd0, 0x35, 0x25, 0x64, 0x06, 0x67, 0xe3, 0xb3, 0x49, 0x59, - 0xa4, 0x8a, 0xb5, 0xc0, 0xf8, 0x61, 0x98, 0xb8, 0x89, 0xd4, 0xeb, 0x61, 0xd3, 0x0c, 0x31, 0xcd, - 0x61, 0x71, 0xc8, 0x70, 0x15, 0xb2, 0x2d, 0xe4, 0xba, 0x6a, 0x13, 0x29, 0x5e, 0xc7, 0x46, 0xf9, - 0x04, 0x19, 0xfd, 0xd9, 0xbe, 0xd1, 0xf7, 0x8e, 0x3c, 0xc3, 0x50, 0xbb, 0x1d, 0x1b, 0x49, 0x65, - 0x48, 0x23, 0xb3, 0xdd, 0xa2, 0x0c, 0xc9, 0x23, 0xe2, 0x57, 0x31, 0xdb, 0xad, 0x5e, 0x96, 0x14, - 0x86, 0x31, 0x8a, 0x31, 0x17, 0x39, 0x37, 0x74, 0x0d, 0xe5, 0x47, 0x09, 0xc1, 0xc3, 0x7d, 0x04, - 0x35, 0xaa, 0xef, 0xe5, 0xe0, 0x38, 0x69, 0x15, 0xd2, 0xe8, 0x45, 0x0f, 0x99, 0xae, 0x6e, 0x99, - 0xf9, 0x31, 0x42, 0xf2, 0xd0, 0x80, 0x59, 0x44, 0x46, 0xa3, 0x97, 0x22, 0xc0, 0x49, 0xcb, 0x30, - 0x66, 0xd9, 0x9e, 0x6e, 0x99, 0x6e, 0x3e, 0x75, 0x56, 0x98, 0xcd, 0x2c, 0x7c, 0x6c, 0x60, 0x22, - 0x54, 0xa9, 0x8d, 0xcc, 0x8d, 0xa5, 0x0d, 0x10, 0x5d, 0xab, 0xed, 0x68, 0x48, 0xd1, 0xac, 0x06, - 0x52, 0x74, 0x73, 0xdf, 0xca, 0xa7, 0x09, 0xc1, 0x99, 0xfe, 0x81, 0x10, 0xc3, 0x55, 0xab, 0x81, - 0x36, 0xcc, 0x7d, 0x4b, 0xce, 0xb9, 0x5d, 0xcf, 0xd2, 0x49, 0x18, 0x75, 0x3b, 0xa6, 0xa7, 0xbe, - 0x98, 0xcf, 0x92, 0x0c, 0x61, 0x4f, 0xc5, 0xef, 0x8c, 0xc2, 0xc4, 0x30, 0x29, 0x76, 0x19, 0x92, - 0xfb, 0x78, 0x94, 0xf9, 0xd8, 0x71, 0x62, 0x40, 0x31, 0xdd, 0x41, 0x1c, 0xfd, 0x11, 0x83, 0x58, - 0x86, 0x8c, 0x89, 0x5c, 0x0f, 0x35, 0x68, 0x46, 0xc4, 0x87, 0xcc, 0x29, 0xa0, 0xa0, 0xfe, 0x94, - 0x4a, 0xfc, 0x48, 0x29, 0xf5, 0x1c, 0x4c, 0xf8, 0x2e, 0x29, 0x8e, 0x6a, 0x36, 0x79, 0x6e, 0xce, - 0x47, 0x79, 0x32, 0x57, 0xe1, 0x38, 0x19, 0xc3, 0xe4, 0x1c, 0xea, 0x7a, 0x96, 0xd6, 0x00, 0x2c, - 0x13, 0x59, 0xfb, 0x4a, 0x03, 0x69, 0x46, 0x3e, 0x75, 0x44, 0x94, 0xaa, 0xd8, 0xa4, 0x2f, 0x4a, - 0x16, 0x95, 0x6a, 0x86, 0x74, 0x29, 0x48, 0xb5, 0xb1, 0x23, 0x32, 0x65, 0x8b, 0x2e, 0xb2, 0xbe, - 0x6c, 0xdb, 0x83, 0x9c, 0x83, 0x70, 0xde, 0xa3, 0x06, 0x1b, 0x59, 0x9a, 0x38, 0x31, 0x17, 0x39, - 0x32, 0x99, 0xc1, 0xe8, 0xc0, 0xc6, 0x9d, 0xf0, 0xa3, 0xf4, 0x00, 0xf8, 0x02, 0x85, 0xa4, 0x15, - 0x90, 0x2a, 0x94, 0xe5, 0xc2, 0x6d, 0xb5, 0x85, 0x66, 0x6e, 0x41, 0xae, 0x3b, 0x3c, 0xd2, 0x34, - 0x24, 0x5d, 0x4f, 0x75, 0x3c, 0x92, 0x85, 0x49, 0x99, 0x3e, 0x48, 0x22, 0xc4, 0x91, 0xd9, 0x20, - 0x55, 0x2e, 0x29, 0xe3, 0x3f, 0xa5, 0x1f, 0x0f, 0x06, 0x1c, 0x27, 0x03, 0xfe, 0x78, 0xff, 0x8c, - 0x76, 0x31, 0xf7, 0x8e, 0x7b, 0xe6, 0x02, 0x8c, 0x77, 0x0d, 0x60, 0xd8, 0x57, 0x17, 0x7f, 0x0a, - 0x4e, 0x0c, 0xa4, 0x96, 0x9e, 0x83, 0xe9, 0xb6, 0xa9, 0x9b, 0x1e, 0x72, 0x6c, 0x07, 0xe1, 0x8c, - 0xa5, 0xaf, 0xca, 0xff, 0xd3, 0xd8, 0x11, 0x39, 0xb7, 0x17, 0xb6, 0xa6, 0x2c, 0xf2, 0x54, 0xbb, - 0x5f, 0xf8, 0x68, 0x3a, 0xf5, 0xc3, 0x31, 0xf1, 0xf6, 0xed, 0xdb, 0xb7, 0x63, 0xc5, 0x2f, 0x8c, - 0xc2, 0xf4, 0xa0, 0x35, 0x33, 0x70, 0xf9, 0x9e, 0x84, 0x51, 0xb3, 0xdd, 0xaa, 0x23, 0x87, 0x04, - 0x29, 0x29, 0xb3, 0x27, 0xa9, 0x0c, 0x49, 0x43, 0xad, 0x23, 0x23, 0x9f, 0x38, 0x2b, 0xcc, 0xe6, - 0x16, 0x1e, 0x1b, 0x6a, 0x55, 0xce, 0x6d, 0x62, 0x88, 0x4c, 0x91, 0xd2, 0x27, 0x21, 0xc1, 0x4a, - 0x34, 0x66, 0x78, 0x74, 0x38, 0x06, 0xbc, 0x96, 0x64, 0x82, 0x93, 0xee, 0x83, 0x34, 0xfe, 0x97, - 0xe6, 0xc6, 0x28, 0xf1, 0x39, 0x85, 0x05, 0x38, 0x2f, 0xa4, 0x19, 0x48, 0x91, 0x65, 0xd2, 0x40, - 0x7c, 0x6b, 0xf3, 0x9f, 0x71, 0x62, 0x35, 0xd0, 0xbe, 0xda, 0x36, 0x3c, 0xe5, 0x86, 0x6a, 0xb4, - 0x11, 0x49, 0xf8, 0xb4, 0x9c, 0x65, 0xc2, 0x4f, 0x63, 0x99, 0x74, 0x06, 0x32, 0x74, 0x55, 0xe9, - 0x66, 0x03, 0xbd, 0x48, 0xaa, 0x67, 0x52, 0xa6, 0x0b, 0x6d, 0x03, 0x4b, 0xf0, 0xeb, 0xaf, 0xb9, - 0x96, 0xc9, 0x53, 0x93, 0xbc, 0x02, 0x0b, 0xc8, 0xeb, 0x2f, 0xf4, 0x16, 0xee, 0xfb, 0x07, 0x0f, - 0xaf, 0x37, 0xa7, 0x8a, 0xdf, 0x8a, 0x41, 0x82, 0xd4, 0x8b, 0x09, 0xc8, 0xec, 0x3e, 0xbf, 0x53, - 0x51, 0xd6, 0xaa, 0x7b, 0x2b, 0x9b, 0x15, 0x51, 0x90, 0x72, 0x00, 0x44, 0x70, 0x65, 0xb3, 0x5a, - 0xde, 0x15, 0x63, 0xfe, 0xf3, 0xc6, 0xf6, 0xee, 0xf2, 0xa2, 0x18, 0xf7, 0x01, 0x7b, 0x54, 0x90, - 0x08, 0x1b, 0x9c, 0x5f, 0x10, 0x93, 0x92, 0x08, 0x59, 0x4a, 0xb0, 0xf1, 0x5c, 0x65, 0x6d, 0x79, - 0x51, 0x1c, 0xed, 0x96, 0x9c, 0x5f, 0x10, 0xc7, 0xa4, 0x71, 0x48, 0x13, 0xc9, 0x4a, 0xb5, 0xba, - 0x29, 0xa6, 0x7c, 0xce, 0xda, 0xae, 0xbc, 0xb1, 0xbd, 0x2e, 0xa6, 0x7d, 0xce, 0x75, 0xb9, 0xba, - 0xb7, 0x23, 0x82, 0xcf, 0xb0, 0x55, 0xa9, 0xd5, 0xca, 0xeb, 0x15, 0x31, 0xe3, 0x5b, 0xac, 0x3c, - 0xbf, 0x5b, 0xa9, 0x89, 0xd9, 0x2e, 0xb7, 0xce, 0x2f, 0x88, 0xe3, 0xfe, 0x2b, 0x2a, 0xdb, 0x7b, - 0x5b, 0x62, 0x4e, 0x9a, 0x84, 0x71, 0xfa, 0x0a, 0xee, 0xc4, 0x44, 0x8f, 0x68, 0x79, 0x51, 0x14, - 0x03, 0x47, 0x28, 0xcb, 0x64, 0x97, 0x60, 0x79, 0x51, 0x94, 0x8a, 0xab, 0x90, 0x24, 0xd9, 0x25, - 0x49, 0x90, 0xdb, 0x2c, 0xaf, 0x54, 0x36, 0x95, 0xea, 0xce, 0xee, 0x46, 0x75, 0xbb, 0xbc, 0x29, - 0x0a, 0x81, 0x4c, 0xae, 0x7c, 0x6a, 0x6f, 0x43, 0xae, 0xac, 0x89, 0xb1, 0xb0, 0x6c, 0xa7, 0x52, - 0xde, 0xad, 0xac, 0x89, 0xf1, 0xa2, 0x06, 0xd3, 0x83, 0xea, 0xe4, 0xc0, 0x95, 0x11, 0x9a, 0xe2, - 0xd8, 0x11, 0x53, 0x4c, 0xb8, 0xfa, 0xa6, 0xf8, 0x07, 0x31, 0x98, 0x1a, 0xb0, 0x57, 0x0c, 0x7c, - 0xc9, 0xd3, 0x90, 0xa4, 0x29, 0x4a, 0x77, 0xcf, 0x47, 0x06, 0x6e, 0x3a, 0x24, 0x61, 0xfb, 0x76, - 0x50, 0x82, 0x0b, 0x77, 0x10, 0xf1, 0x23, 0x3a, 0x08, 0x4c, 0xd1, 0x57, 0xd3, 0x7f, 0xb2, 0xaf, - 0xa6, 0xd3, 0x6d, 0x6f, 0x79, 0x98, 0x6d, 0x8f, 0xc8, 0x8e, 0x57, 0xdb, 0x93, 0x03, 0x6a, 0xfb, - 0x65, 0x98, 0xec, 0x23, 0x1a, 0xba, 0xc6, 0xbe, 0x24, 0x40, 0xfe, 0xa8, 0xe0, 0x44, 0x54, 0xba, - 0x58, 0x57, 0xa5, 0xbb, 0xdc, 0x1b, 0xc1, 0x73, 0x47, 0x4f, 0x42, 0xdf, 0x5c, 0xbf, 0x26, 0xc0, - 0xc9, 0xc1, 0x9d, 0xe2, 0x40, 0x1f, 0x3e, 0x09, 0xa3, 0x2d, 0xe4, 0x1d, 0x58, 0xbc, 0x5b, 0xfa, - 0xf8, 0x80, 0x3d, 0x18, 0xab, 0x7b, 0x27, 0x9b, 0xa1, 0xc2, 0x9b, 0x78, 0xfc, 0xa8, 0x76, 0x8f, - 0x7a, 0xd3, 0xe7, 0xe9, 0xe7, 0x62, 0x70, 0x62, 0x20, 0xf9, 0x40, 0x47, 0xef, 0x07, 0xd0, 0x4d, - 0xbb, 0xed, 0xd1, 0x8e, 0x88, 0x16, 0xd8, 0x34, 0x91, 0x90, 0xe2, 0x85, 0x8b, 0x67, 0xdb, 0xf3, - 0xf5, 0x71, 0xa2, 0x07, 0x2a, 0x22, 0x06, 0x17, 0x03, 0x47, 0x13, 0xc4, 0xd1, 0xc2, 0x11, 0x23, - 0xed, 0x4b, 0xcc, 0x27, 0x41, 0xd4, 0x0c, 0x1d, 0x99, 0x9e, 0xe2, 0x7a, 0x0e, 0x52, 0x5b, 0xba, - 0xd9, 0x24, 0x3b, 0x48, 0xaa, 0x94, 0xdc, 0x57, 0x0d, 0x17, 0xc9, 0x13, 0x54, 0x5d, 0xe3, 0x5a, - 0x8c, 0x20, 0x09, 0xe4, 0x84, 0x10, 0xa3, 0x5d, 0x08, 0xaa, 0xf6, 0x11, 0xc5, 0x5f, 0x4c, 0x43, - 0x26, 0xd4, 0x57, 0x4b, 0xe7, 0x20, 0x7b, 0x4d, 0xbd, 0xa1, 0x2a, 0xfc, 0xac, 0x44, 0x23, 0x91, - 0xc1, 0xb2, 0x1d, 0x76, 0x5e, 0x7a, 0x12, 0xa6, 0x89, 0x89, 0xd5, 0xf6, 0x90, 0xa3, 0x68, 0x86, - 0xea, 0xba, 0x24, 0x68, 0x29, 0x62, 0x2a, 0x61, 0x5d, 0x15, 0xab, 0x56, 0xb9, 0x46, 0x5a, 0x82, - 0x29, 0x82, 0x68, 0xb5, 0x0d, 0x4f, 0xb7, 0x0d, 0xa4, 0xe0, 0xd3, 0x9b, 0x4b, 0x76, 0x12, 0xdf, - 0xb3, 0x49, 0x6c, 0xb1, 0xc5, 0x0c, 0xb0, 0x47, 0xae, 0xb4, 0x06, 0xf7, 0x13, 0x58, 0x13, 0x99, - 0xc8, 0x51, 0x3d, 0xa4, 0xa0, 0xcf, 0xb6, 0x55, 0xc3, 0x55, 0x54, 0xb3, 0xa1, 0x1c, 0xa8, 0xee, - 0x41, 0x7e, 0x1a, 0x13, 0xac, 0xc4, 0xf2, 0x82, 0x7c, 0x1a, 0x1b, 0xae, 0x33, 0xbb, 0x0a, 0x31, - 0x2b, 0x9b, 0x8d, 0xab, 0xaa, 0x7b, 0x20, 0x95, 0xe0, 0x24, 0x61, 0x71, 0x3d, 0x47, 0x37, 0x9b, - 0x8a, 0x76, 0x80, 0xb4, 0xeb, 0x4a, 0xdb, 0xdb, 0xbf, 0x98, 0xbf, 0x2f, 0xfc, 0x7e, 0xe2, 0x61, - 0x8d, 0xd8, 0xac, 0x62, 0x93, 0x3d, 0x6f, 0xff, 0xa2, 0x54, 0x83, 0x2c, 0x9e, 0x8c, 0x96, 0x7e, - 0x0b, 0x29, 0xfb, 0x96, 0x43, 0xb6, 0xc6, 0xdc, 0x80, 0xd2, 0x14, 0x8a, 0xe0, 0x5c, 0x95, 0x01, - 0xb6, 0xac, 0x06, 0x2a, 0x25, 0x6b, 0x3b, 0x95, 0xca, 0x9a, 0x9c, 0xe1, 0x2c, 0x57, 0x2c, 0x07, - 0x27, 0x54, 0xd3, 0xf2, 0x03, 0x9c, 0xa1, 0x09, 0xd5, 0xb4, 0x78, 0x78, 0x97, 0x60, 0x4a, 0xd3, - 0xe8, 0x98, 0x75, 0x4d, 0x61, 0x67, 0x2c, 0x37, 0x2f, 0x76, 0x05, 0x4b, 0xd3, 0xd6, 0xa9, 0x01, - 0xcb, 0x71, 0x57, 0xba, 0x04, 0x27, 0x82, 0x60, 0x85, 0x81, 0x93, 0x7d, 0xa3, 0xec, 0x85, 0x2e, - 0xc1, 0x94, 0xdd, 0xe9, 0x07, 0x4a, 0x5d, 0x6f, 0xb4, 0x3b, 0xbd, 0xb0, 0x0b, 0x30, 0x6d, 0x1f, - 0xd8, 0xfd, 0xb8, 0x47, 0xc3, 0x38, 0xc9, 0x3e, 0xb0, 0x7b, 0x81, 0x0f, 0x91, 0x03, 0xb7, 0x83, - 0x34, 0xd5, 0x43, 0x8d, 0xfc, 0xa9, 0xb0, 0x79, 0x48, 0x21, 0xcd, 0x83, 0xa8, 0x69, 0x0a, 0x32, - 0xd5, 0xba, 0x81, 0x14, 0xd5, 0x41, 0xa6, 0xea, 0xe6, 0xcf, 0x84, 0x8d, 0x73, 0x9a, 0x56, 0x21, - 0xda, 0x32, 0x51, 0x4a, 0x8f, 0xc2, 0xa4, 0x55, 0xbf, 0xa6, 0xd1, 0x94, 0x54, 0x6c, 0x07, 0xed, - 0xeb, 0x2f, 0xe6, 0x1f, 0x24, 0xf1, 0x9d, 0xc0, 0x0a, 0x92, 0x90, 0x3b, 0x44, 0x2c, 0x3d, 0x02, - 0xa2, 0xe6, 0x1e, 0xa8, 0x8e, 0x4d, 0x6a, 0xb2, 0x6b, 0xab, 0x1a, 0xca, 0x3f, 0x44, 0x4d, 0xa9, - 0x7c, 0x9b, 0x8b, 0xf1, 0x92, 0x70, 0x6f, 0xea, 0xfb, 0x1e, 0x67, 0x7c, 0x98, 0x2e, 0x09, 0x22, - 0x63, 0x6c, 0xb3, 0x20, 0xe2, 0x50, 0x74, 0xbd, 0x78, 0x96, 0x98, 0xe5, 0xec, 0x03, 0x3b, 0xfc, - 0xde, 0x07, 0x60, 0x1c, 0x5b, 0x06, 0x2f, 0x7d, 0x84, 0x36, 0x64, 0xf6, 0x41, 0xe8, 0x8d, 0x8b, - 0x70, 0x12, 0x1b, 0xb5, 0x90, 0xa7, 0x36, 0x54, 0x4f, 0x0d, 0x59, 0x3f, 0x4e, 0xac, 0x71, 0xdc, - 0xb7, 0x98, 0xb2, 0xcb, 0x4f, 0xa7, 0x5d, 0xef, 0xf8, 0x99, 0xf5, 0x04, 0xf5, 0x13, 0xcb, 0x78, - 0x6e, 0x7d, 0x60, 0x4d, 0x77, 0xb1, 0x04, 0xd9, 0x70, 0xe2, 0x4b, 0x69, 0xa0, 0xa9, 0x2f, 0x0a, - 0xb8, 0x0b, 0x5a, 0xad, 0xae, 0xe1, 0xfe, 0xe5, 0x85, 0x8a, 0x18, 0xc3, 0x7d, 0xd4, 0xe6, 0xc6, - 0x6e, 0x45, 0x91, 0xf7, 0xb6, 0x77, 0x37, 0xb6, 0x2a, 0x62, 0x3c, 0xdc, 0xb0, 0x7f, 0x2f, 0x06, - 0xb9, 0xee, 0xb3, 0x97, 0xf4, 0x63, 0x70, 0x8a, 0x5f, 0x94, 0xb8, 0xc8, 0x53, 0x6e, 0xea, 0x0e, - 0x59, 0x8b, 0x2d, 0x95, 0xee, 0x8b, 0x7e, 0x36, 0x4c, 0x33, 0xab, 0x1a, 0xf2, 0x9e, 0xd5, 0x1d, - 0xbc, 0xd2, 0x5a, 0xaa, 0x27, 0x6d, 0xc2, 0x19, 0xd3, 0x52, 0x5c, 0x4f, 0x35, 0x1b, 0xaa, 0xd3, - 0x50, 0x82, 0x2b, 0x2a, 0x45, 0xd5, 0x34, 0xe4, 0xba, 0x16, 0xdd, 0x03, 0x7d, 0x96, 0x8f, 0x99, - 0x56, 0x8d, 0x19, 0x07, 0x9b, 0x43, 0x99, 0x99, 0xf6, 0x64, 0x6e, 0xfc, 0xa8, 0xcc, 0xbd, 0x0f, - 0xd2, 0x2d, 0xd5, 0x56, 0x90, 0xe9, 0x39, 0x1d, 0xd2, 0x71, 0xa7, 0xe4, 0x54, 0x4b, 0xb5, 0x2b, - 0xf8, 0xf9, 0xc3, 0x39, 0xf8, 0xfc, 0x63, 0x1c, 0xb2, 0xe1, 0xae, 0x1b, 0x1f, 0x62, 0x34, 0xb2, - 0x41, 0x09, 0xa4, 0x84, 0x3d, 0x70, 0xcf, 0x1e, 0x7d, 0x6e, 0x15, 0xef, 0x5c, 0xa5, 0x51, 0xda, - 0x0b, 0xcb, 0x14, 0x89, 0xbb, 0x06, 0x9c, 0x5a, 0x88, 0xf6, 0x1e, 0x29, 0x99, 0x3d, 0x49, 0xeb, - 0x30, 0x7a, 0xcd, 0x25, 0xdc, 0xa3, 0x84, 0xfb, 0xc1, 0x7b, 0x73, 0x3f, 0x53, 0x23, 0xe4, 0xe9, - 0x67, 0x6a, 0xca, 0x76, 0x55, 0xde, 0x2a, 0x6f, 0xca, 0x0c, 0x2e, 0x9d, 0x86, 0x84, 0xa1, 0xde, - 0xea, 0x74, 0xef, 0x71, 0x44, 0x34, 0x6c, 0xe0, 0x4f, 0x43, 0xe2, 0x26, 0x52, 0xaf, 0x77, 0xef, - 0x2c, 0x44, 0xf4, 0x01, 0xa6, 0xfe, 0x3c, 0x24, 0x49, 0xbc, 0x24, 0x00, 0x16, 0x31, 0x71, 0x44, - 0x4a, 0x41, 0x62, 0xb5, 0x2a, 0xe3, 0xf4, 0x17, 0x21, 0x4b, 0xa5, 0xca, 0xce, 0x46, 0x65, 0xb5, - 0x22, 0xc6, 0x8a, 0x4b, 0x30, 0x4a, 0x83, 0x80, 0x97, 0x86, 0x1f, 0x06, 0x71, 0x84, 0x3d, 0x32, - 0x0e, 0x81, 0x6b, 0xf7, 0xb6, 0x56, 0x2a, 0xb2, 0x18, 0x0b, 0x4f, 0xaf, 0x0b, 0xd9, 0x70, 0xc3, - 0xfd, 0xe1, 0xe4, 0xd4, 0x77, 0x05, 0xc8, 0x84, 0x1a, 0x68, 0xdc, 0xf9, 0xa8, 0x86, 0x61, 0xdd, - 0x54, 0x54, 0x43, 0x57, 0x5d, 0x96, 0x14, 0x40, 0x44, 0x65, 0x2c, 0x19, 0x76, 0xd2, 0x3e, 0x14, - 0xe7, 0x5f, 0x15, 0x40, 0xec, 0xed, 0x5d, 0x7b, 0x1c, 0x14, 0x3e, 0x52, 0x07, 0x5f, 0x11, 0x20, - 0xd7, 0xdd, 0xb0, 0xf6, 0xb8, 0x77, 0xee, 0x23, 0x75, 0xef, 0xad, 0x18, 0x8c, 0x77, 0xb5, 0xa9, - 0xc3, 0x7a, 0xf7, 0x59, 0x98, 0xd4, 0x1b, 0xa8, 0x65, 0x5b, 0x1e, 0x32, 0xb5, 0x8e, 0x62, 0xa0, - 0x1b, 0xc8, 0xc8, 0x17, 0x49, 0xa1, 0x98, 0xbf, 0x77, 0x23, 0x3c, 0xb7, 0x11, 0xe0, 0x36, 0x31, - 0xac, 0x34, 0xb5, 0xb1, 0x56, 0xd9, 0xda, 0xa9, 0xee, 0x56, 0xb6, 0x57, 0x9f, 0x57, 0xf6, 0xb6, - 0x7f, 0x62, 0xbb, 0xfa, 0xec, 0xb6, 0x2c, 0xea, 0x3d, 0x66, 0x1f, 0xe0, 0x52, 0xdf, 0x01, 0xb1, - 0xd7, 0x29, 0xe9, 0x14, 0x0c, 0x72, 0x4b, 0x1c, 0x91, 0xa6, 0x60, 0x62, 0xbb, 0xaa, 0xd4, 0x36, - 0xd6, 0x2a, 0x4a, 0xe5, 0xca, 0x95, 0xca, 0xea, 0x6e, 0x8d, 0x5e, 0x6d, 0xf8, 0xd6, 0xbb, 0xdd, - 0x8b, 0xfa, 0xe5, 0x38, 0x4c, 0x0d, 0xf0, 0x44, 0x2a, 0xb3, 0x43, 0x09, 0x3d, 0x27, 0x3d, 0x31, - 0x8c, 0xf7, 0x73, 0xb8, 0x2b, 0xd8, 0x51, 0x1d, 0x8f, 0x9d, 0x61, 0x1e, 0x01, 0x1c, 0x25, 0xd3, - 0xd3, 0xf7, 0x75, 0xe4, 0xb0, 0x9b, 0x20, 0x7a, 0x52, 0x99, 0x08, 0xe4, 0xf4, 0x32, 0xe8, 0x71, - 0x90, 0x6c, 0xcb, 0xd5, 0x3d, 0xfd, 0x06, 0x52, 0x74, 0x93, 0x5f, 0x1b, 0xe1, 0x93, 0x4b, 0x42, - 0x16, 0xb9, 0x66, 0xc3, 0xf4, 0x7c, 0x6b, 0x13, 0x35, 0xd5, 0x1e, 0x6b, 0x5c, 0xc0, 0xe3, 0xb2, - 0xc8, 0x35, 0xbe, 0xf5, 0x39, 0xc8, 0x36, 0xac, 0x36, 0x6e, 0xe7, 0xa8, 0x1d, 0xde, 0x2f, 0x04, - 0x39, 0x43, 0x65, 0xbe, 0x09, 0x6b, 0xd4, 0x83, 0xfb, 0xaa, 0xac, 0x9c, 0xa1, 0x32, 0x6a, 0xf2, - 0x30, 0x4c, 0xa8, 0xcd, 0xa6, 0x83, 0xc9, 0x39, 0x11, 0x3d, 0x7a, 0xe4, 0x7c, 0x31, 0x31, 0x9c, - 0x79, 0x06, 0x52, 0x3c, 0x0e, 0x78, 0x4b, 0xc6, 0x91, 0x50, 0x6c, 0x7a, 0x9e, 0x8e, 0xcd, 0xa6, - 0xe5, 0x94, 0xc9, 0x95, 0xe7, 0x20, 0xab, 0xbb, 0x4a, 0x70, 0xfd, 0x1e, 0x3b, 0x1b, 0x9b, 0x4d, - 0xc9, 0x19, 0xdd, 0xf5, 0xaf, 0x2e, 0x8b, 0xaf, 0xc5, 0x20, 0xd7, 0xfd, 0xf9, 0x40, 0x5a, 0x83, - 0x94, 0x61, 0x69, 0x2a, 0x49, 0x2d, 0xfa, 0xed, 0x6a, 0x36, 0xe2, 0x8b, 0xc3, 0xdc, 0x26, 0xb3, - 0x97, 0x7d, 0xe4, 0xcc, 0xdf, 0x09, 0x90, 0xe2, 0x62, 0xe9, 0x24, 0x24, 0x6c, 0xd5, 0x3b, 0x20, - 0x74, 0xc9, 0x95, 0x98, 0x28, 0xc8, 0xe4, 0x19, 0xcb, 0x5d, 0x5b, 0x35, 0x49, 0x0a, 0x30, 0x39, - 0x7e, 0xc6, 0xf3, 0x6a, 0x20, 0xb5, 0x41, 0xce, 0x35, 0x56, 0xab, 0x85, 0x4c, 0xcf, 0xe5, 0xf3, - 0xca, 0xe4, 0xab, 0x4c, 0x2c, 0x3d, 0x06, 0x93, 0x9e, 0xa3, 0xea, 0x46, 0x97, 0x6d, 0x82, 0xd8, - 0x8a, 0x5c, 0xe1, 0x1b, 0x97, 0xe0, 0x34, 0xe7, 0x6d, 0x20, 0x4f, 0xd5, 0x0e, 0x50, 0x23, 0x00, - 0x8d, 0x92, 0xfb, 0x8b, 0x53, 0xcc, 0x60, 0x8d, 0xe9, 0x39, 0xb6, 0xf8, 0x7d, 0x01, 0x26, 0xf9, - 0x49, 0xac, 0xe1, 0x07, 0x6b, 0x0b, 0x40, 0x35, 0x4d, 0xcb, 0x0b, 0x87, 0xab, 0x3f, 0x95, 0xfb, - 0x70, 0x73, 0x65, 0x1f, 0x24, 0x87, 0x08, 0x66, 0x5a, 0x00, 0x81, 0xe6, 0xc8, 0xb0, 0x9d, 0x81, - 0x0c, 0xfb, 0x36, 0x44, 0x3e, 0x30, 0xd2, 0xb3, 0x3b, 0x50, 0x11, 0x3e, 0xb2, 0x49, 0xd3, 0x90, - 0xac, 0xa3, 0xa6, 0x6e, 0xb2, 0x1b, 0x5f, 0xfa, 0xc0, 0x6f, 0x58, 0x12, 0xfe, 0x0d, 0xcb, 0xca, - 0x67, 0x60, 0x4a, 0xb3, 0x5a, 0xbd, 0xee, 0xae, 0x88, 0x3d, 0xf7, 0x07, 0xee, 0x55, 0xe1, 0x05, - 0x08, 0x5a, 0xcc, 0xf7, 0x04, 0xe1, 0x2b, 0xb1, 0xf8, 0xfa, 0xce, 0xca, 0xd7, 0x63, 0x33, 0xeb, - 0x14, 0xba, 0xc3, 0x47, 0x2a, 0xa3, 0x7d, 0x03, 0x69, 0xd8, 0x7b, 0xf8, 0xea, 0x63, 0xf0, 0x44, - 0x53, 0xf7, 0x0e, 0xda, 0xf5, 0x39, 0xcd, 0x6a, 0xcd, 0x37, 0xad, 0xa6, 0x15, 0x7c, 0x53, 0xc5, - 0x4f, 0xe4, 0x81, 0xfc, 0xc5, 0xbe, 0xab, 0xa6, 0x7d, 0xe9, 0x4c, 0xe4, 0x47, 0xd8, 0xd2, 0x36, - 0x4c, 0x31, 0x63, 0x85, 0x7c, 0xd8, 0xa1, 0xc7, 0x13, 0xe9, 0x9e, 0x97, 0x63, 0xf9, 0x6f, 0xbe, - 0x4d, 0xb6, 0x6b, 0x79, 0x92, 0x41, 0xb1, 0x8e, 0x9e, 0x60, 0x4a, 0x32, 0x9c, 0xe8, 0xe2, 0xa3, - 0x4b, 0x13, 0x39, 0x11, 0x8c, 0xdf, 0x63, 0x8c, 0x53, 0x21, 0xc6, 0x1a, 0x83, 0x96, 0x56, 0x61, - 0xfc, 0x38, 0x5c, 0x7f, 0xc3, 0xb8, 0xb2, 0x28, 0x4c, 0xb2, 0x0e, 0x13, 0x84, 0x44, 0x6b, 0xbb, - 0x9e, 0xd5, 0x22, 0x75, 0xef, 0xde, 0x34, 0x7f, 0xfb, 0x36, 0x5d, 0x2b, 0x39, 0x0c, 0x5b, 0xf5, - 0x51, 0xa5, 0x12, 0x90, 0x6f, 0x59, 0x0d, 0xa4, 0x19, 0x11, 0x0c, 0xaf, 0x33, 0x47, 0x7c, 0xfb, - 0xd2, 0xa7, 0x61, 0x1a, 0xff, 0x4d, 0xca, 0x52, 0xd8, 0x93, 0xe8, 0x9b, 0xb4, 0xfc, 0xf7, 0x5f, - 0xa2, 0xcb, 0x71, 0xca, 0x27, 0x08, 0xf9, 0x14, 0x9a, 0xc5, 0x26, 0xf2, 0x3c, 0xe4, 0xb8, 0x8a, - 0x6a, 0x0c, 0x72, 0x2f, 0x74, 0x15, 0x91, 0xff, 0xe2, 0x3b, 0xdd, 0xb3, 0xb8, 0x4e, 0x91, 0x65, - 0xc3, 0x28, 0xed, 0xc1, 0xa9, 0x01, 0x59, 0x31, 0x04, 0xe7, 0xcb, 0x8c, 0x73, 0xba, 0x2f, 0x33, - 0x30, 0xed, 0x0e, 0x70, 0xb9, 0x3f, 0x97, 0x43, 0x70, 0xfe, 0x16, 0xe3, 0x94, 0x18, 0x96, 0x4f, - 0x29, 0x66, 0x7c, 0x06, 0x26, 0x6f, 0x20, 0xa7, 0x6e, 0xb9, 0xec, 0xfa, 0x67, 0x08, 0xba, 0x57, - 0x18, 0xdd, 0x04, 0x03, 0x92, 0xfb, 0x20, 0xcc, 0x75, 0x09, 0x52, 0xfb, 0xaa, 0x86, 0x86, 0xa0, - 0xf8, 0x12, 0xa3, 0x18, 0xc3, 0xf6, 0x18, 0x5a, 0x86, 0x6c, 0xd3, 0x62, 0x3b, 0x53, 0x34, 0xfc, - 0x55, 0x06, 0xcf, 0x70, 0x0c, 0xa3, 0xb0, 0x2d, 0xbb, 0x6d, 0xe0, 0x6d, 0x2b, 0x9a, 0xe2, 0xb7, - 0x39, 0x05, 0xc7, 0x30, 0x8a, 0x63, 0x84, 0xf5, 0x77, 0x38, 0x85, 0x1b, 0x8a, 0xe7, 0xd3, 0x90, - 0xb1, 0x4c, 0xa3, 0x63, 0x99, 0xc3, 0x38, 0xf1, 0x65, 0xc6, 0x00, 0x0c, 0x82, 0x09, 0x2e, 0x43, - 0x7a, 0xd8, 0x89, 0xf8, 0xbd, 0x77, 0xf8, 0xf2, 0xe0, 0x33, 0xb0, 0x0e, 0x13, 0xbc, 0x40, 0xe9, - 0x96, 0x39, 0x04, 0xc5, 0x57, 0x19, 0x45, 0x2e, 0x04, 0x63, 0xc3, 0xf0, 0x90, 0xeb, 0x35, 0xd1, - 0x30, 0x24, 0xaf, 0xf1, 0x61, 0x30, 0x08, 0x0b, 0x65, 0x1d, 0x99, 0xda, 0xc1, 0x70, 0x0c, 0x5f, + // 4300 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0x1b, 0xe7, + 0x75, 0xe6, 0xe2, 0x42, 0x02, 0x07, 0x20, 0xb8, 0x5c, 0x52, 0x12, 0xc4, 0xc4, 0x90, 0x04, 0xdb, + 0x31, 0x7d, 0x23, 0x6d, 0x8a, 0xa4, 0x24, 0xa8, 0x89, 0x0b, 0x92, 0x10, 0x45, 0x97, 0x24, 0x98, + 0x05, 0x19, 0x5f, 0x32, 0x9d, 0x9d, 0xc5, 0xe2, 0x27, 0xb8, 0xd2, 0x62, 0x77, 0xb3, 0xbb, 0x90, + 0x0c, 0x4d, 0x1f, 0xd4, 0x71, 0x2f, 0x93, 0xe9, 0x3d, 0xed, 0x4c, 0x13, 0xd7, 0x71, 0x9b, 0x74, + 0x1a, 0xbb, 0xe9, 0x2d, 0xe9, 0x25, 0x4d, 0xd2, 0x97, 0xbe, 0xa4, 0xf5, 0x53, 0xc7, 0x79, 0xeb, + 0x74, 0x3a, 0x1e, 0x8b, 0xf6, 0x4c, 0xd3, 0xd6, 0x6d, 0xdd, 0x56, 0x0f, 0x6e, 0xfd, 0xd2, 0xf9, + 0x6f, 0xbb, 0x8b, 0x0b, 0xb5, 0x60, 0xa6, 0x76, 0x9e, 0xc4, 0x3d, 0xe7, 0x7c, 0xdf, 0x9e, 0xff, + 0xfc, 0xe7, 0x3f, 0xff, 0xf9, 0xff, 0x85, 0xe0, 0xf5, 0x12, 0x9c, 0x6d, 0x5a, 0x56, 0xd3, 0x40, + 0xf3, 0xb6, 0x63, 0x79, 0x56, 0xbd, 0xbd, 0x3f, 0xdf, 0x40, 0xae, 0xe6, 0xe8, 0xb6, 0x67, 0x39, + 0x73, 0x44, 0x26, 0x4d, 0x50, 0x8b, 0x39, 0x6e, 0x51, 0xdc, 0x82, 0xc9, 0x2b, 0xba, 0x81, 0xd6, + 0x7c, 0xc3, 0x1a, 0xf2, 0xa4, 0x8b, 0x90, 0xd8, 0xd7, 0x0d, 0x94, 0x17, 0xce, 0xc6, 0x67, 0x33, + 0x0b, 0x0f, 0xcc, 0xf5, 0x80, 0xe6, 0xba, 0x11, 0x3b, 0x58, 0x2c, 0x13, 0x44, 0xf1, 0x9d, 0x04, + 0x4c, 0x0d, 0xd0, 0x4a, 0x12, 0x24, 0x4c, 0xb5, 0x85, 0x19, 0x85, 0xd9, 0xb4, 0x4c, 0xfe, 0x96, + 0xf2, 0x30, 0x66, 0xab, 0xda, 0x75, 0xb5, 0x89, 0xf2, 0x31, 0x22, 0xe6, 0x8f, 0x52, 0x01, 0xa0, + 0x81, 0x6c, 0x64, 0x36, 0x90, 0xa9, 0x75, 0xf2, 0xf1, 0xb3, 0xf1, 0xd9, 0xb4, 0x1c, 0x92, 0x48, + 0x8f, 0xc2, 0xa4, 0xdd, 0xae, 0x1b, 0xba, 0xa6, 0x84, 0xcc, 0xe0, 0x6c, 0x7c, 0x36, 0x29, 0x8b, + 0x54, 0xb1, 0x16, 0x18, 0x3f, 0x04, 0x13, 0x37, 0x91, 0x7a, 0x3d, 0x6c, 0x9a, 0x21, 0xa6, 0x39, + 0x2c, 0x0e, 0x19, 0xae, 0x42, 0xb6, 0x85, 0x5c, 0x57, 0x6d, 0x22, 0xc5, 0xeb, 0xd8, 0x28, 0x9f, + 0x20, 0xa3, 0x3f, 0xdb, 0x37, 0xfa, 0xde, 0x91, 0x67, 0x18, 0x6a, 0xb7, 0x63, 0x23, 0xa9, 0x0c, + 0x69, 0x64, 0xb6, 0x5b, 0x94, 0x21, 0x79, 0x44, 0xfc, 0x2a, 0x66, 0xbb, 0xd5, 0xcb, 0x92, 0xc2, + 0x30, 0x46, 0x31, 0xe6, 0x22, 0xe7, 0x86, 0xae, 0xa1, 0xfc, 0x28, 0x21, 0x78, 0xa8, 0x8f, 0xa0, + 0x46, 0xf5, 0xbd, 0x1c, 0x1c, 0x27, 0xad, 0x42, 0x1a, 0xbd, 0xe0, 0x21, 0xd3, 0xd5, 0x2d, 0x33, + 0x3f, 0x46, 0x48, 0x1e, 0x1c, 0x30, 0x8b, 0xc8, 0x68, 0xf4, 0x52, 0x04, 0x38, 0x69, 0x19, 0xc6, + 0x2c, 0xdb, 0xd3, 0x2d, 0xd3, 0xcd, 0xa7, 0xce, 0x0a, 0xb3, 0x99, 0x85, 0x8f, 0x0f, 0x4c, 0x84, + 0x2a, 0xb5, 0x91, 0xb9, 0xb1, 0xb4, 0x01, 0xa2, 0x6b, 0xb5, 0x1d, 0x0d, 0x29, 0x9a, 0xd5, 0x40, + 0x8a, 0x6e, 0xee, 0x5b, 0xf9, 0x34, 0x21, 0x38, 0xd3, 0x3f, 0x10, 0x62, 0xb8, 0x6a, 0x35, 0xd0, + 0x86, 0xb9, 0x6f, 0xc9, 0x39, 0xb7, 0xeb, 0x59, 0x3a, 0x09, 0xa3, 0x6e, 0xc7, 0xf4, 0xd4, 0x17, + 0xf2, 0x59, 0x92, 0x21, 0xec, 0xa9, 0xf8, 0x9d, 0x51, 0x98, 0x18, 0x26, 0xc5, 0x2e, 0x43, 0x72, + 0x1f, 0x8f, 0x32, 0x1f, 0x3b, 0x4e, 0x0c, 0x28, 0xa6, 0x3b, 0x88, 0xa3, 0x3f, 0x64, 0x10, 0xcb, + 0x90, 0x31, 0x91, 0xeb, 0xa1, 0x06, 0xcd, 0x88, 0xf8, 0x90, 0x39, 0x05, 0x14, 0xd4, 0x9f, 0x52, + 0x89, 0x1f, 0x2a, 0xa5, 0x9e, 0x85, 0x09, 0xdf, 0x25, 0xc5, 0x51, 0xcd, 0x26, 0xcf, 0xcd, 0xf9, + 0x28, 0x4f, 0xe6, 0x2a, 0x1c, 0x27, 0x63, 0x98, 0x9c, 0x43, 0x5d, 0xcf, 0xd2, 0x1a, 0x80, 0x65, + 0x22, 0x6b, 0x5f, 0x69, 0x20, 0xcd, 0xc8, 0xa7, 0x8e, 0x88, 0x52, 0x15, 0x9b, 0xf4, 0x45, 0xc9, + 0xa2, 0x52, 0xcd, 0x90, 0x2e, 0x05, 0xa9, 0x36, 0x76, 0x44, 0xa6, 0x6c, 0xd1, 0x45, 0xd6, 0x97, + 0x6d, 0x7b, 0x90, 0x73, 0x10, 0xce, 0x7b, 0xd4, 0x60, 0x23, 0x4b, 0x13, 0x27, 0xe6, 0x22, 0x47, + 0x26, 0x33, 0x18, 0x1d, 0xd8, 0xb8, 0x13, 0x7e, 0x94, 0xee, 0x07, 0x5f, 0xa0, 0x90, 0xb4, 0x02, + 0x52, 0x85, 0xb2, 0x5c, 0xb8, 0xad, 0xb6, 0xd0, 0xcc, 0x2d, 0xc8, 0x75, 0x87, 0x47, 0x9a, 0x86, + 0xa4, 0xeb, 0xa9, 0x8e, 0x47, 0xb2, 0x30, 0x29, 0xd3, 0x07, 0x49, 0x84, 0x38, 0x32, 0x1b, 0xa4, + 0xca, 0x25, 0x65, 0xfc, 0xa7, 0xf4, 0xe3, 0xc1, 0x80, 0xe3, 0x64, 0xc0, 0x9f, 0xe8, 0x9f, 0xd1, + 0x2e, 0xe6, 0xde, 0x71, 0xcf, 0x5c, 0x80, 0xf1, 0xae, 0x01, 0x0c, 0xfb, 0xea, 0xe2, 0x4f, 0xc1, + 0x89, 0x81, 0xd4, 0xd2, 0xb3, 0x30, 0xdd, 0x36, 0x75, 0xd3, 0x43, 0x8e, 0xed, 0x20, 0x9c, 0xb1, + 0xf4, 0x55, 0xf9, 0x7f, 0x1a, 0x3b, 0x22, 0xe7, 0xf6, 0xc2, 0xd6, 0x94, 0x45, 0x9e, 0x6a, 0xf7, + 0x0b, 0x1f, 0x49, 0xa7, 0x7e, 0x30, 0x26, 0xde, 0xbe, 0x7d, 0xfb, 0x76, 0xac, 0xf8, 0xc5, 0x51, + 0x98, 0x1e, 0xb4, 0x66, 0x06, 0x2e, 0xdf, 0x93, 0x30, 0x6a, 0xb6, 0x5b, 0x75, 0xe4, 0x90, 0x20, + 0x25, 0x65, 0xf6, 0x24, 0x95, 0x21, 0x69, 0xa8, 0x75, 0x64, 0xe4, 0x13, 0x67, 0x85, 0xd9, 0xdc, + 0xc2, 0xa3, 0x43, 0xad, 0xca, 0xb9, 0x4d, 0x0c, 0x91, 0x29, 0x52, 0xfa, 0x14, 0x24, 0x58, 0x89, + 0xc6, 0x0c, 0x8f, 0x0c, 0xc7, 0x80, 0xd7, 0x92, 0x4c, 0x70, 0xd2, 0xc7, 0x20, 0x8d, 0xff, 0xa5, + 0xb9, 0x31, 0x4a, 0x7c, 0x4e, 0x61, 0x01, 0xce, 0x0b, 0x69, 0x06, 0x52, 0x64, 0x99, 0x34, 0x10, + 0xdf, 0xda, 0xfc, 0x67, 0x9c, 0x58, 0x0d, 0xb4, 0xaf, 0xb6, 0x0d, 0x4f, 0xb9, 0xa1, 0x1a, 0x6d, + 0x44, 0x12, 0x3e, 0x2d, 0x67, 0x99, 0xf0, 0x33, 0x58, 0x26, 0x9d, 0x81, 0x0c, 0x5d, 0x55, 0xba, + 0xd9, 0x40, 0x2f, 0x90, 0xea, 0x99, 0x94, 0xe9, 0x42, 0xdb, 0xc0, 0x12, 0xfc, 0xfa, 0x6b, 0xae, + 0x65, 0xf2, 0xd4, 0x24, 0xaf, 0xc0, 0x02, 0xf2, 0xfa, 0x0b, 0xbd, 0x85, 0xfb, 0xbe, 0xc1, 0xc3, + 0xeb, 0xcd, 0xa9, 0xe2, 0xb7, 0x62, 0x90, 0x20, 0xf5, 0x62, 0x02, 0x32, 0xbb, 0xcf, 0xed, 0x54, + 0x94, 0xb5, 0xea, 0xde, 0xca, 0x66, 0x45, 0x14, 0xa4, 0x1c, 0x00, 0x11, 0x5c, 0xd9, 0xac, 0x96, + 0x77, 0xc5, 0x98, 0xff, 0xbc, 0xb1, 0xbd, 0xbb, 0xbc, 0x28, 0xc6, 0x7d, 0xc0, 0x1e, 0x15, 0x24, + 0xc2, 0x06, 0xe7, 0x17, 0xc4, 0xa4, 0x24, 0x42, 0x96, 0x12, 0x6c, 0x3c, 0x5b, 0x59, 0x5b, 0x5e, + 0x14, 0x47, 0xbb, 0x25, 0xe7, 0x17, 0xc4, 0x31, 0x69, 0x1c, 0xd2, 0x44, 0xb2, 0x52, 0xad, 0x6e, + 0x8a, 0x29, 0x9f, 0xb3, 0xb6, 0x2b, 0x6f, 0x6c, 0xaf, 0x8b, 0x69, 0x9f, 0x73, 0x5d, 0xae, 0xee, + 0xed, 0x88, 0xe0, 0x33, 0x6c, 0x55, 0x6a, 0xb5, 0xf2, 0x7a, 0x45, 0xcc, 0xf8, 0x16, 0x2b, 0xcf, + 0xed, 0x56, 0x6a, 0x62, 0xb6, 0xcb, 0xad, 0xf3, 0x0b, 0xe2, 0xb8, 0xff, 0x8a, 0xca, 0xf6, 0xde, + 0x96, 0x98, 0x93, 0x26, 0x61, 0x9c, 0xbe, 0x82, 0x3b, 0x31, 0xd1, 0x23, 0x5a, 0x5e, 0x14, 0xc5, + 0xc0, 0x11, 0xca, 0x32, 0xd9, 0x25, 0x58, 0x5e, 0x14, 0xa5, 0xe2, 0x2a, 0x24, 0x49, 0x76, 0x49, + 0x12, 0xe4, 0x36, 0xcb, 0x2b, 0x95, 0x4d, 0xa5, 0xba, 0xb3, 0xbb, 0x51, 0xdd, 0x2e, 0x6f, 0x8a, + 0x42, 0x20, 0x93, 0x2b, 0x9f, 0xde, 0xdb, 0x90, 0x2b, 0x6b, 0x62, 0x2c, 0x2c, 0xdb, 0xa9, 0x94, + 0x77, 0x2b, 0x6b, 0x62, 0xbc, 0xa8, 0xc1, 0xf4, 0xa0, 0x3a, 0x39, 0x70, 0x65, 0x84, 0xa6, 0x38, + 0x76, 0xc4, 0x14, 0x13, 0xae, 0xbe, 0x29, 0x7e, 0x3b, 0x06, 0x53, 0x03, 0xf6, 0x8a, 0x81, 0x2f, + 0x79, 0x0a, 0x92, 0x34, 0x45, 0xe9, 0xee, 0xf9, 0xf0, 0xc0, 0x4d, 0x87, 0x24, 0x6c, 0xdf, 0x0e, + 0x4a, 0x70, 0xe1, 0x0e, 0x22, 0x7e, 0x44, 0x07, 0x81, 0x29, 0xfa, 0x6a, 0xfa, 0x4f, 0xf6, 0xd5, + 0x74, 0xba, 0xed, 0x2d, 0x0f, 0xb3, 0xed, 0x11, 0xd9, 0xf1, 0x6a, 0x7b, 0x72, 0x40, 0x6d, 0xbf, + 0x0c, 0x93, 0x7d, 0x44, 0x43, 0xd7, 0xd8, 0x17, 0x05, 0xc8, 0x1f, 0x15, 0x9c, 0x88, 0x4a, 0x17, + 0xeb, 0xaa, 0x74, 0x97, 0x7b, 0x23, 0x78, 0xee, 0xe8, 0x49, 0xe8, 0x9b, 0xeb, 0x57, 0x05, 0x38, + 0x39, 0xb8, 0x53, 0x1c, 0xe8, 0xc3, 0xa7, 0x60, 0xb4, 0x85, 0xbc, 0x03, 0x8b, 0x77, 0x4b, 0x9f, + 0x18, 0xb0, 0x07, 0x63, 0x75, 0xef, 0x64, 0x33, 0x54, 0x78, 0x13, 0x8f, 0x1f, 0xd5, 0xee, 0x51, + 0x6f, 0xfa, 0x3c, 0xfd, 0x7c, 0x0c, 0x4e, 0x0c, 0x24, 0x1f, 0xe8, 0xe8, 0x7d, 0x00, 0xba, 0x69, + 0xb7, 0x3d, 0xda, 0x11, 0xd1, 0x02, 0x9b, 0x26, 0x12, 0x52, 0xbc, 0x70, 0xf1, 0x6c, 0x7b, 0xbe, + 0x3e, 0x4e, 0xf4, 0x40, 0x45, 0xc4, 0xe0, 0x62, 0xe0, 0x68, 0x82, 0x38, 0x5a, 0x38, 0x62, 0xa4, + 0x7d, 0x89, 0xf9, 0x04, 0x88, 0x9a, 0xa1, 0x23, 0xd3, 0x53, 0x5c, 0xcf, 0x41, 0x6a, 0x4b, 0x37, + 0x9b, 0x64, 0x07, 0x49, 0x95, 0x92, 0xfb, 0xaa, 0xe1, 0x22, 0x79, 0x82, 0xaa, 0x6b, 0x5c, 0x8b, + 0x11, 0x24, 0x81, 0x9c, 0x10, 0x62, 0xb4, 0x0b, 0x41, 0xd5, 0x3e, 0xa2, 0xf8, 0x8b, 0x69, 0xc8, + 0x84, 0xfa, 0x6a, 0xe9, 0x1c, 0x64, 0xaf, 0xa9, 0x37, 0x54, 0x85, 0x9f, 0x95, 0x68, 0x24, 0x32, + 0x58, 0xb6, 0xc3, 0xce, 0x4b, 0x4f, 0xc0, 0x34, 0x31, 0xb1, 0xda, 0x1e, 0x72, 0x14, 0xcd, 0x50, + 0x5d, 0x97, 0x04, 0x2d, 0x45, 0x4c, 0x25, 0xac, 0xab, 0x62, 0xd5, 0x2a, 0xd7, 0x48, 0x4b, 0x30, + 0x45, 0x10, 0xad, 0xb6, 0xe1, 0xe9, 0xb6, 0x81, 0x14, 0x7c, 0x7a, 0x73, 0xc9, 0x4e, 0xe2, 0x7b, + 0x36, 0x89, 0x2d, 0xb6, 0x98, 0x01, 0xf6, 0xc8, 0x95, 0xd6, 0xe0, 0x3e, 0x02, 0x6b, 0x22, 0x13, + 0x39, 0xaa, 0x87, 0x14, 0xf4, 0xb9, 0xb6, 0x6a, 0xb8, 0x8a, 0x6a, 0x36, 0x94, 0x03, 0xd5, 0x3d, + 0xc8, 0x4f, 0x63, 0x82, 0x95, 0x58, 0x5e, 0x90, 0x4f, 0x63, 0xc3, 0x75, 0x66, 0x57, 0x21, 0x66, + 0x65, 0xb3, 0x71, 0x55, 0x75, 0x0f, 0xa4, 0x12, 0x9c, 0x24, 0x2c, 0xae, 0xe7, 0xe8, 0x66, 0x53, + 0xd1, 0x0e, 0x90, 0x76, 0x5d, 0x69, 0x7b, 0xfb, 0x17, 0xf3, 0x1f, 0x0b, 0xbf, 0x9f, 0x78, 0x58, + 0x23, 0x36, 0xab, 0xd8, 0x64, 0xcf, 0xdb, 0xbf, 0x28, 0xd5, 0x20, 0x8b, 0x27, 0xa3, 0xa5, 0xdf, + 0x42, 0xca, 0xbe, 0xe5, 0x90, 0xad, 0x31, 0x37, 0xa0, 0x34, 0x85, 0x22, 0x38, 0x57, 0x65, 0x80, + 0x2d, 0xab, 0x81, 0x4a, 0xc9, 0xda, 0x4e, 0xa5, 0xb2, 0x26, 0x67, 0x38, 0xcb, 0x15, 0xcb, 0xc1, + 0x09, 0xd5, 0xb4, 0xfc, 0x00, 0x67, 0x68, 0x42, 0x35, 0x2d, 0x1e, 0xde, 0x25, 0x98, 0xd2, 0x34, + 0x3a, 0x66, 0x5d, 0x53, 0xd8, 0x19, 0xcb, 0xcd, 0x8b, 0x5d, 0xc1, 0xd2, 0xb4, 0x75, 0x6a, 0xc0, + 0x72, 0xdc, 0x95, 0x2e, 0xc1, 0x89, 0x20, 0x58, 0x61, 0xe0, 0x64, 0xdf, 0x28, 0x7b, 0xa1, 0x4b, + 0x30, 0x65, 0x77, 0xfa, 0x81, 0x52, 0xd7, 0x1b, 0xed, 0x4e, 0x2f, 0xec, 0x02, 0x4c, 0xdb, 0x07, + 0x76, 0x3f, 0xee, 0x91, 0x30, 0x4e, 0xb2, 0x0f, 0xec, 0x5e, 0xe0, 0x83, 0xe4, 0xc0, 0xed, 0x20, + 0x4d, 0xf5, 0x50, 0x23, 0x7f, 0x2a, 0x6c, 0x1e, 0x52, 0x48, 0xf3, 0x20, 0x6a, 0x9a, 0x82, 0x4c, + 0xb5, 0x6e, 0x20, 0x45, 0x75, 0x90, 0xa9, 0xba, 0xf9, 0x33, 0x61, 0xe3, 0x9c, 0xa6, 0x55, 0x88, + 0xb6, 0x4c, 0x94, 0xd2, 0x23, 0x30, 0x69, 0xd5, 0xaf, 0x69, 0x34, 0x25, 0x15, 0xdb, 0x41, 0xfb, + 0xfa, 0x0b, 0xf9, 0x07, 0x48, 0x7c, 0x27, 0xb0, 0x82, 0x24, 0xe4, 0x0e, 0x11, 0x4b, 0x0f, 0x83, + 0xa8, 0xb9, 0x07, 0xaa, 0x63, 0x93, 0x9a, 0xec, 0xda, 0xaa, 0x86, 0xf2, 0x0f, 0x52, 0x53, 0x2a, + 0xdf, 0xe6, 0x62, 0xbc, 0x24, 0xdc, 0x9b, 0xfa, 0xbe, 0xc7, 0x19, 0x1f, 0xa2, 0x4b, 0x82, 0xc8, + 0x18, 0xdb, 0x2c, 0x88, 0x38, 0x14, 0x5d, 0x2f, 0x9e, 0x25, 0x66, 0x39, 0xfb, 0xc0, 0x0e, 0xbf, + 0xf7, 0x7e, 0x18, 0xc7, 0x96, 0xc1, 0x4b, 0x1f, 0xa6, 0x0d, 0x99, 0x7d, 0x10, 0x7a, 0xe3, 0x22, + 0x9c, 0xc4, 0x46, 0x2d, 0xe4, 0xa9, 0x0d, 0xd5, 0x53, 0x43, 0xd6, 0x8f, 0x11, 0x6b, 0x1c, 0xf7, + 0x2d, 0xa6, 0xec, 0xf2, 0xd3, 0x69, 0xd7, 0x3b, 0x7e, 0x66, 0x3d, 0x4e, 0xfd, 0xc4, 0x32, 0x9e, + 0x5b, 0x1f, 0x5a, 0xd3, 0x5d, 0x2c, 0x41, 0x36, 0x9c, 0xf8, 0x52, 0x1a, 0x68, 0xea, 0x8b, 0x02, + 0xee, 0x82, 0x56, 0xab, 0x6b, 0xb8, 0x7f, 0x79, 0xbe, 0x22, 0xc6, 0x70, 0x1f, 0xb5, 0xb9, 0xb1, + 0x5b, 0x51, 0xe4, 0xbd, 0xed, 0xdd, 0x8d, 0xad, 0x8a, 0x18, 0x0f, 0x37, 0xec, 0xdf, 0x8b, 0x41, + 0xae, 0xfb, 0xec, 0x25, 0xfd, 0x18, 0x9c, 0xe2, 0x17, 0x25, 0x2e, 0xf2, 0x94, 0x9b, 0xba, 0x43, + 0xd6, 0x62, 0x4b, 0xa5, 0xfb, 0xa2, 0x9f, 0x0d, 0xd3, 0xcc, 0xaa, 0x86, 0xbc, 0x67, 0x74, 0x07, + 0xaf, 0xb4, 0x96, 0xea, 0x49, 0x9b, 0x70, 0xc6, 0xb4, 0x14, 0xd7, 0x53, 0xcd, 0x86, 0xea, 0x34, + 0x94, 0xe0, 0x8a, 0x4a, 0x51, 0x35, 0x0d, 0xb9, 0xae, 0x45, 0xf7, 0x40, 0x9f, 0xe5, 0xe3, 0xa6, + 0x55, 0x63, 0xc6, 0xc1, 0xe6, 0x50, 0x66, 0xa6, 0x3d, 0x99, 0x1b, 0x3f, 0x2a, 0x73, 0x3f, 0x06, + 0xe9, 0x96, 0x6a, 0x2b, 0xc8, 0xf4, 0x9c, 0x0e, 0xe9, 0xb8, 0x53, 0x72, 0xaa, 0xa5, 0xda, 0x15, + 0xfc, 0xfc, 0xd1, 0x1c, 0x7c, 0xfe, 0x31, 0x0e, 0xd9, 0x70, 0xd7, 0x8d, 0x0f, 0x31, 0x1a, 0xd9, + 0xa0, 0x04, 0x52, 0xc2, 0xee, 0xbf, 0x67, 0x8f, 0x3e, 0xb7, 0x8a, 0x77, 0xae, 0xd2, 0x28, 0xed, + 0x85, 0x65, 0x8a, 0xc4, 0x5d, 0x03, 0x4e, 0x2d, 0x44, 0x7b, 0x8f, 0x94, 0xcc, 0x9e, 0xa4, 0x75, + 0x18, 0xbd, 0xe6, 0x12, 0xee, 0x51, 0xc2, 0xfd, 0xc0, 0xbd, 0xb9, 0x9f, 0xae, 0x11, 0xf2, 0xf4, + 0xd3, 0x35, 0x65, 0xbb, 0x2a, 0x6f, 0x95, 0x37, 0x65, 0x06, 0x97, 0x4e, 0x43, 0xc2, 0x50, 0x6f, + 0x75, 0xba, 0xf7, 0x38, 0x22, 0x1a, 0x36, 0xf0, 0xa7, 0x21, 0x71, 0x13, 0xa9, 0xd7, 0xbb, 0x77, + 0x16, 0x22, 0xfa, 0x10, 0x53, 0x7f, 0x1e, 0x92, 0x24, 0x5e, 0x12, 0x00, 0x8b, 0x98, 0x38, 0x22, + 0xa5, 0x20, 0xb1, 0x5a, 0x95, 0x71, 0xfa, 0x8b, 0x90, 0xa5, 0x52, 0x65, 0x67, 0xa3, 0xb2, 0x5a, + 0x11, 0x63, 0xc5, 0x25, 0x18, 0xa5, 0x41, 0xc0, 0x4b, 0xc3, 0x0f, 0x83, 0x38, 0xc2, 0x1e, 0x19, + 0x87, 0xc0, 0xb5, 0x7b, 0x5b, 0x2b, 0x15, 0x59, 0x8c, 0x85, 0xa7, 0xd7, 0x85, 0x6c, 0xb8, 0xe1, + 0xfe, 0x68, 0x72, 0xea, 0xbb, 0x02, 0x64, 0x42, 0x0d, 0x34, 0xee, 0x7c, 0x54, 0xc3, 0xb0, 0x6e, + 0x2a, 0xaa, 0xa1, 0xab, 0x2e, 0x4b, 0x0a, 0x20, 0xa2, 0x32, 0x96, 0x0c, 0x3b, 0x69, 0x1f, 0x89, + 0xf3, 0xaf, 0x08, 0x20, 0xf6, 0xf6, 0xae, 0x3d, 0x0e, 0x0a, 0x3f, 0x52, 0x07, 0x5f, 0x16, 0x20, + 0xd7, 0xdd, 0xb0, 0xf6, 0xb8, 0x77, 0xee, 0x47, 0xea, 0xde, 0x5b, 0x31, 0x18, 0xef, 0x6a, 0x53, + 0x87, 0xf5, 0xee, 0x73, 0x30, 0xa9, 0x37, 0x50, 0xcb, 0xb6, 0x3c, 0x64, 0x6a, 0x1d, 0xc5, 0x40, + 0x37, 0x90, 0x91, 0x2f, 0x92, 0x42, 0x31, 0x7f, 0xef, 0x46, 0x78, 0x6e, 0x23, 0xc0, 0x6d, 0x62, + 0x58, 0x69, 0x6a, 0x63, 0xad, 0xb2, 0xb5, 0x53, 0xdd, 0xad, 0x6c, 0xaf, 0x3e, 0xa7, 0xec, 0x6d, + 0xff, 0xc4, 0x76, 0xf5, 0x99, 0x6d, 0x59, 0xd4, 0x7b, 0xcc, 0x3e, 0xc4, 0xa5, 0xbe, 0x03, 0x62, + 0xaf, 0x53, 0xd2, 0x29, 0x18, 0xe4, 0x96, 0x38, 0x22, 0x4d, 0xc1, 0xc4, 0x76, 0x55, 0xa9, 0x6d, + 0xac, 0x55, 0x94, 0xca, 0x95, 0x2b, 0x95, 0xd5, 0xdd, 0x1a, 0xbd, 0xda, 0xf0, 0xad, 0x77, 0xbb, + 0x17, 0xf5, 0x4b, 0x71, 0x98, 0x1a, 0xe0, 0x89, 0x54, 0x66, 0x87, 0x12, 0x7a, 0x4e, 0x7a, 0x7c, + 0x18, 0xef, 0xe7, 0x70, 0x57, 0xb0, 0xa3, 0x3a, 0x1e, 0x3b, 0xc3, 0x3c, 0x0c, 0x38, 0x4a, 0xa6, + 0xa7, 0xef, 0xeb, 0xc8, 0x61, 0x37, 0x41, 0xf4, 0xa4, 0x32, 0x11, 0xc8, 0xe9, 0x65, 0xd0, 0x63, + 0x20, 0xd9, 0x96, 0xab, 0x7b, 0xfa, 0x0d, 0xa4, 0xe8, 0x26, 0xbf, 0x36, 0xc2, 0x27, 0x97, 0x84, + 0x2c, 0x72, 0xcd, 0x86, 0xe9, 0xf9, 0xd6, 0x26, 0x6a, 0xaa, 0x3d, 0xd6, 0xb8, 0x80, 0xc7, 0x65, + 0x91, 0x6b, 0x7c, 0xeb, 0x73, 0x90, 0x6d, 0x58, 0x6d, 0xdc, 0xce, 0x51, 0x3b, 0xbc, 0x5f, 0x08, + 0x72, 0x86, 0xca, 0x7c, 0x13, 0xd6, 0xa8, 0x07, 0xf7, 0x55, 0x59, 0x39, 0x43, 0x65, 0xd4, 0xe4, + 0x21, 0x98, 0x50, 0x9b, 0x4d, 0x07, 0x93, 0x73, 0x22, 0x7a, 0xf4, 0xc8, 0xf9, 0x62, 0x62, 0x38, + 0xf3, 0x34, 0xa4, 0x78, 0x1c, 0xf0, 0x96, 0x8c, 0x23, 0xa1, 0xd8, 0xf4, 0x3c, 0x1d, 0x9b, 0x4d, + 0xcb, 0x29, 0x93, 0x2b, 0xcf, 0x41, 0x56, 0x77, 0x95, 0xe0, 0xfa, 0x3d, 0x76, 0x36, 0x36, 0x9b, + 0x92, 0x33, 0xba, 0xeb, 0x5f, 0x5d, 0x16, 0x5f, 0x8d, 0x41, 0xae, 0xfb, 0xf3, 0x81, 0xb4, 0x06, + 0x29, 0xc3, 0xd2, 0x54, 0x92, 0x5a, 0xf4, 0xdb, 0xd5, 0x6c, 0xc4, 0x17, 0x87, 0xb9, 0x4d, 0x66, + 0x2f, 0xfb, 0xc8, 0x99, 0xbf, 0x13, 0x20, 0xc5, 0xc5, 0xd2, 0x49, 0x48, 0xd8, 0xaa, 0x77, 0x40, + 0xe8, 0x92, 0x2b, 0x31, 0x51, 0x90, 0xc9, 0x33, 0x96, 0xbb, 0xb6, 0x6a, 0x92, 0x14, 0x60, 0x72, + 0xfc, 0x8c, 0xe7, 0xd5, 0x40, 0x6a, 0x83, 0x9c, 0x6b, 0xac, 0x56, 0x0b, 0x99, 0x9e, 0xcb, 0xe7, + 0x95, 0xc9, 0x57, 0x99, 0x58, 0x7a, 0x14, 0x26, 0x3d, 0x47, 0xd5, 0x8d, 0x2e, 0xdb, 0x04, 0xb1, + 0x15, 0xb9, 0xc2, 0x37, 0x2e, 0xc1, 0x69, 0xce, 0xdb, 0x40, 0x9e, 0xaa, 0x1d, 0xa0, 0x46, 0x00, + 0x1a, 0x25, 0xf7, 0x17, 0xa7, 0x98, 0xc1, 0x1a, 0xd3, 0x73, 0x6c, 0xf1, 0xfb, 0x02, 0x4c, 0xf2, + 0x93, 0x58, 0xc3, 0x0f, 0xd6, 0x16, 0x80, 0x6a, 0x9a, 0x96, 0x17, 0x0e, 0x57, 0x7f, 0x2a, 0xf7, + 0xe1, 0xe6, 0xca, 0x3e, 0x48, 0x0e, 0x11, 0xcc, 0xb4, 0x00, 0x02, 0xcd, 0x91, 0x61, 0x3b, 0x03, + 0x19, 0xf6, 0x6d, 0x88, 0x7c, 0x60, 0xa4, 0x67, 0x77, 0xa0, 0x22, 0x7c, 0x64, 0x93, 0xa6, 0x21, + 0x59, 0x47, 0x4d, 0xdd, 0x64, 0x37, 0xbe, 0xf4, 0x81, 0xdf, 0xb0, 0x24, 0xfc, 0x1b, 0x96, 0x95, + 0xcf, 0xc2, 0x94, 0x66, 0xb5, 0x7a, 0xdd, 0x5d, 0x11, 0x7b, 0xee, 0x0f, 0xdc, 0xab, 0xc2, 0xf3, + 0x10, 0xb4, 0x98, 0xef, 0x0b, 0xc2, 0x57, 0x63, 0xf1, 0xf5, 0x9d, 0x95, 0xaf, 0xc7, 0x66, 0xd6, + 0x29, 0x74, 0x87, 0x8f, 0x54, 0x46, 0xfb, 0x06, 0xd2, 0xb0, 0xf7, 0xf0, 0xb5, 0x47, 0xe1, 0xf1, + 0xa6, 0xee, 0x1d, 0xb4, 0xeb, 0x73, 0x9a, 0xd5, 0x9a, 0x6f, 0x5a, 0x4d, 0x2b, 0xf8, 0xa6, 0x8a, + 0x9f, 0xc8, 0x03, 0xf9, 0x8b, 0x7d, 0x57, 0x4d, 0xfb, 0xd2, 0x99, 0xc8, 0x8f, 0xb0, 0xa5, 0x6d, + 0x98, 0x62, 0xc6, 0x0a, 0xf9, 0xb0, 0x43, 0x8f, 0x27, 0xd2, 0x3d, 0x2f, 0xc7, 0xf2, 0xdf, 0x7c, + 0x87, 0x6c, 0xd7, 0xf2, 0x24, 0x83, 0x62, 0x1d, 0x3d, 0xc1, 0x94, 0x64, 0x38, 0xd1, 0xc5, 0x47, + 0x97, 0x26, 0x72, 0x22, 0x18, 0xbf, 0xc7, 0x18, 0xa7, 0x42, 0x8c, 0x35, 0x06, 0x2d, 0xad, 0xc2, + 0xf8, 0x71, 0xb8, 0xfe, 0x86, 0x71, 0x65, 0x51, 0x98, 0x64, 0x1d, 0x26, 0x08, 0x89, 0xd6, 0x76, + 0x3d, 0xab, 0x45, 0xea, 0xde, 0xbd, 0x69, 0xfe, 0xf6, 0x1d, 0xba, 0x56, 0x72, 0x18, 0xb6, 0xea, + 0xa3, 0x4a, 0x25, 0x20, 0xdf, 0xb2, 0x1a, 0x48, 0x33, 0x22, 0x18, 0x5e, 0x67, 0x8e, 0xf8, 0xf6, + 0xa5, 0xcf, 0xc0, 0x34, 0xfe, 0x9b, 0x94, 0xa5, 0xb0, 0x27, 0xd1, 0x37, 0x69, 0xf9, 0xef, 0xbf, + 0x48, 0x97, 0xe3, 0x94, 0x4f, 0x10, 0xf2, 0x29, 0x34, 0x8b, 0x4d, 0xe4, 0x79, 0xc8, 0x71, 0x15, + 0xd5, 0x18, 0xe4, 0x5e, 0xe8, 0x2a, 0x22, 0xff, 0xa5, 0x77, 0xbb, 0x67, 0x71, 0x9d, 0x22, 0xcb, + 0x86, 0x51, 0xda, 0x83, 0x53, 0x03, 0xb2, 0x62, 0x08, 0xce, 0x97, 0x18, 0xe7, 0x74, 0x5f, 0x66, + 0x60, 0xda, 0x1d, 0xe0, 0x72, 0x7f, 0x2e, 0x87, 0xe0, 0xfc, 0x2d, 0xc6, 0x29, 0x31, 0x2c, 0x9f, + 0x52, 0xcc, 0xf8, 0x34, 0x4c, 0xde, 0x40, 0x4e, 0xdd, 0x72, 0xd9, 0xf5, 0xcf, 0x10, 0x74, 0x2f, + 0x33, 0xba, 0x09, 0x06, 0x24, 0xf7, 0x41, 0x98, 0xeb, 0x12, 0xa4, 0xf6, 0x55, 0x0d, 0x0d, 0x41, + 0xf1, 0x65, 0x46, 0x31, 0x86, 0xed, 0x31, 0xb4, 0x0c, 0xd9, 0xa6, 0xc5, 0x76, 0xa6, 0x68, 0xf8, + 0x2b, 0x0c, 0x9e, 0xe1, 0x18, 0x46, 0x61, 0x5b, 0x76, 0xdb, 0xc0, 0xdb, 0x56, 0x34, 0xc5, 0x6f, + 0x73, 0x0a, 0x8e, 0x61, 0x14, 0xc7, 0x08, 0xeb, 0xef, 0x70, 0x0a, 0x37, 0x14, 0xcf, 0xa7, 0x20, + 0x63, 0x99, 0x46, 0xc7, 0x32, 0x87, 0x71, 0xe2, 0x2b, 0x8c, 0x01, 0x18, 0x04, 0x13, 0x5c, 0x86, + 0xf4, 0xb0, 0x13, 0xf1, 0x7b, 0xef, 0xf2, 0xe5, 0xc1, 0x67, 0x60, 0x1d, 0x26, 0x78, 0x81, 0xd2, + 0x2d, 0x73, 0x08, 0x8a, 0xaf, 0x31, 0x8a, 0x5c, 0x08, 0xc6, 0x86, 0xe1, 0x21, 0xd7, 0x6b, 0xa2, + 0x61, 0x48, 0x5e, 0xe5, 0xc3, 0x60, 0x10, 0x16, 0xca, 0x3a, 0x32, 0xb5, 0x83, 0xe1, 0x18, 0x5e, 0xe3, 0xa1, 0xe4, 0x18, 0x4c, 0xb1, 0x0a, 0xe3, 0x2d, 0xd5, 0x71, 0x0f, 0x54, 0x63, 0xa8, 0xe9, 0xf8, 0x7d, 0xc6, 0x91, 0xf5, 0x41, 0x2c, 0x22, 0x6d, 0xf3, 0x38, 0x34, 0x5f, 0xe7, 0x11, 0x09, 0xc1, 0xd8, 0xd2, 0x73, 0x3d, 0x72, 0x57, 0x76, 0x1c, 0xb6, 0x3f, 0xe0, 0x4b, 0x8f, 0x62, 0xb7, 0xc2, 0x8c, 0x97, 0x21, 0xed, 0xea, 0xb7, 0x86, 0xa2, 0xf9, 0x43, 0x3e, 0xd3, 0x04, 0x80, 0xc1, - 0xcf, 0xc3, 0xe9, 0x81, 0xdb, 0xc4, 0x10, 0x64, 0x7f, 0xc4, 0xc8, 0x4e, 0x0e, 0xd8, 0x2a, 0x58, + 0xcf, 0xc1, 0xe9, 0x81, 0xdb, 0xc4, 0x10, 0x64, 0x7f, 0xc4, 0xc8, 0x4e, 0x0e, 0xd8, 0x2a, 0x58, 0x49, 0x38, 0x2e, 0xe5, 0x1f, 0xf3, 0x92, 0x80, 0x7a, 0xb8, 0x76, 0xf0, 0x59, 0xc1, 0x55, 0xf7, 0x8f, 0x17, 0xb5, 0x3f, 0xe1, 0x51, 0xa3, 0xd8, 0xae, 0xa8, 0xed, 0xc2, 0x49, 0xc6, 0x78, 0xbc, - 0x79, 0xfd, 0x06, 0x2f, 0xac, 0x14, 0xbd, 0xd7, 0x3d, 0xbb, 0x9f, 0x81, 0x19, 0x3f, 0x9c, 0xbc, + 0x79, 0xfd, 0x06, 0x2f, 0xac, 0x14, 0xbd, 0xd7, 0x3d, 0xbb, 0x9f, 0x85, 0x19, 0x3f, 0x9c, 0xbc, 0x29, 0x75, 0x95, 0x96, 0x6a, 0x0f, 0xc1, 0xfc, 0x4d, 0xc6, 0xcc, 0x2b, 0xbe, 0xdf, 0xd5, 0xba, - 0x5b, 0xaa, 0x8d, 0xc9, 0x9f, 0x83, 0x3c, 0x27, 0x6f, 0x9b, 0x0e, 0xd2, 0xac, 0xa6, 0xa9, 0xdf, + 0x5b, 0xaa, 0x8d, 0xc9, 0x9f, 0x85, 0x3c, 0x27, 0x6f, 0x9b, 0x0e, 0xd2, 0xac, 0xa6, 0xa9, 0xdf, 0x42, 0x8d, 0x21, 0xa8, 0xff, 0xb4, 0x67, 0xaa, 0xf6, 0x42, 0x70, 0xcc, 0xbc, 0x01, 0xa2, 0xdf, 0xab, 0x28, 0x7a, 0xcb, 0xb6, 0x1c, 0x2f, 0x82, 0xf1, 0xcf, 0xf8, 0x4c, 0xf9, 0xb8, 0x0d, 0x02, 0x2b, 0x55, 0x20, 0x47, 0x1e, 0x87, 0x4d, 0xc9, 0x3f, 0x67, 0x44, 0xe3, 0x01, 0x8a, 0x15, 0x0e, 0xcd, 0x6a, 0xd9, 0xaa, 0x33, 0x4c, 0xfd, 0xfb, 0x0b, 0x5e, 0x38, 0x18, 0x84, 0x15, 0x0e, 0xaf, 0x63, 0x23, 0xbc, 0xdb, 0x0f, 0xc1, 0xf0, 0x2d, 0x5e, 0x38, 0x38, 0x86, 0x51, 0xf0, 0x86, 0x61, - 0x08, 0x8a, 0xbf, 0xe4, 0x14, 0x1c, 0x83, 0x29, 0x3e, 0x15, 0x6c, 0xb4, 0x0e, 0x6a, 0xea, 0xae, - 0xe7, 0xd0, 0x56, 0xf8, 0xde, 0x54, 0xdf, 0x7e, 0xa7, 0xbb, 0x09, 0x93, 0x43, 0x50, 0x5c, 0x89, + 0x08, 0x8a, 0xbf, 0xe4, 0x14, 0x1c, 0x83, 0x29, 0x3e, 0x1d, 0x6c, 0xb4, 0x0e, 0x6a, 0xea, 0xae, + 0xe7, 0xd0, 0x56, 0xf8, 0xde, 0x54, 0xdf, 0x7e, 0xb7, 0xbb, 0x09, 0x93, 0x43, 0x50, 0x5c, 0x89, 0xd8, 0x15, 0x2a, 0x39, 0x29, 0x45, 0x3b, 0xf6, 0x1d, 0x5e, 0x89, 0x42, 0x30, 0xec, 0x5b, 0xa8, 0x43, 0xc4, 0x61, 0xd7, 0xf0, 0xf9, 0x60, 0x08, 0xba, 0xef, 0xf6, 0x38, 0x57, 0xe3, 0x58, 0xcc, 0x19, 0xea, 0x7f, 0xda, 0xe6, 0x75, 0xd4, 0x19, 0x2a, 0x3b, 0xff, 0xaa, 0xa7, 0xff, 0xd9, 0xa3, 0x48, 0x5a, 0x43, 0x26, 0x7a, 0xfa, 0x29, 0x29, 0xea, 0x57, 0x40, 0xf9, 0x9f, 0xbe, 0xcb, 0xc6, - 0xdb, 0xdd, 0x4e, 0x95, 0x36, 0x71, 0x92, 0x77, 0x37, 0x3d, 0xd1, 0x64, 0x2f, 0xdd, 0xf5, 0xf3, + 0xdb, 0xdd, 0x4e, 0x95, 0x36, 0x71, 0x92, 0x77, 0x37, 0x3d, 0xd1, 0x64, 0x2f, 0xde, 0xf5, 0xf3, 0xbc, 0xab, 0xe7, 0x29, 0x5d, 0x81, 0xf1, 0xae, 0x86, 0x27, 0x9a, 0xea, 0x67, 0x18, 0x55, 0x36, 0xdc, 0xef, 0x94, 0x96, 0x20, 0x81, 0x9b, 0x97, 0x68, 0xf8, 0xcf, 0x32, 0x38, 0x31, 0x2f, 0x7d, - 0x02, 0x52, 0xbc, 0x69, 0x89, 0x86, 0xfe, 0x1c, 0x83, 0xfa, 0x10, 0x0c, 0xe7, 0x0d, 0x4b, 0x34, + 0x12, 0x52, 0xbc, 0x69, 0x89, 0x86, 0xfe, 0x1c, 0x83, 0xfa, 0x10, 0x0c, 0xe7, 0x0d, 0x4b, 0x34, 0xfc, 0xe7, 0x39, 0x9c, 0x43, 0x30, 0x7c, 0xf8, 0x10, 0xfe, 0xf5, 0x2f, 0x24, 0xd8, 0xa6, 0xc3, - 0x63, 0x77, 0x19, 0xc6, 0x58, 0xa7, 0x12, 0x8d, 0xfe, 0x1c, 0x7b, 0x39, 0x47, 0x94, 0x2e, 0x40, + 0x63, 0x77, 0x19, 0xc6, 0x58, 0xa7, 0x12, 0x8d, 0xfe, 0x3c, 0x7b, 0x39, 0x47, 0x94, 0x2e, 0x40, 0x72, 0xc8, 0x80, 0xff, 0x12, 0x83, 0x52, 0xfb, 0xd2, 0x2a, 0x64, 0x42, 0xdd, 0x49, 0x34, 0xfc, 0x97, 0x19, 0x3c, 0x8c, 0xc2, 0xae, 0xb3, 0xee, 0x24, 0x9a, 0xe0, 0x57, 0xb8, 0xeb, 0x0c, 0x81, - 0xc3, 0xc6, 0x1b, 0x93, 0x68, 0xf4, 0xaf, 0xf2, 0xa8, 0x73, 0x48, 0xe9, 0x69, 0x48, 0xfb, 0x9b, - 0x4d, 0x34, 0xfe, 0xd7, 0x18, 0x3e, 0xc0, 0xe0, 0x08, 0x84, 0x36, 0xbb, 0x68, 0x8a, 0xcf, 0xf3, + 0xc3, 0xc6, 0x1b, 0x93, 0x68, 0xf4, 0xaf, 0xf2, 0xa8, 0x73, 0x48, 0xe9, 0x29, 0x48, 0xfb, 0x9b, + 0x4d, 0x34, 0xfe, 0xd7, 0x18, 0x3e, 0xc0, 0xe0, 0x08, 0x84, 0x36, 0xbb, 0x68, 0x8a, 0x2f, 0xf0, 0x08, 0x84, 0x50, 0x78, 0x19, 0xf5, 0x36, 0x30, 0xd1, 0x4c, 0xbf, 0xce, 0x97, 0x51, 0x4f, 0xff, 0x82, 0x67, 0x93, 0xd4, 0xfc, 0x68, 0x8a, 0xdf, 0xe0, 0xb3, 0x49, 0xec, 0xb1, 0x1b, 0xbd, 0x1d, 0x41, 0x34, 0xc7, 0x6f, 0x72, 0x37, 0x7a, 0x1a, 0x82, 0xd2, 0x0e, 0x48, 0xfd, 0xdd, 0x40, 0x34, - 0xdf, 0x17, 0x18, 0xdf, 0x64, 0x5f, 0x33, 0x50, 0x7a, 0x16, 0x4e, 0x0e, 0xee, 0x04, 0xa2, 0x59, - 0xbf, 0x78, 0xb7, 0xe7, 0xec, 0x16, 0x6e, 0x04, 0x4a, 0xbb, 0xc1, 0x96, 0x12, 0xee, 0x02, 0xa2, - 0x69, 0x5f, 0xbe, 0xdb, 0x5d, 0xb8, 0xc3, 0x4d, 0x40, 0xa9, 0x0c, 0x10, 0x6c, 0xc0, 0xd1, 0x5c, - 0xaf, 0x30, 0xae, 0x10, 0x08, 0x2f, 0x0d, 0xb6, 0xff, 0x46, 0xe3, 0xbf, 0xc4, 0x97, 0x06, 0x43, - 0xe0, 0xa5, 0xc1, 0xb7, 0xde, 0x68, 0xf4, 0xab, 0x7c, 0x69, 0x70, 0x08, 0xce, 0xec, 0xd0, 0xee, - 0x16, 0xcd, 0xf0, 0x65, 0x9e, 0xd9, 0x21, 0x54, 0x69, 0x1b, 0x26, 0xfb, 0x36, 0xc4, 0x68, 0xaa, - 0xaf, 0x30, 0x2a, 0xb1, 0x77, 0x3f, 0x0c, 0x6f, 0x5e, 0x6c, 0x33, 0x8c, 0x66, 0xfb, 0xdd, 0x9e, + 0xdf, 0x17, 0x19, 0xdf, 0x64, 0x5f, 0x33, 0x50, 0x7a, 0x06, 0x4e, 0x0e, 0xee, 0x04, 0xa2, 0x59, + 0xbf, 0x74, 0xb7, 0xe7, 0xec, 0x16, 0x6e, 0x04, 0x4a, 0xbb, 0xc1, 0x96, 0x12, 0xee, 0x02, 0xa2, + 0x69, 0x5f, 0xba, 0xdb, 0x5d, 0xb8, 0xc3, 0x4d, 0x40, 0xa9, 0x0c, 0x10, 0x6c, 0xc0, 0xd1, 0x5c, + 0x2f, 0x33, 0xae, 0x10, 0x08, 0x2f, 0x0d, 0xb6, 0xff, 0x46, 0xe3, 0xbf, 0xcc, 0x97, 0x06, 0x43, + 0xe0, 0xa5, 0xc1, 0xb7, 0xde, 0x68, 0xf4, 0x2b, 0x7c, 0x69, 0x70, 0x08, 0xce, 0xec, 0xd0, 0xee, + 0x16, 0xcd, 0xf0, 0x15, 0x9e, 0xd9, 0x21, 0x54, 0x69, 0x1b, 0x26, 0xfb, 0x36, 0xc4, 0x68, 0xaa, + 0xaf, 0x32, 0x2a, 0xb1, 0x77, 0x3f, 0x0c, 0x6f, 0x5e, 0x6c, 0x33, 0x8c, 0x66, 0xfb, 0xdd, 0x9e, 0xcd, 0x8b, 0xed, 0x85, 0xa5, 0xcb, 0x90, 0x32, 0xdb, 0x86, 0x81, 0x17, 0x8f, 0x74, 0xef, 0x5f, - 0xee, 0xe5, 0xff, 0xf9, 0x7d, 0x16, 0x1d, 0x0e, 0x28, 0x2d, 0x41, 0x12, 0xb5, 0xea, 0xa8, 0x11, - 0x85, 0xfc, 0x97, 0xf7, 0x79, 0xc1, 0xc4, 0xd6, 0xa5, 0xa7, 0x01, 0xe8, 0xd5, 0x08, 0xf9, 0xec, - 0x17, 0x81, 0xfd, 0xd7, 0xf7, 0xd9, 0x6f, 0x6a, 0x02, 0x48, 0x40, 0x40, 0x7f, 0xa1, 0x73, 0x6f, - 0x82, 0x77, 0xba, 0x09, 0xc8, 0x8c, 0x5c, 0x82, 0xb1, 0x6b, 0xae, 0x65, 0x7a, 0x6a, 0x33, 0x0a, + 0xee, 0xe5, 0xff, 0xf9, 0x03, 0x16, 0x1d, 0x0e, 0x28, 0x2d, 0x41, 0x12, 0xb5, 0xea, 0xa8, 0x11, + 0x85, 0xfc, 0x97, 0x0f, 0x78, 0xc1, 0xc4, 0xd6, 0xa5, 0xa7, 0x00, 0xe8, 0xd5, 0x08, 0xf9, 0xec, + 0x17, 0x81, 0xfd, 0xd7, 0x0f, 0xd8, 0x6f, 0x6a, 0x02, 0x48, 0x40, 0x40, 0x7f, 0xa1, 0x73, 0x6f, + 0x82, 0x77, 0xbb, 0x09, 0xc8, 0x8c, 0x5c, 0x82, 0xb1, 0x6b, 0xae, 0x65, 0x7a, 0x6a, 0x33, 0x0a, 0xfd, 0x6f, 0x0c, 0xcd, 0xed, 0x71, 0xc0, 0x5a, 0x96, 0x83, 0x3c, 0xb5, 0xe9, 0x46, 0x61, 0xff, 0x9d, 0x61, 0x7d, 0x00, 0x06, 0x6b, 0xaa, 0xeb, 0x0d, 0x33, 0xee, 0xff, 0xe0, 0x60, 0x0e, 0xc0, - 0x4e, 0xe3, 0xbf, 0xaf, 0xa3, 0x4e, 0x14, 0xf6, 0x5d, 0xee, 0x34, 0xb3, 0x2f, 0x7d, 0x02, 0xd2, + 0x4e, 0xe3, 0xbf, 0xaf, 0xa3, 0x4e, 0x14, 0xf6, 0x3d, 0xee, 0x34, 0xb3, 0x2f, 0x7d, 0x12, 0xd2, 0xf8, 0x4f, 0xfa, 0x43, 0xb9, 0x08, 0xf0, 0x7f, 0x32, 0x70, 0x80, 0xc0, 0x6f, 0x76, 0xbd, 0x86, 0xa7, 0x47, 0x07, 0xfb, 0xbf, 0xd8, 0x4c, 0x73, 0xfb, 0x52, 0x19, 0x32, 0xae, 0xd7, 0x68, 0xb4, - 0x59, 0x7f, 0x1a, 0x01, 0xff, 0xef, 0xf7, 0xfd, 0x2b, 0x0b, 0x1f, 0x83, 0x67, 0xfb, 0xe6, 0x75, + 0x59, 0x7f, 0x1a, 0x01, 0xff, 0xef, 0x0f, 0xfc, 0x2b, 0x0b, 0x1f, 0x83, 0x67, 0xfb, 0xe6, 0x75, 0xcf, 0xb6, 0xc8, 0x67, 0x8e, 0x28, 0x86, 0xbb, 0x8c, 0x21, 0x04, 0x59, 0xa9, 0x0c, 0xbe, 0xbe, - 0x85, 0x75, 0x6b, 0xdd, 0xa2, 0x17, 0xb7, 0x2f, 0x14, 0xa3, 0x6f, 0x60, 0xe1, 0x7f, 0x52, 0x70, + 0x85, 0x75, 0x6b, 0xdd, 0xa2, 0x17, 0xb7, 0xcf, 0x17, 0xa3, 0x6f, 0x60, 0xe1, 0x7f, 0x52, 0x70, 0x42, 0xb3, 0x5a, 0x75, 0xcb, 0x9d, 0xaf, 0x5b, 0xde, 0xc1, 0xbc, 0x65, 0x32, 0x32, 0x29, 0x6e, 0x99, 0x68, 0xe6, 0x78, 0x97, 0xb8, 0xc5, 0xd3, 0x90, 0xac, 0xb5, 0xeb, 0xf5, 0x8e, 0x24, 0x42, 0xdc, 0x6d, 0xd7, 0xd9, 0x2f, 0xad, 0xf0, 0x9f, 0xc5, 0x37, 0xe3, 0x30, 0x5e, 0x36, 0x8c, 0xdd, - 0x8e, 0x8d, 0xdc, 0xaa, 0x89, 0xaa, 0xfb, 0x52, 0x1e, 0x46, 0xc9, 0x28, 0x9f, 0x22, 0x66, 0xc2, + 0x8e, 0x8d, 0xdc, 0xaa, 0x89, 0xaa, 0xfb, 0x52, 0x1e, 0x46, 0xc9, 0x28, 0x9f, 0x24, 0x66, 0xc2, 0xd5, 0x11, 0x99, 0x3d, 0xfb, 0x9a, 0x05, 0x72, 0xbd, 0x1d, 0xf3, 0x35, 0x0b, 0xbe, 0xe6, 0x3c, 0xbd, 0xdd, 0xf6, 0x35, 0xe7, 0x7d, 0xcd, 0x22, 0xb9, 0xe3, 0x8e, 0xfb, 0x9a, 0x45, 0x5f, 0xb3, 0x44, 0xbe, 0xe1, 0x8c, 0xfb, 0x9a, 0x25, 0x5f, 0xb3, 0x4c, 0xbe, 0xda, 0x24, 0x7c, 0xcd, 0xb2, 0xaf, 0xb9, 0x40, 0x3e, 0xd6, 0x4c, 0xfa, 0x9a, 0x0b, 0xbe, 0xe6, 0x22, 0xf9, 0x40, 0x23, 0xf9, 0x9a, 0x8b, 0xbe, 0xe6, 0x12, 0xf9, 0x49, 0xd5, 0x98, 0xaf, 0xb9, 0x24, 0xcd, 0xc0, 0x18, 0x1d, - 0xd9, 0x93, 0xe4, 0x2b, 0xfe, 0xc4, 0xd5, 0x11, 0x99, 0x0b, 0x02, 0xdd, 0x53, 0xe4, 0x67, 0x53, - 0xa3, 0x81, 0xee, 0xa9, 0x40, 0xb7, 0x40, 0xfe, 0xf7, 0x86, 0x18, 0xe8, 0x16, 0x02, 0xdd, 0xf9, + 0xd9, 0x13, 0xe4, 0x2b, 0xfe, 0xc4, 0xd5, 0x11, 0x99, 0x0b, 0x02, 0xdd, 0x93, 0xe4, 0x67, 0x53, + 0xa3, 0x81, 0xee, 0xc9, 0x40, 0xb7, 0x40, 0xfe, 0xf7, 0x86, 0x18, 0xe8, 0x16, 0x02, 0xdd, 0xf9, 0xfc, 0x38, 0x4e, 0x8e, 0x40, 0x77, 0x3e, 0xd0, 0x2d, 0xe6, 0x73, 0x78, 0x06, 0x02, 0xdd, 0x62, - 0xa0, 0x5b, 0xca, 0x4f, 0x9c, 0x15, 0x66, 0xb3, 0x81, 0x6e, 0x49, 0x7a, 0x02, 0x32, 0x6e, 0xbb, + 0xa0, 0x5b, 0xca, 0x4f, 0x9c, 0x15, 0x66, 0xb3, 0x81, 0x6e, 0x49, 0x7a, 0x1c, 0x32, 0x6e, 0xbb, 0xae, 0xb0, 0x32, 0x4f, 0x7e, 0x9e, 0x95, 0x59, 0x80, 0x39, 0x9c, 0x13, 0x64, 0x5a, 0xaf, 0x8e, 0xc8, 0xe0, 0xb6, 0xeb, 0xac, 0x0a, 0xaf, 0x64, 0x81, 0x5c, 0x3e, 0x29, 0xe4, 0x57, 0xd5, 0xc5, 0x37, 0x04, 0x48, 0xef, 0xde, 0xb4, 0xc8, 0x37, 0x7c, 0xf7, 0xff, 0x79, 0x72, 0xb9, 0xd3, 0xe7, - 0x17, 0xc9, 0x67, 0xd6, 0xf4, 0x55, 0x41, 0xe6, 0x82, 0x40, 0xb7, 0x94, 0x7f, 0x80, 0x0c, 0xc8, + 0x17, 0xc9, 0x67, 0xd6, 0xf4, 0x55, 0x41, 0xe6, 0x82, 0x40, 0xb7, 0x94, 0xbf, 0x9f, 0x0c, 0xc8, 0xd7, 0x2d, 0x49, 0xf3, 0x90, 0x0d, 0x0d, 0x68, 0x81, 0xfc, 0x70, 0xaa, 0x7b, 0x44, 0x82, 0x9c, - 0x09, 0x46, 0xb4, 0xb0, 0x92, 0x04, 0x9c, 0xf6, 0xf8, 0x1f, 0xef, 0xa6, 0x55, 0xfc, 0x7c, 0x0c, + 0x09, 0x46, 0xb4, 0xb0, 0x92, 0x04, 0x9c, 0xf6, 0xf8, 0x1f, 0xef, 0xa6, 0x55, 0xfc, 0x42, 0x0c, 0x32, 0xf4, 0xbe, 0x9a, 0x8c, 0x0a, 0xbf, 0x8a, 0x1e, 0x69, 0x3a, 0xcc, 0x8d, 0x11, 0x99, 0x0b, - 0x24, 0x19, 0x80, 0x9a, 0xe2, 0x0c, 0xa7, 0x9e, 0xac, 0x3c, 0xf9, 0x0f, 0x6f, 0x9e, 0x79, 0xfc, - 0xc8, 0x15, 0x84, 0x63, 0x37, 0x4f, 0xeb, 0xf7, 0xdc, 0x9e, 0x6e, 0x7a, 0x4f, 0x2d, 0x5c, 0xc4, + 0x24, 0x19, 0x80, 0x9a, 0xe2, 0x0c, 0xa7, 0x9e, 0xac, 0x3c, 0xf1, 0x0f, 0x6f, 0x9e, 0x79, 0xec, + 0xc8, 0x15, 0x84, 0x63, 0x37, 0x4f, 0xeb, 0xf7, 0xdc, 0x9e, 0x6e, 0x7a, 0x4f, 0x2e, 0x5c, 0xc4, 0x01, 0x0e, 0x58, 0xa4, 0x3d, 0x48, 0xad, 0xaa, 0x2e, 0xf9, 0xc9, 0x25, 0x71, 0x3d, 0xb1, 0x72, 0xe1, 0x7f, 0xdf, 0x3c, 0x73, 0x3e, 0x82, 0x91, 0x95, 0xd6, 0xb9, 0xad, 0x0e, 0x66, 0x5d, 0x5e, 0xc4, 0xf0, 0xab, 0x23, 0xb2, 0x4f, 0x25, 0x2d, 0x70, 0x57, 0xb7, 0xd5, 0x16, 0xfd, 0x85, 0x58, 0x7c, 0x45, 0x3c, 0x7c, 0xf3, 0x4c, 0x76, 0xab, 0x13, 0xc8, 0x03, 0x57, 0xf0, 0xd3, 0x4a, 0x0a, - 0x46, 0xa9, 0xab, 0x2b, 0x6b, 0xaf, 0xdf, 0x29, 0x8c, 0xbc, 0x71, 0xa7, 0x30, 0xf2, 0xf7, 0x77, - 0x0a, 0x23, 0x6f, 0xdd, 0x29, 0x08, 0xef, 0xde, 0x29, 0x08, 0xef, 0xdd, 0x29, 0x08, 0xb7, 0x0f, - 0x0b, 0xc2, 0xd7, 0x0e, 0x0b, 0xc2, 0x37, 0x0e, 0x0b, 0xc2, 0xb7, 0x0f, 0x0b, 0xc2, 0xeb, 0x87, - 0x05, 0xe1, 0x8d, 0xc3, 0x82, 0xf0, 0xd6, 0x61, 0x41, 0xf8, 0xe1, 0x61, 0x61, 0xe4, 0xdd, 0xc3, - 0x82, 0xf0, 0xde, 0x61, 0x61, 0xe4, 0xf6, 0x0f, 0x0a, 0x23, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, - 0x73, 0xc4, 0x37, 0x6f, 0x6c, 0x37, 0x00, 0x00, + 0x46, 0xa9, 0xab, 0x2b, 0x57, 0x5f, 0xbf, 0x53, 0x18, 0x79, 0xe3, 0x4e, 0x61, 0xe4, 0xef, 0xef, + 0x14, 0x46, 0xde, 0xba, 0x53, 0x10, 0xde, 0xbb, 0x53, 0x10, 0xde, 0xbf, 0x53, 0x10, 0x6e, 0x1f, + 0x16, 0x84, 0xd7, 0x0e, 0x0b, 0xc2, 0x37, 0x0e, 0x0b, 0xc2, 0xb7, 0x0f, 0x0b, 0xc2, 0xeb, 0x87, + 0x05, 0xe1, 0x8d, 0xc3, 0x82, 0xf0, 0xd6, 0x61, 0x41, 0xf8, 0xc1, 0x61, 0x61, 0xe4, 0xbd, 0xc3, + 0x82, 0xf0, 0xfe, 0x61, 0x61, 0xe4, 0xf6, 0xdb, 0x85, 0x91, 0xd7, 0xde, 0x2e, 0x08, 0xff, 0x17, + 0x00, 0x00, 0xff, 0xff, 0xb6, 0xda, 0xab, 0xc3, 0x70, 0x37, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) @@ -3420,7 +4141,7 @@ func (m *Subby) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3428,26 +4149,33 @@ } func (m *Subby) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Subby) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Sub != nil { - dAtA[i] = 0xa - i++ + i -= len(*m.Sub) + copy(dAtA[i:], *m.Sub) i = encodeVarintOne(dAtA, i, uint64(len(*m.Sub))) - i += copy(dAtA[i:], *m.Sub) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *AllTypesOneOf) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3455,163 +4183,255 @@ } func (m *AllTypesOneOf) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.TestOneof != nil { - nn1, err1 := m.TestOneof.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + { + size := m.TestOneof.Size() + i -= size + if _, err := m.TestOneof.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn1 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field1) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x9 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field1) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - return i, nil + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field2) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x15 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - return i, nil + i-- + dAtA[i] = 0x15 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field3) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x18 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field3) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field3)) - return i, nil + i-- + dAtA[i] = 0x18 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field4) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x20 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field4) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field4)) - return i, nil + i-- + dAtA[i] = 0x20 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field5) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x28 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field5) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field5)) - return i, nil + i-- + dAtA[i] = 0x28 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field6) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x30 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field6) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field6)) - return i, nil + i-- + dAtA[i] = 0x30 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field7) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x38 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field7) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) - return i, nil + i-- + dAtA[i] = 0x38 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field8) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x40 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field8) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64((uint64(m.Field8)<<1)^uint64((m.Field8>>63)))) - return i, nil + i-- + dAtA[i] = 0x40 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field9) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x4d - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field9) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9)) - i += 4 - return i, nil + i-- + dAtA[i] = 0x4d + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field10) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x55 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field10) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10)) - i += 4 - return i, nil + i-- + dAtA[i] = 0x55 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field11) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x59 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field11) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11)) - i += 8 - return i, nil + i-- + dAtA[i] = 0x59 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field12) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x61 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field12) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12)) - i += 8 - return i, nil + i-- + dAtA[i] = 0x61 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field13) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x68 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field13) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i-- if m.Field13 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - return i, nil + i-- + dAtA[i] = 0x68 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field14) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x72 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field14) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= len(m.Field14) + copy(dAtA[i:], m.Field14) i = encodeVarintOne(dAtA, i, uint64(len(m.Field14))) - i += copy(dAtA[i:], m.Field14) - return i, nil + i-- + dAtA[i] = 0x72 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field15) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field15) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Field15 != nil { - dAtA[i] = 0x7a - i++ + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) i = encodeVarintOne(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + i-- + dAtA[i] = 0x7a } - return i, nil + return len(dAtA) - i, nil } func (m *AllTypesOneOf_SubMessage) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_SubMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.SubMessage != nil { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintOne(dAtA, i, uint64(m.SubMessage.Size())) - n2, err2 := m.SubMessage.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + { + size, err := m.SubMessage.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOne(dAtA, i, uint64(size)) } - i += n2 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } - return i, nil + return len(dAtA) - i, nil } func (m *TwoOneofs) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3619,95 +4439,139 @@ } func (m *TwoOneofs) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.One != nil { - nn3, err3 := m.One.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 - } - i += nn3 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Two != nil { - nn4, err4 := m.Two.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 + { + size := m.Two.Size() + i -= size + if _, err := m.Two.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn4 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.One != nil { + { + size := m.One.Size() + i -= size + if _, err := m.One.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + } } - return i, nil + return len(dAtA) - i, nil } func (m *TwoOneofs_Field1) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x9 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_Field1) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - return i, nil + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *TwoOneofs_Field2) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x15 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_Field2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - return i, nil + i-- + dAtA[i] = 0x15 + return len(dAtA) - i, nil } func (m *TwoOneofs_Field3) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x18 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_Field3) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field3)) - return i, nil + i-- + dAtA[i] = 0x18 + return len(dAtA) - i, nil } func (m *TwoOneofs_Field34) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x2 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_Field34) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= len(m.Field34) + copy(dAtA[i:], m.Field34) i = encodeVarintOne(dAtA, i, uint64(len(m.Field34))) - i += copy(dAtA[i:], m.Field34) - return i, nil + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0x92 + return len(dAtA) - i, nil } func (m *TwoOneofs_Field35) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_Field35) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Field35 != nil { - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x2 - i++ + i -= len(m.Field35) + copy(dAtA[i:], m.Field35) i = encodeVarintOne(dAtA, i, uint64(len(m.Field35))) - i += copy(dAtA[i:], m.Field35) + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0x9a } - return i, nil + return len(dAtA) - i, nil } func (m *TwoOneofs_SubMessage2) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_SubMessage2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.SubMessage2 != nil { - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x2 - i++ - i = encodeVarintOne(dAtA, i, uint64(m.SubMessage2.Size())) - n5, err5 := m.SubMessage2.MarshalTo(dAtA[i:]) - if err5 != nil { - return 0, err5 + { + size, err := m.SubMessage2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOne(dAtA, i, uint64(size)) } - i += n5 + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0xa2 } - return i, nil + return len(dAtA) - i, nil } func (m *CustomOneof) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3715,77 +4579,110 @@ } func (m *CustomOneof) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomOneof) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Custom != nil { - nn6, err6 := m.Custom.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 + { + size := m.Custom.Size() + i -= size + if _, err := m.Custom.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn6 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *CustomOneof_Stringy) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x2 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomOneof_Stringy) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= len(m.Stringy) + copy(dAtA[i:], m.Stringy) i = encodeVarintOne(dAtA, i, uint64(len(m.Stringy))) - i += copy(dAtA[i:], m.Stringy) - return i, nil + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0x92 + return len(dAtA) - i, nil } func (m *CustomOneof_CustomType) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x2 - i++ - i = encodeVarintOne(dAtA, i, uint64(m.CustomType.Size())) - n7, err7 := m.CustomType.MarshalTo(dAtA[i:]) - if err7 != nil { - return 0, err7 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomOneof_CustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + { + size := m.CustomType.Size() + i -= size + if _, err := m.CustomType.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintOne(dAtA, i, uint64(size)) } - i += n7 - return i, nil + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0x9a + return len(dAtA) - i, nil } func (m *CustomOneof_CastType) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0xa0 - i++ - dAtA[i] = 0x2 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomOneof_CastType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.CastType)) - return i, nil + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0xa0 + return len(dAtA) - i, nil } func (m *CustomOneof_MyCustomName) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0xa8 - i++ - dAtA[i] = 0x2 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomOneof_MyCustomName) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.MyCustomName)) - return i, nil + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0xa8 + return len(dAtA) - i, nil } func encodeVarintOne(dAtA []byte, offset int, v uint64) int { + offset -= sovOne(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedSubby(r randyOne, easy bool) *Subby { this := &Subby{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := string(randStringOne(r)) this.Sub = &v1 } @@ -5576,6 +6473,7 @@ func skipOne(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -5607,10 +6505,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -5631,55 +6527,30 @@ return 0, ErrInvalidLengthOne } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthOne - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowOne - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipOne(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthOne - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupOne + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthOne + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthOne = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowOne = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthOne = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowOne = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupOne = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/both/onepb_test.go golang-gogoprotobuf-1.3.1/test/oneof/combos/both/onepb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/both/onepb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/both/onepb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -489,6 +489,102 @@ } } +func TestSubbyCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSubby(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &Subby{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSubby(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestAllTypesOneOfCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedAllTypesOneOf(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &AllTypesOneOf{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedAllTypesOneOf(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestTwoOneofsCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedTwoOneofs(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &TwoOneofs{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedTwoOneofs(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestCustomOneofCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedCustomOneof(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &CustomOneof{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedCustomOneof(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} func TestOneDescription(t *testing.T) { OneDescription() } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/both/one.proto golang-gogoprotobuf-1.3.1/test/oneof/combos/both/one.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/both/one.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/both/one.proto 2020-05-17 12:22:58.000000000 +0000 @@ -54,6 +54,8 @@ option (gogoproto.unsafe_marshaler_all) = false; option (gogoproto.unsafe_unmarshaler_all) = false; +option (gogoproto.compare_all) = true; + message Subby { optional string sub = 1; } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/marshaler/one.pb.go golang-gogoprotobuf-1.3.1/test/oneof/combos/marshaler/one.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/marshaler/one.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/marshaler/one.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -30,7 +30,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Subby struct { Sub *string `protobuf:"bytes,1,opt,name=sub" json:"sub,omitempty"` @@ -52,7 +52,7 @@ return xxx_messageInfo_Subby.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -108,7 +108,7 @@ return xxx_messageInfo_AllTypesOneOf.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -133,55 +133,56 @@ VerboseEqual(interface{}) error MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type AllTypesOneOf_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof" json:"Field1,omitempty"` } type AllTypesOneOf_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof" json:"Field2,omitempty"` } type AllTypesOneOf_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof" json:"Field3,omitempty"` } type AllTypesOneOf_Field4 struct { - Field4 int64 `protobuf:"varint,4,opt,name=Field4,oneof"` + Field4 int64 `protobuf:"varint,4,opt,name=Field4,oneof" json:"Field4,omitempty"` } type AllTypesOneOf_Field5 struct { - Field5 uint32 `protobuf:"varint,5,opt,name=Field5,oneof"` + Field5 uint32 `protobuf:"varint,5,opt,name=Field5,oneof" json:"Field5,omitempty"` } type AllTypesOneOf_Field6 struct { - Field6 uint64 `protobuf:"varint,6,opt,name=Field6,oneof"` + Field6 uint64 `protobuf:"varint,6,opt,name=Field6,oneof" json:"Field6,omitempty"` } type AllTypesOneOf_Field7 struct { - Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,oneof"` + Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,oneof" json:"Field7,omitempty"` } type AllTypesOneOf_Field8 struct { - Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,oneof"` + Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,oneof" json:"Field8,omitempty"` } type AllTypesOneOf_Field9 struct { - Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,oneof"` + Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,oneof" json:"Field9,omitempty"` } type AllTypesOneOf_Field10 struct { - Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,oneof"` + Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,oneof" json:"Field10,omitempty"` } type AllTypesOneOf_Field11 struct { - Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,oneof"` + Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,oneof" json:"Field11,omitempty"` } type AllTypesOneOf_Field12 struct { - Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,oneof"` + Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,oneof" json:"Field12,omitempty"` } type AllTypesOneOf_Field13 struct { - Field13 bool `protobuf:"varint,13,opt,name=Field13,oneof"` + Field13 bool `protobuf:"varint,13,opt,name=Field13,oneof" json:"Field13,omitempty"` } type AllTypesOneOf_Field14 struct { - Field14 string `protobuf:"bytes,14,opt,name=Field14,oneof"` + Field14 string `protobuf:"bytes,14,opt,name=Field14,oneof" json:"Field14,omitempty"` } type AllTypesOneOf_Field15 struct { - Field15 []byte `protobuf:"bytes,15,opt,name=Field15,oneof"` + Field15 []byte `protobuf:"bytes,15,opt,name=Field15,oneof" json:"Field15,omitempty"` } type AllTypesOneOf_SubMessage struct { - SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,oneof"` + SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,oneof" json:"sub_message,omitempty"` } func (*AllTypesOneOf_Field1) isAllTypesOneOf_TestOneof() {} @@ -320,9 +321,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*AllTypesOneOf) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _AllTypesOneOf_OneofMarshaler, _AllTypesOneOf_OneofUnmarshaler, _AllTypesOneOf_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*AllTypesOneOf) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*AllTypesOneOf_Field1)(nil), (*AllTypesOneOf_Field2)(nil), (*AllTypesOneOf_Field3)(nil), @@ -342,255 +343,6 @@ } } -func _AllTypesOneOf_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*AllTypesOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *AllTypesOneOf_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *AllTypesOneOf_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *AllTypesOneOf_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case *AllTypesOneOf_Field4: - _ = b.EncodeVarint(4<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field4)) - case *AllTypesOneOf_Field5: - _ = b.EncodeVarint(5<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field5)) - case *AllTypesOneOf_Field6: - _ = b.EncodeVarint(6<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field6)) - case *AllTypesOneOf_Field7: - _ = b.EncodeVarint(7<<3 | proto.WireVarint) - _ = b.EncodeZigzag32(uint64(x.Field7)) - case *AllTypesOneOf_Field8: - _ = b.EncodeVarint(8<<3 | proto.WireVarint) - _ = b.EncodeZigzag64(uint64(x.Field8)) - case *AllTypesOneOf_Field9: - _ = b.EncodeVarint(9<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field9)) - case *AllTypesOneOf_Field10: - _ = b.EncodeVarint(10<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field10)) - case *AllTypesOneOf_Field11: - _ = b.EncodeVarint(11<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field11)) - case *AllTypesOneOf_Field12: - _ = b.EncodeVarint(12<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field12)) - case *AllTypesOneOf_Field13: - t := uint64(0) - if x.Field13 { - t = 1 - } - _ = b.EncodeVarint(13<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *AllTypesOneOf_Field14: - _ = b.EncodeVarint(14<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field14) - case *AllTypesOneOf_Field15: - _ = b.EncodeVarint(15<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field15) - case *AllTypesOneOf_SubMessage: - _ = b.EncodeVarint(16<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("AllTypesOneOf.TestOneof has unexpected type %T", x) - } - return nil -} - -func _AllTypesOneOf_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*AllTypesOneOf) - switch tag { - case 1: // test_oneof.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field1{math.Float64frombits(x)} - return true, err - case 2: // test_oneof.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // test_oneof.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field3{int32(x)} - return true, err - case 4: // test_oneof.Field4 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field4{int64(x)} - return true, err - case 5: // test_oneof.Field5 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field5{uint32(x)} - return true, err - case 6: // test_oneof.Field6 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field6{x} - return true, err - case 7: // test_oneof.Field7 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag32() - m.TestOneof = &AllTypesOneOf_Field7{int32(x)} - return true, err - case 8: // test_oneof.Field8 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag64() - m.TestOneof = &AllTypesOneOf_Field8{int64(x)} - return true, err - case 9: // test_oneof.Field9 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field9{uint32(x)} - return true, err - case 10: // test_oneof.Field10 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field10{int32(x)} - return true, err - case 11: // test_oneof.Field11 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field11{x} - return true, err - case 12: // test_oneof.Field12 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field12{int64(x)} - return true, err - case 13: // test_oneof.Field13 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field13{x != 0} - return true, err - case 14: // test_oneof.Field14 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.TestOneof = &AllTypesOneOf_Field14{x} - return true, err - case 15: // test_oneof.Field15 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.TestOneof = &AllTypesOneOf_Field15{x} - return true, err - case 16: // test_oneof.sub_message - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.TestOneof = &AllTypesOneOf_SubMessage{msg} - return true, err - default: - return false, nil - } -} - -func _AllTypesOneOf_OneofSizer(msg proto.Message) (n int) { - m := msg.(*AllTypesOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *AllTypesOneOf_Field1: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field2: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case *AllTypesOneOf_Field4: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field4)) - case *AllTypesOneOf_Field5: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field5)) - case *AllTypesOneOf_Field6: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field6)) - case *AllTypesOneOf_Field7: - n += 1 // tag and wire - n += proto.SizeVarint(uint64((uint32(x.Field7) << 1) ^ uint32((int32(x.Field7) >> 31)))) - case *AllTypesOneOf_Field8: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(uint64(x.Field8<<1) ^ uint64((int64(x.Field8) >> 63)))) - case *AllTypesOneOf_Field9: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field10: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field11: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field12: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field13: - n += 1 // tag and wire - n += 1 - case *AllTypesOneOf_Field14: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field14))) - n += len(x.Field14) - case *AllTypesOneOf_Field15: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field15))) - n += len(x.Field15) - case *AllTypesOneOf_SubMessage: - s := proto.Size(x.SubMessage) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type TwoOneofs struct { // Types that are valid to be assigned to One: // *TwoOneofs_Field1 @@ -620,7 +372,7 @@ return xxx_messageInfo_TwoOneofs.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -645,6 +397,7 @@ VerboseEqual(interface{}) error MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type isTwoOneofs_Two interface { isTwoOneofs_Two() @@ -652,25 +405,26 @@ VerboseEqual(interface{}) error MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type TwoOneofs_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof" json:"Field1,omitempty"` } type TwoOneofs_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof" json:"Field2,omitempty"` } type TwoOneofs_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof" json:"Field3,omitempty"` } type TwoOneofs_Field34 struct { - Field34 string `protobuf:"bytes,34,opt,name=Field34,oneof"` + Field34 string `protobuf:"bytes,34,opt,name=Field34,oneof" json:"Field34,omitempty"` } type TwoOneofs_Field35 struct { - Field35 []byte `protobuf:"bytes,35,opt,name=Field35,oneof"` + Field35 []byte `protobuf:"bytes,35,opt,name=Field35,oneof" json:"Field35,omitempty"` } type TwoOneofs_SubMessage2 struct { - SubMessage2 *Subby `protobuf:"bytes,36,opt,name=sub_message2,json=subMessage2,oneof"` + SubMessage2 *Subby `protobuf:"bytes,36,opt,name=sub_message2,json=subMessage2,oneof" json:"sub_message2,omitempty"` } func (*TwoOneofs_Field1) isTwoOneofs_One() {} @@ -735,9 +489,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*TwoOneofs) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _TwoOneofs_OneofMarshaler, _TwoOneofs_OneofUnmarshaler, _TwoOneofs_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TwoOneofs) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*TwoOneofs_Field1)(nil), (*TwoOneofs_Field2)(nil), (*TwoOneofs_Field3)(nil), @@ -747,133 +501,6 @@ } } -func _TwoOneofs_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*TwoOneofs) - // one - switch x := m.One.(type) { - case *TwoOneofs_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *TwoOneofs_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *TwoOneofs_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case nil: - default: - return fmt.Errorf("TwoOneofs.One has unexpected type %T", x) - } - // two - switch x := m.Two.(type) { - case *TwoOneofs_Field34: - _ = b.EncodeVarint(34<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field34) - case *TwoOneofs_Field35: - _ = b.EncodeVarint(35<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field35) - case *TwoOneofs_SubMessage2: - _ = b.EncodeVarint(36<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage2); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("TwoOneofs.Two has unexpected type %T", x) - } - return nil -} - -func _TwoOneofs_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*TwoOneofs) - switch tag { - case 1: // one.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.One = &TwoOneofs_Field1{math.Float64frombits(x)} - return true, err - case 2: // one.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.One = &TwoOneofs_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // one.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.One = &TwoOneofs_Field3{int32(x)} - return true, err - case 34: // two.Field34 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Two = &TwoOneofs_Field34{x} - return true, err - case 35: // two.Field35 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.Two = &TwoOneofs_Field35{x} - return true, err - case 36: // two.sub_message2 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.Two = &TwoOneofs_SubMessage2{msg} - return true, err - default: - return false, nil - } -} - -func _TwoOneofs_OneofSizer(msg proto.Message) (n int) { - m := msg.(*TwoOneofs) - // one - switch x := m.One.(type) { - case *TwoOneofs_Field1: - n += 1 // tag and wire - n += 8 - case *TwoOneofs_Field2: - n += 1 // tag and wire - n += 4 - case *TwoOneofs_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - // two - switch x := m.Two.(type) { - case *TwoOneofs_Field34: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field34))) - n += len(x.Field34) - case *TwoOneofs_Field35: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field35))) - n += len(x.Field35) - case *TwoOneofs_SubMessage2: - s := proto.Size(x.SubMessage2) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type CustomOneof struct { // Types that are valid to be assigned to Custom: // *CustomOneof_Stringy @@ -899,7 +526,7 @@ return xxx_messageInfo_CustomOneof.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -924,19 +551,20 @@ VerboseEqual(interface{}) error MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type CustomOneof_Stringy struct { - Stringy string `protobuf:"bytes,34,opt,name=Stringy,oneof"` + Stringy string `protobuf:"bytes,34,opt,name=Stringy,oneof" json:"Stringy,omitempty"` } type CustomOneof_CustomType struct { - CustomType github_com_gogo_protobuf_test_custom.Uint128 `protobuf:"bytes,35,opt,name=CustomType,oneof,customtype=github.com/gogo/protobuf/test/custom.Uint128"` + CustomType github_com_gogo_protobuf_test_custom.Uint128 `protobuf:"bytes,35,opt,name=CustomType,oneof,customtype=github.com/gogo/protobuf/test/custom.Uint128" json:"CustomType,omitempty"` } type CustomOneof_CastType struct { - CastType github_com_gogo_protobuf_test_casttype.MyUint64Type `protobuf:"varint,36,opt,name=CastType,oneof,casttype=github.com/gogo/protobuf/test/casttype.MyUint64Type"` + CastType github_com_gogo_protobuf_test_casttype.MyUint64Type `protobuf:"varint,36,opt,name=CastType,oneof,casttype=github.com/gogo/protobuf/test/casttype.MyUint64Type" json:"CastType,omitempty"` } type CustomOneof_MyCustomName struct { - MyCustomName int64 `protobuf:"varint,37,opt,name=CustomName,oneof"` + MyCustomName int64 `protobuf:"varint,37,opt,name=CustomName,oneof" json:"CustomName,omitempty"` } func (*CustomOneof_Stringy) isCustomOneof_Custom() {} @@ -971,162 +599,1255 @@ } return 0 } - -// XXX_OneofFuncs is for the internal use of the proto package. -func (*CustomOneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _CustomOneof_OneofMarshaler, _CustomOneof_OneofUnmarshaler, _CustomOneof_OneofSizer, []interface{}{ - (*CustomOneof_Stringy)(nil), - (*CustomOneof_CustomType)(nil), - (*CustomOneof_CastType)(nil), - (*CustomOneof_MyCustomName)(nil), + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*CustomOneof) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*CustomOneof_Stringy)(nil), + (*CustomOneof_CustomType)(nil), + (*CustomOneof_CastType)(nil), + (*CustomOneof_MyCustomName)(nil), + } +} + +func init() { + proto.RegisterType((*Subby)(nil), "one.Subby") + proto.RegisterType((*AllTypesOneOf)(nil), "one.AllTypesOneOf") + proto.RegisterType((*TwoOneofs)(nil), "one.TwoOneofs") + proto.RegisterType((*CustomOneof)(nil), "one.CustomOneof") +} + +func init() { proto.RegisterFile("combos/marshaler/one.proto", fileDescriptor_f8ef4705d619eecc) } + +var fileDescriptor_f8ef4705d619eecc = []byte{ + // 602 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0xd3, 0x3f, 0x4f, 0x1b, 0x31, + 0x14, 0x00, 0x70, 0x3f, 0x42, 0x42, 0x70, 0x42, 0x49, 0x6f, 0x72, 0x19, 0x8c, 0x95, 0xb6, 0x92, + 0x87, 0x92, 0x90, 0x4b, 0xc2, 0x9f, 0xb1, 0x87, 0x54, 0x65, 0xa1, 0x48, 0x07, 0xcc, 0x28, 0x47, + 0x4d, 0x88, 0x94, 0xc4, 0x28, 0xbe, 0x13, 0xba, 0x8d, 0xcf, 0xd0, 0x4f, 0xc1, 0xd8, 0xb1, 0x1f, + 0x81, 0x31, 0x63, 0xd5, 0x21, 0xe2, 0x8e, 0xa5, 0x23, 0x23, 0xea, 0x54, 0xf9, 0x8e, 0xd8, 0x95, + 0xaa, 0xaa, 0x4b, 0xa7, 0xdc, 0x7b, 0xbf, 0xf3, 0xcb, 0x7b, 0x67, 0x1b, 0x6f, 0x9c, 0xcb, 0x71, + 0x20, 0x55, 0x73, 0xdc, 0x9f, 0xaa, 0xcb, 0xfe, 0x48, 0x4c, 0x9b, 0x72, 0x22, 0x1a, 0x57, 0x53, + 0x19, 0x4a, 0xa7, 0x20, 0x27, 0x62, 0x63, 0x6b, 0x30, 0x0c, 0x2f, 0xa3, 0xa0, 0x71, 0x2e, 0xc7, + 0xcd, 0x81, 0x1c, 0xc8, 0x66, 0x66, 0x41, 0x74, 0x91, 0x45, 0x59, 0x90, 0x3d, 0xe5, 0x6b, 0xea, + 0xaf, 0x70, 0xf1, 0x38, 0x0a, 0x82, 0xd8, 0xa9, 0xe1, 0x82, 0x8a, 0x02, 0x02, 0x0c, 0xf8, 0xaa, + 0xaf, 0x1f, 0xeb, 0xf3, 0x02, 0x5e, 0x7b, 0x3f, 0x1a, 0x9d, 0xc4, 0x57, 0x42, 0x1d, 0x4d, 0xc4, + 0xd1, 0x85, 0x43, 0x70, 0xe9, 0xc3, 0x50, 0x8c, 0x3e, 0xb5, 0xb2, 0xd7, 0xa0, 0x87, 0xfc, 0xe7, + 0xd8, 0x88, 0x4b, 0x96, 0x18, 0xf0, 0x25, 0x23, 0xae, 0x91, 0x36, 0x29, 0x30, 0xe0, 0x45, 0x23, + 0x6d, 0x23, 0x1d, 0xb2, 0xcc, 0x80, 0x17, 0x8c, 0x74, 0x8c, 0x74, 0x49, 0x91, 0x01, 0x5f, 0x33, + 0xd2, 0x35, 0xb2, 0x43, 0x4a, 0x0c, 0xf8, 0xb2, 0x91, 0x1d, 0x23, 0xbb, 0x64, 0x85, 0x01, 0x7f, + 0x69, 0x64, 0xd7, 0xc8, 0x1e, 0x29, 0x33, 0xe0, 0x8e, 0x91, 0x3d, 0x23, 0xfb, 0x64, 0x95, 0x01, + 0x5f, 0x31, 0xb2, 0xef, 0x6c, 0xe0, 0x95, 0x7c, 0xb2, 0x6d, 0x82, 0x19, 0xf0, 0xf5, 0x1e, 0xf2, + 0x17, 0x09, 0x6b, 0x2d, 0x52, 0x61, 0xc0, 0x4b, 0xd6, 0x5a, 0xd6, 0x5c, 0x52, 0x65, 0xc0, 0x6b, + 0xd6, 0x5c, 0x6b, 0x6d, 0xb2, 0xc6, 0x80, 0x97, 0xad, 0xb5, 0xad, 0x75, 0xc8, 0x0b, 0xbd, 0x03, + 0xd6, 0x3a, 0xd6, 0xba, 0x64, 0x9d, 0x01, 0xaf, 0x5a, 0xeb, 0x3a, 0x5b, 0xb8, 0xa2, 0xa2, 0xe0, + 0x6c, 0x2c, 0x94, 0xea, 0x0f, 0x04, 0xa9, 0x31, 0xe0, 0x15, 0x17, 0x37, 0xf4, 0x99, 0xc8, 0xb6, + 0xb5, 0x87, 0x7c, 0xac, 0xa2, 0xe0, 0x30, 0x77, 0xaf, 0x8a, 0x71, 0x28, 0x54, 0x78, 0x26, 0x27, + 0x42, 0x5e, 0xd4, 0x67, 0x80, 0x57, 0x4f, 0xae, 0xe5, 0x91, 0x0e, 0xd4, 0x7f, 0xde, 0xdc, 0x45, + 0xd3, 0xed, 0x0e, 0xa9, 0x67, 0x03, 0x81, 0xbf, 0x48, 0x58, 0xeb, 0x92, 0xd7, 0xd9, 0x40, 0xc6, + 0xba, 0x4e, 0x13, 0x57, 0x7f, 0x1b, 0xc8, 0x25, 0x6f, 0xfe, 0x98, 0x08, 0xfc, 0x8a, 0x9d, 0xc8, + 0xf5, 0x8a, 0x58, 0x1f, 0x7b, 0xfd, 0x13, 0x5e, 0xcb, 0xfa, 0xe7, 0x25, 0x5c, 0x39, 0x88, 0x54, + 0x28, 0xc7, 0xd9, 0x54, 0xfa, 0xaf, 0x8e, 0xc3, 0xe9, 0x70, 0x32, 0x88, 0x9f, 0xdb, 0x40, 0xfe, + 0x22, 0xe1, 0xf8, 0x18, 0xe7, 0xaf, 0xea, 0x13, 0x9e, 0x77, 0xe2, 0x6d, 0x7f, 0x9f, 0x6f, 0xbe, + 0xfb, 0xeb, 0x0d, 0xd2, 0xdf, 0xae, 0x79, 0x9e, 0xad, 0x69, 0x9c, 0x0e, 0x27, 0x61, 0xcb, 0xdd, + 0xd3, 0x1f, 0xd8, 0x56, 0x71, 0x4e, 0x71, 0xf9, 0xa0, 0xaf, 0xc2, 0xac, 0xa2, 0x6e, 0x7d, 0xd9, + 0xdb, 0xfd, 0x39, 0xdf, 0x6c, 0xff, 0xa3, 0x62, 0x5f, 0x85, 0x61, 0x7c, 0x25, 0x1a, 0x87, 0xb1, + 0xae, 0xba, 0xd3, 0xd1, 0xcb, 0x7b, 0xc8, 0x37, 0xa5, 0x1c, 0x77, 0xd1, 0xea, 0xc7, 0xfe, 0x58, + 0x90, 0xb7, 0xfa, 0xba, 0x78, 0xb5, 0x74, 0xbe, 0x59, 0x3d, 0x8c, 0x6d, 0xde, 0xb6, 0xa2, 0x23, + 0xaf, 0x8c, 0x4b, 0x79, 0xab, 0x5e, 0xef, 0x2e, 0xa1, 0x68, 0x96, 0x50, 0xf4, 0x2d, 0xa1, 0xe8, + 0x3e, 0xa1, 0xf0, 0x98, 0x50, 0x78, 0x4a, 0x28, 0xdc, 0xa4, 0x14, 0x6e, 0x53, 0x0a, 0x5f, 0x52, + 0x0a, 0x5f, 0x53, 0x0a, 0x77, 0x29, 0x85, 0x59, 0x4a, 0xd1, 0x7d, 0x4a, 0xe1, 0x47, 0x4a, 0xd1, + 0x63, 0x4a, 0xe1, 0x29, 0xa5, 0xe8, 0xe6, 0x81, 0xa2, 0xdb, 0x07, 0x0a, 0xbf, 0x02, 0x00, 0x00, + 0xff, 0xff, 0xf4, 0xa4, 0x48, 0xed, 0x7e, 0x04, 0x00, 0x00, +} + +func (this *Subby) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Subby) + if !ok { + that2, ok := that.(Subby) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Sub != nil && that1.Sub != nil { + if *this.Sub != *that1.Sub { + if *this.Sub < *that1.Sub { + return -1 + } + return 1 + } + } else if this.Sub != nil { + return 1 + } else if that1.Sub != nil { + return -1 + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf) + if !ok { + that2, ok := that.(AllTypesOneOf) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.TestOneof == nil { + if this.TestOneof != nil { + return 1 + } + } else if this.TestOneof == nil { + return -1 + } else { + thisType := -1 + switch this.TestOneof.(type) { + case *AllTypesOneOf_Field1: + thisType = 0 + case *AllTypesOneOf_Field2: + thisType = 1 + case *AllTypesOneOf_Field3: + thisType = 2 + case *AllTypesOneOf_Field4: + thisType = 3 + case *AllTypesOneOf_Field5: + thisType = 4 + case *AllTypesOneOf_Field6: + thisType = 5 + case *AllTypesOneOf_Field7: + thisType = 6 + case *AllTypesOneOf_Field8: + thisType = 7 + case *AllTypesOneOf_Field9: + thisType = 8 + case *AllTypesOneOf_Field10: + thisType = 9 + case *AllTypesOneOf_Field11: + thisType = 10 + case *AllTypesOneOf_Field12: + thisType = 11 + case *AllTypesOneOf_Field13: + thisType = 12 + case *AllTypesOneOf_Field14: + thisType = 13 + case *AllTypesOneOf_Field15: + thisType = 14 + case *AllTypesOneOf_SubMessage: + thisType = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.TestOneof)) + } + that1Type := -1 + switch that1.TestOneof.(type) { + case *AllTypesOneOf_Field1: + that1Type = 0 + case *AllTypesOneOf_Field2: + that1Type = 1 + case *AllTypesOneOf_Field3: + that1Type = 2 + case *AllTypesOneOf_Field4: + that1Type = 3 + case *AllTypesOneOf_Field5: + that1Type = 4 + case *AllTypesOneOf_Field6: + that1Type = 5 + case *AllTypesOneOf_Field7: + that1Type = 6 + case *AllTypesOneOf_Field8: + that1Type = 7 + case *AllTypesOneOf_Field9: + that1Type = 8 + case *AllTypesOneOf_Field10: + that1Type = 9 + case *AllTypesOneOf_Field11: + that1Type = 10 + case *AllTypesOneOf_Field12: + that1Type = 11 + case *AllTypesOneOf_Field13: + that1Type = 12 + case *AllTypesOneOf_Field14: + that1Type = 13 + case *AllTypesOneOf_Field15: + that1Type = 14 + case *AllTypesOneOf_SubMessage: + that1Type = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.TestOneof)) + } + if thisType == that1Type { + if c := this.TestOneof.Compare(that1.TestOneof); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field1) + if !ok { + that2, ok := that.(AllTypesOneOf_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field2) + if !ok { + that2, ok := that.(AllTypesOneOf_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field3) + if !ok { + that2, ok := that.(AllTypesOneOf_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field4) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field4) + if !ok { + that2, ok := that.(AllTypesOneOf_Field4) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field4 != that1.Field4 { + if this.Field4 < that1.Field4 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field5) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field5) + if !ok { + that2, ok := that.(AllTypesOneOf_Field5) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field5 != that1.Field5 { + if this.Field5 < that1.Field5 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field6) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field6) + if !ok { + that2, ok := that.(AllTypesOneOf_Field6) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field6 != that1.Field6 { + if this.Field6 < that1.Field6 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field7) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field7) + if !ok { + that2, ok := that.(AllTypesOneOf_Field7) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field7 != that1.Field7 { + if this.Field7 < that1.Field7 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field8) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field8) + if !ok { + that2, ok := that.(AllTypesOneOf_Field8) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field8 != that1.Field8 { + if this.Field8 < that1.Field8 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field9) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field9) + if !ok { + that2, ok := that.(AllTypesOneOf_Field9) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field9 != that1.Field9 { + if this.Field9 < that1.Field9 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field10) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field10) + if !ok { + that2, ok := that.(AllTypesOneOf_Field10) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field10 != that1.Field10 { + if this.Field10 < that1.Field10 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field11) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field11) + if !ok { + that2, ok := that.(AllTypesOneOf_Field11) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field11 != that1.Field11 { + if this.Field11 < that1.Field11 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field12) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field12) + if !ok { + that2, ok := that.(AllTypesOneOf_Field12) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field12 != that1.Field12 { + if this.Field12 < that1.Field12 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field13) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field13) + if !ok { + that2, ok := that.(AllTypesOneOf_Field13) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field13 != that1.Field13 { + if !this.Field13 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field14) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field14) + if !ok { + that2, ok := that.(AllTypesOneOf_Field14) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field14 != that1.Field14 { + if this.Field14 < that1.Field14 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field15) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field15) + if !ok { + that2, ok := that.(AllTypesOneOf_Field15) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field15, that1.Field15); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf_SubMessage) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_SubMessage) + if !ok { + that2, ok := that.(AllTypesOneOf_SubMessage) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage.Compare(that1.SubMessage); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs) + if !ok { + that2, ok := that.(TwoOneofs) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.One == nil { + if this.One != nil { + return 1 + } + } else if this.One == nil { + return -1 + } else { + thisType := -1 + switch this.One.(type) { + case *TwoOneofs_Field1: + thisType = 0 + case *TwoOneofs_Field2: + thisType = 1 + case *TwoOneofs_Field3: + thisType = 2 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.One)) + } + that1Type := -1 + switch that1.One.(type) { + case *TwoOneofs_Field1: + that1Type = 0 + case *TwoOneofs_Field2: + that1Type = 1 + case *TwoOneofs_Field3: + that1Type = 2 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.One)) + } + if thisType == that1Type { + if c := this.One.Compare(that1.One); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if that1.Two == nil { + if this.Two != nil { + return 1 + } + } else if this.Two == nil { + return -1 + } else { + thisType := -1 + switch this.Two.(type) { + case *TwoOneofs_Field34: + thisType = 3 + case *TwoOneofs_Field35: + thisType = 4 + case *TwoOneofs_SubMessage2: + thisType = 5 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Two)) + } + that1Type := -1 + switch that1.Two.(type) { + case *TwoOneofs_Field34: + that1Type = 3 + case *TwoOneofs_Field35: + that1Type = 4 + case *TwoOneofs_SubMessage2: + that1Type = 5 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Two)) + } + if thisType == that1Type { + if c := this.Two.Compare(that1.Two); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field1) + if !ok { + that2, ok := that.(TwoOneofs_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field2) + if !ok { + that2, ok := that.(TwoOneofs_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field3) + if !ok { + that2, ok := that.(TwoOneofs_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field34) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field34) + if !ok { + that2, ok := that.(TwoOneofs_Field34) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field34 != that1.Field34 { + if this.Field34 < that1.Field34 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field35) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field35) + if !ok { + that2, ok := that.(TwoOneofs_Field35) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field35, that1.Field35); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs_SubMessage2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_SubMessage2) + if !ok { + that2, ok := that.(TwoOneofs_SubMessage2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage2.Compare(that1.SubMessage2); c != 0 { + return c + } + return 0 +} +func (this *CustomOneof) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof) + if !ok { + that2, ok := that.(CustomOneof) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.Custom == nil { + if this.Custom != nil { + return 1 + } + } else if this.Custom == nil { + return -1 + } else { + thisType := -1 + switch this.Custom.(type) { + case *CustomOneof_Stringy: + thisType = 0 + case *CustomOneof_CustomType: + thisType = 1 + case *CustomOneof_CastType: + thisType = 2 + case *CustomOneof_MyCustomName: + thisType = 3 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Custom)) + } + that1Type := -1 + switch that1.Custom.(type) { + case *CustomOneof_Stringy: + that1Type = 0 + case *CustomOneof_CustomType: + that1Type = 1 + case *CustomOneof_CastType: + that1Type = 2 + case *CustomOneof_MyCustomName: + that1Type = 3 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Custom)) + } + if thisType == that1Type { + if c := this.Custom.Compare(that1.Custom); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *CustomOneof_Stringy) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof_Stringy) + if !ok { + that2, ok := that.(CustomOneof_Stringy) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Stringy != that1.Stringy { + if this.Stringy < that1.Stringy { + return -1 + } + return 1 + } + return 0 +} +func (this *CustomOneof_CustomType) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 } -} -func _CustomOneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*CustomOneof) - // custom - switch x := m.Custom.(type) { - case *CustomOneof_Stringy: - _ = b.EncodeVarint(34<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Stringy) - case *CustomOneof_CustomType: - _ = b.EncodeVarint(35<<3 | proto.WireBytes) - dAtA, err := x.CustomType.Marshal() - if err != nil { - return err + that1, ok := that.(*CustomOneof_CustomType) + if !ok { + that2, ok := that.(CustomOneof_CustomType) + if ok { + that1 = &that2 + } else { + return 1 } - _ = b.EncodeRawBytes(dAtA) - case *CustomOneof_CastType: - _ = b.EncodeVarint(36<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.CastType)) - case *CustomOneof_MyCustomName: - _ = b.EncodeVarint(37<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.MyCustomName)) - case nil: - default: - return fmt.Errorf("CustomOneof.Custom has unexpected type %T", x) } - return nil + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.CustomType.Compare(that1.CustomType); c != 0 { + return c + } + return 0 } +func (this *CustomOneof_CastType) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func _CustomOneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*CustomOneof) - switch tag { - case 34: // custom.Stringy - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Custom = &CustomOneof_Stringy{x} - return true, err - case 35: // custom.CustomType - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType + that1, ok := that.(*CustomOneof_CastType) + if !ok { + that2, ok := that.(CustomOneof_CastType) + if ok { + that1 = &that2 + } else { + return 1 } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err + } + if that1 == nil { + if this == nil { + return 0 } - var cc github_com_gogo_protobuf_test_custom.Uint128 - c := &cc - err = c.Unmarshal(x) - m.Custom = &CustomOneof_CustomType{*c} - return true, err - case 36: // custom.CastType - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Custom = &CustomOneof_CastType{github_com_gogo_protobuf_test_casttype.MyUint64Type(x)} - return true, err - case 37: // custom.CustomName - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Custom = &CustomOneof_MyCustomName{int64(x)} - return true, err - default: - return false, nil + return 1 + } else if this == nil { + return -1 } -} - -func _CustomOneof_OneofSizer(msg proto.Message) (n int) { - m := msg.(*CustomOneof) - // custom - switch x := m.Custom.(type) { - case *CustomOneof_Stringy: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Stringy))) - n += len(x.Stringy) - case *CustomOneof_CustomType: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.CustomType.Size())) - n += x.CustomType.Size() - case *CustomOneof_CastType: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.CastType)) - case *CustomOneof_MyCustomName: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.MyCustomName)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + if this.CastType != that1.CastType { + if this.CastType < that1.CastType { + return -1 + } + return 1 } - return n -} - -func init() { - proto.RegisterType((*Subby)(nil), "one.Subby") - proto.RegisterType((*AllTypesOneOf)(nil), "one.AllTypesOneOf") - proto.RegisterType((*TwoOneofs)(nil), "one.TwoOneofs") - proto.RegisterType((*CustomOneof)(nil), "one.CustomOneof") + return 0 } +func (this *CustomOneof_MyCustomName) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func init() { proto.RegisterFile("combos/marshaler/one.proto", fileDescriptor_f8ef4705d619eecc) } - -var fileDescriptor_f8ef4705d619eecc = []byte{ - // 601 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0xd3, 0xbf, 0x4f, 0xdb, 0x4e, - 0x14, 0x00, 0xf0, 0x7b, 0x84, 0x84, 0x70, 0x09, 0x5f, 0xf2, 0xf5, 0x74, 0x65, 0x38, 0x4e, 0x69, - 0x2b, 0xdd, 0x50, 0x12, 0xe2, 0x24, 0xfc, 0x18, 0x6b, 0xaa, 0x2a, 0x0b, 0x45, 0x32, 0x30, 0xa3, - 0x98, 0x1e, 0x21, 0x52, 0xe2, 0x43, 0x39, 0x5b, 0xc8, 0x1b, 0x7f, 0x43, 0xff, 0x8a, 0x8e, 0x1d, - 0xfb, 0x27, 0x30, 0x32, 0x56, 0x1d, 0x22, 0xec, 0x2e, 0x1d, 0x19, 0x51, 0xa7, 0xea, 0x6c, 0x72, - 0x57, 0xa9, 0xaa, 0xba, 0x74, 0x8a, 0xdf, 0xfb, 0xf8, 0x5e, 0xde, 0xf3, 0xdd, 0xe1, 0x8d, 0x73, - 0x39, 0x0d, 0xa4, 0x6a, 0x4f, 0x87, 0x33, 0x75, 0x39, 0x9c, 0x88, 0x59, 0x5b, 0x86, 0xa2, 0x75, - 0x35, 0x93, 0x91, 0x74, 0x4a, 0x32, 0x14, 0x1b, 0x5b, 0xa3, 0x71, 0x74, 0x19, 0x07, 0xad, 0x73, - 0x39, 0x6d, 0x8f, 0xe4, 0x48, 0xb6, 0x73, 0x0b, 0xe2, 0x8b, 0x3c, 0xca, 0x83, 0xfc, 0xa9, 0x58, - 0xd3, 0x7c, 0x86, 0xcb, 0xc7, 0x71, 0x10, 0x24, 0x4e, 0x03, 0x97, 0x54, 0x1c, 0x10, 0x60, 0xc0, - 0x57, 0x7d, 0xfd, 0xd8, 0x9c, 0x97, 0xf0, 0xda, 0xeb, 0xc9, 0xe4, 0x24, 0xb9, 0x12, 0xea, 0x28, - 0x14, 0x47, 0x17, 0x0e, 0xc1, 0x95, 0xb7, 0x63, 0x31, 0x79, 0xdf, 0xc9, 0x5f, 0x83, 0x01, 0xf2, - 0x9f, 0x62, 0x23, 0x2e, 0x59, 0x62, 0xc0, 0x97, 0x8c, 0xb8, 0x46, 0xba, 0xa4, 0xc4, 0x80, 0x97, - 0x8d, 0x74, 0x8d, 0xf4, 0xc8, 0x32, 0x03, 0x5e, 0x32, 0xd2, 0x33, 0xd2, 0x27, 0x65, 0x06, 0x7c, - 0xcd, 0x48, 0xdf, 0xc8, 0x0e, 0xa9, 0x30, 0xe0, 0xcb, 0x46, 0x76, 0x8c, 0xec, 0x92, 0x15, 0x06, - 0xfc, 0x7f, 0x23, 0xbb, 0x46, 0xf6, 0x48, 0x95, 0x01, 0x77, 0x8c, 0xec, 0x19, 0xd9, 0x27, 0xab, - 0x0c, 0xf8, 0x8a, 0x91, 0x7d, 0x67, 0x03, 0xaf, 0x14, 0x93, 0x6d, 0x13, 0xcc, 0x80, 0xaf, 0x0f, - 0x90, 0xbf, 0x48, 0x58, 0xeb, 0x90, 0x1a, 0x03, 0x5e, 0xb1, 0xd6, 0xb1, 0xe6, 0x92, 0x3a, 0x03, - 0xde, 0xb0, 0xe6, 0x5a, 0xeb, 0x92, 0x35, 0x06, 0xbc, 0x6a, 0xad, 0x6b, 0xad, 0x47, 0xfe, 0xd3, - 0x3b, 0x60, 0xad, 0x67, 0xad, 0x4f, 0xd6, 0x19, 0xf0, 0xba, 0xb5, 0xbe, 0xb3, 0x85, 0x6b, 0x2a, - 0x0e, 0xce, 0xa6, 0x42, 0xa9, 0xe1, 0x48, 0x90, 0x06, 0x03, 0x5e, 0x73, 0x71, 0x4b, 0x9f, 0x89, - 0x7c, 0x5b, 0x07, 0xc8, 0xc7, 0x2a, 0x0e, 0x0e, 0x0b, 0xf7, 0xea, 0x18, 0x47, 0x42, 0x45, 0x67, - 0x32, 0x14, 0xf2, 0xa2, 0x79, 0x07, 0x78, 0xf5, 0xe4, 0x5a, 0x1e, 0xe9, 0x40, 0xfd, 0xe3, 0xcd, - 0x5d, 0x34, 0xdd, 0xed, 0x91, 0x66, 0x3e, 0x10, 0xf8, 0x8b, 0x84, 0xb5, 0x3e, 0x79, 0x9e, 0x0f, - 0x64, 0xac, 0xef, 0xb4, 0x71, 0xfd, 0x97, 0x81, 0x5c, 0xf2, 0xe2, 0xb7, 0x89, 0xc0, 0xaf, 0xd9, - 0x89, 0x5c, 0xaf, 0x8c, 0xf5, 0xb1, 0xd7, 0x3f, 0xd1, 0xb5, 0x6c, 0x7e, 0x58, 0xc2, 0xb5, 0x83, - 0x58, 0x45, 0x72, 0x9a, 0x4f, 0xa5, 0xff, 0xea, 0x38, 0x9a, 0x8d, 0xc3, 0x51, 0xf2, 0xd4, 0x06, - 0xf2, 0x17, 0x09, 0xc7, 0xc7, 0xb8, 0x78, 0x55, 0x9f, 0xf0, 0xa2, 0x13, 0x6f, 0xfb, 0xeb, 0x7c, - 0xf3, 0xd5, 0x1f, 0x6f, 0x90, 0xfe, 0x76, 0xed, 0xf3, 0x7c, 0x4d, 0xeb, 0x74, 0x1c, 0x46, 0x1d, - 0x77, 0x4f, 0x7f, 0x60, 0x5b, 0xc5, 0x39, 0xc5, 0xd5, 0x83, 0xa1, 0x8a, 0xf2, 0x8a, 0xba, 0xf5, - 0x65, 0x6f, 0xf7, 0xc7, 0x7c, 0xb3, 0xfb, 0x97, 0x8a, 0x43, 0x15, 0x45, 0xc9, 0x95, 0x68, 0x1d, - 0x26, 0xba, 0xea, 0x4e, 0x4f, 0x2f, 0x1f, 0x20, 0xdf, 0x94, 0x72, 0xdc, 0x45, 0xab, 0xef, 0x86, - 0x53, 0x41, 0x5e, 0xea, 0xeb, 0xe2, 0x35, 0xb2, 0xf9, 0x66, 0xfd, 0x30, 0xb1, 0x79, 0xdb, 0x8a, - 0x8e, 0xbc, 0x2a, 0xae, 0x14, 0xad, 0x7a, 0x6f, 0x6e, 0x53, 0x8a, 0xee, 0x52, 0x8a, 0xbe, 0xa4, - 0x14, 0xdd, 0xa7, 0x14, 0x1e, 0x52, 0x0a, 0x8f, 0x29, 0x85, 0x9b, 0x8c, 0xc2, 0xc7, 0x8c, 0xc2, - 0xa7, 0x8c, 0xc2, 0xe7, 0x8c, 0xc2, 0x6d, 0x46, 0xe1, 0x2e, 0xa3, 0xe8, 0x3e, 0xa3, 0xf0, 0x3d, - 0xa3, 0xe8, 0x21, 0xa3, 0xf0, 0x98, 0x51, 0x74, 0xf3, 0x8d, 0xa2, 0x9f, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xcf, 0xa5, 0xfc, 0x33, 0x7a, 0x04, 0x00, 0x00, + that1, ok := that.(*CustomOneof_MyCustomName) + if !ok { + that2, ok := that.(CustomOneof_MyCustomName) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.MyCustomName != that1.MyCustomName { + if this.MyCustomName < that1.MyCustomName { + return -1 + } + return 1 + } + return 0 } - func (this *Subby) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { return OneDescription() } @@ -1142,276 +1863,276 @@ func OneDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 4294 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0x1b, 0xe7, - 0x75, 0xe6, 0xe2, 0x42, 0x02, 0x07, 0x20, 0xb8, 0x5c, 0xd2, 0x12, 0xc4, 0xc4, 0x90, 0x04, 0xdb, - 0x31, 0x7d, 0x23, 0x6d, 0x8a, 0xd4, 0x05, 0x6a, 0xe2, 0x82, 0x24, 0x44, 0xd1, 0x25, 0x09, 0x66, - 0x41, 0xc6, 0x97, 0x4c, 0x67, 0x67, 0xb9, 0xf8, 0x09, 0xae, 0xb4, 0xd8, 0xdd, 0xec, 0x2e, 0x24, - 0x43, 0xd3, 0x07, 0x75, 0xdc, 0xcb, 0x64, 0x7a, 0x4f, 0x3b, 0xd3, 0xc4, 0x75, 0xdc, 0x26, 0x9d, - 0xc6, 0x69, 0x7a, 0x4b, 0x7a, 0x49, 0x93, 0xf4, 0xa5, 0x2f, 0x69, 0xfd, 0xd4, 0x71, 0xde, 0x3a, - 0x9d, 0x8e, 0xc7, 0x62, 0x3c, 0xd3, 0xb4, 0x75, 0x5b, 0xb7, 0xd5, 0x83, 0x27, 0x7e, 0xe9, 0xfc, - 0xb7, 0xbd, 0x00, 0xa0, 0x16, 0xcc, 0xd4, 0xce, 0x93, 0xb8, 0xe7, 0x9c, 0xef, 0xdb, 0xf3, 0x9f, - 0xff, 0xfc, 0xe7, 0x3f, 0xff, 0xbf, 0x10, 0xbc, 0x5e, 0x81, 0x33, 0x2d, 0xcb, 0x6a, 0x19, 0x68, - 0xde, 0x76, 0x2c, 0xcf, 0xda, 0xeb, 0xec, 0xcf, 0x37, 0x91, 0xab, 0x39, 0xba, 0xed, 0x59, 0xce, - 0x1c, 0x91, 0x49, 0x13, 0xd4, 0x62, 0x8e, 0x5b, 0x94, 0x37, 0x61, 0xf2, 0x8a, 0x6e, 0xa0, 0x55, - 0xdf, 0xb0, 0x81, 0x3c, 0xe9, 0x22, 0xa4, 0xf6, 0x75, 0x03, 0x15, 0x85, 0x33, 0xc9, 0xd9, 0xdc, - 0xc2, 0x83, 0x73, 0x3d, 0xa0, 0xb9, 0x28, 0x62, 0x1b, 0x8b, 0x65, 0x82, 0x28, 0xbf, 0x9d, 0x82, - 0xa9, 0x01, 0x5a, 0x49, 0x82, 0x94, 0xa9, 0xb6, 0x31, 0xa3, 0x30, 0x9b, 0x95, 0xc9, 0xdf, 0x52, - 0x11, 0xc6, 0x6c, 0x55, 0xbb, 0xae, 0xb6, 0x50, 0x31, 0x41, 0xc4, 0xfc, 0x51, 0x2a, 0x01, 0x34, - 0x91, 0x8d, 0xcc, 0x26, 0x32, 0xb5, 0x6e, 0x31, 0x79, 0x26, 0x39, 0x9b, 0x95, 0x43, 0x12, 0xe9, - 0x31, 0x98, 0xb4, 0x3b, 0x7b, 0x86, 0xae, 0x29, 0x21, 0x33, 0x38, 0x93, 0x9c, 0x4d, 0xcb, 0x22, - 0x55, 0xac, 0x06, 0xc6, 0x0f, 0xc3, 0xc4, 0x4d, 0xa4, 0x5e, 0x0f, 0x9b, 0xe6, 0x88, 0x69, 0x01, - 0x8b, 0x43, 0x86, 0x2b, 0x90, 0x6f, 0x23, 0xd7, 0x55, 0x5b, 0x48, 0xf1, 0xba, 0x36, 0x2a, 0xa6, - 0xc8, 0xe8, 0xcf, 0xf4, 0x8d, 0xbe, 0x77, 0xe4, 0x39, 0x86, 0xda, 0xe9, 0xda, 0x48, 0xaa, 0x42, - 0x16, 0x99, 0x9d, 0x36, 0x65, 0x48, 0x1f, 0x11, 0xbf, 0x9a, 0xd9, 0x69, 0xf7, 0xb2, 0x64, 0x30, - 0x8c, 0x51, 0x8c, 0xb9, 0xc8, 0xb9, 0xa1, 0x6b, 0xa8, 0x38, 0x4a, 0x08, 0x1e, 0xee, 0x23, 0x68, - 0x50, 0x7d, 0x2f, 0x07, 0xc7, 0x49, 0x2b, 0x90, 0x45, 0x2f, 0x7a, 0xc8, 0x74, 0x75, 0xcb, 0x2c, - 0x8e, 0x11, 0x92, 0x87, 0x06, 0xcc, 0x22, 0x32, 0x9a, 0xbd, 0x14, 0x01, 0x4e, 0x3a, 0x0f, 0x63, - 0x96, 0xed, 0xe9, 0x96, 0xe9, 0x16, 0x33, 0x67, 0x84, 0xd9, 0xdc, 0xc2, 0x47, 0x07, 0x26, 0x42, - 0x9d, 0xda, 0xc8, 0xdc, 0x58, 0x5a, 0x07, 0xd1, 0xb5, 0x3a, 0x8e, 0x86, 0x14, 0xcd, 0x6a, 0x22, - 0x45, 0x37, 0xf7, 0xad, 0x62, 0x96, 0x10, 0x9c, 0xee, 0x1f, 0x08, 0x31, 0x5c, 0xb1, 0x9a, 0x68, - 0xdd, 0xdc, 0xb7, 0xe4, 0x82, 0x1b, 0x79, 0x96, 0x4e, 0xc0, 0xa8, 0xdb, 0x35, 0x3d, 0xf5, 0xc5, - 0x62, 0x9e, 0x64, 0x08, 0x7b, 0x2a, 0x7f, 0x7b, 0x14, 0x26, 0x86, 0x49, 0xb1, 0xcb, 0x90, 0xde, - 0xc7, 0xa3, 0x2c, 0x26, 0x8e, 0x13, 0x03, 0x8a, 0x89, 0x06, 0x71, 0xf4, 0x47, 0x0c, 0x62, 0x15, - 0x72, 0x26, 0x72, 0x3d, 0xd4, 0xa4, 0x19, 0x91, 0x1c, 0x32, 0xa7, 0x80, 0x82, 0xfa, 0x53, 0x2a, - 0xf5, 0x23, 0xa5, 0xd4, 0x73, 0x30, 0xe1, 0xbb, 0xa4, 0x38, 0xaa, 0xd9, 0xe2, 0xb9, 0x39, 0x1f, - 0xe7, 0xc9, 0x5c, 0x8d, 0xe3, 0x64, 0x0c, 0x93, 0x0b, 0x28, 0xf2, 0x2c, 0xad, 0x02, 0x58, 0x26, - 0xb2, 0xf6, 0x95, 0x26, 0xd2, 0x8c, 0x62, 0xe6, 0x88, 0x28, 0xd5, 0xb1, 0x49, 0x5f, 0x94, 0x2c, - 0x2a, 0xd5, 0x0c, 0xe9, 0x52, 0x90, 0x6a, 0x63, 0x47, 0x64, 0xca, 0x26, 0x5d, 0x64, 0x7d, 0xd9, - 0xb6, 0x0b, 0x05, 0x07, 0xe1, 0xbc, 0x47, 0x4d, 0x36, 0xb2, 0x2c, 0x71, 0x62, 0x2e, 0x76, 0x64, - 0x32, 0x83, 0xd1, 0x81, 0x8d, 0x3b, 0xe1, 0x47, 0xe9, 0x01, 0xf0, 0x05, 0x0a, 0x49, 0x2b, 0x20, - 0x55, 0x28, 0xcf, 0x85, 0x5b, 0x6a, 0x1b, 0xcd, 0xdc, 0x82, 0x42, 0x34, 0x3c, 0xd2, 0x34, 0xa4, - 0x5d, 0x4f, 0x75, 0x3c, 0x92, 0x85, 0x69, 0x99, 0x3e, 0x48, 0x22, 0x24, 0x91, 0xd9, 0x24, 0x55, - 0x2e, 0x2d, 0xe3, 0x3f, 0xa5, 0x9f, 0x0c, 0x06, 0x9c, 0x24, 0x03, 0xfe, 0x58, 0xff, 0x8c, 0x46, - 0x98, 0x7b, 0xc7, 0x3d, 0x73, 0x01, 0xc6, 0x23, 0x03, 0x18, 0xf6, 0xd5, 0xe5, 0x9f, 0x81, 0xfb, - 0x06, 0x52, 0x4b, 0xcf, 0xc1, 0x74, 0xc7, 0xd4, 0x4d, 0x0f, 0x39, 0xb6, 0x83, 0x70, 0xc6, 0xd2, - 0x57, 0x15, 0xff, 0x65, 0xec, 0x88, 0x9c, 0xdb, 0x0d, 0x5b, 0x53, 0x16, 0x79, 0xaa, 0xd3, 0x2f, - 0x7c, 0x34, 0x9b, 0xf9, 0xc1, 0x98, 0x78, 0xfb, 0xf6, 0xed, 0xdb, 0x89, 0xf2, 0xe7, 0x47, 0x61, - 0x7a, 0xd0, 0x9a, 0x19, 0xb8, 0x7c, 0x4f, 0xc0, 0xa8, 0xd9, 0x69, 0xef, 0x21, 0x87, 0x04, 0x29, - 0x2d, 0xb3, 0x27, 0xa9, 0x0a, 0x69, 0x43, 0xdd, 0x43, 0x46, 0x31, 0x75, 0x46, 0x98, 0x2d, 0x2c, - 0x3c, 0x36, 0xd4, 0xaa, 0x9c, 0xdb, 0xc0, 0x10, 0x99, 0x22, 0xa5, 0x4f, 0x40, 0x8a, 0x95, 0x68, - 0xcc, 0xf0, 0xe8, 0x70, 0x0c, 0x78, 0x2d, 0xc9, 0x04, 0x27, 0x7d, 0x04, 0xb2, 0xf8, 0x5f, 0x9a, - 0x1b, 0xa3, 0xc4, 0xe7, 0x0c, 0x16, 0xe0, 0xbc, 0x90, 0x66, 0x20, 0x43, 0x96, 0x49, 0x13, 0xf1, - 0xad, 0xcd, 0x7f, 0xc6, 0x89, 0xd5, 0x44, 0xfb, 0x6a, 0xc7, 0xf0, 0x94, 0x1b, 0xaa, 0xd1, 0x41, - 0x24, 0xe1, 0xb3, 0x72, 0x9e, 0x09, 0x3f, 0x85, 0x65, 0xd2, 0x69, 0xc8, 0xd1, 0x55, 0xa5, 0x9b, - 0x4d, 0xf4, 0x22, 0xa9, 0x9e, 0x69, 0x99, 0x2e, 0xb4, 0x75, 0x2c, 0xc1, 0xaf, 0xbf, 0xe6, 0x5a, - 0x26, 0x4f, 0x4d, 0xf2, 0x0a, 0x2c, 0x20, 0xaf, 0xbf, 0xd0, 0x5b, 0xb8, 0xef, 0x1f, 0x3c, 0xbc, - 0xde, 0x9c, 0x2a, 0x7f, 0x33, 0x01, 0x29, 0x52, 0x2f, 0x26, 0x20, 0xb7, 0xf3, 0xfc, 0x76, 0x4d, - 0x59, 0xad, 0xef, 0x2e, 0x6f, 0xd4, 0x44, 0x41, 0x2a, 0x00, 0x10, 0xc1, 0x95, 0x8d, 0x7a, 0x75, - 0x47, 0x4c, 0xf8, 0xcf, 0xeb, 0x5b, 0x3b, 0xe7, 0x17, 0xc5, 0xa4, 0x0f, 0xd8, 0xa5, 0x82, 0x54, - 0xd8, 0xe0, 0xdc, 0x82, 0x98, 0x96, 0x44, 0xc8, 0x53, 0x82, 0xf5, 0xe7, 0x6a, 0xab, 0xe7, 0x17, - 0xc5, 0xd1, 0xa8, 0xe4, 0xdc, 0x82, 0x38, 0x26, 0x8d, 0x43, 0x96, 0x48, 0x96, 0xeb, 0xf5, 0x0d, - 0x31, 0xe3, 0x73, 0x36, 0x76, 0xe4, 0xf5, 0xad, 0x35, 0x31, 0xeb, 0x73, 0xae, 0xc9, 0xf5, 0xdd, - 0x6d, 0x11, 0x7c, 0x86, 0xcd, 0x5a, 0xa3, 0x51, 0x5d, 0xab, 0x89, 0x39, 0xdf, 0x62, 0xf9, 0xf9, - 0x9d, 0x5a, 0x43, 0xcc, 0x47, 0xdc, 0x3a, 0xb7, 0x20, 0x8e, 0xfb, 0xaf, 0xa8, 0x6d, 0xed, 0x6e, - 0x8a, 0x05, 0x69, 0x12, 0xc6, 0xe9, 0x2b, 0xb8, 0x13, 0x13, 0x3d, 0xa2, 0xf3, 0x8b, 0xa2, 0x18, - 0x38, 0x42, 0x59, 0x26, 0x23, 0x82, 0xf3, 0x8b, 0xa2, 0x54, 0x5e, 0x81, 0x34, 0xc9, 0x2e, 0x49, - 0x82, 0xc2, 0x46, 0x75, 0xb9, 0xb6, 0xa1, 0xd4, 0xb7, 0x77, 0xd6, 0xeb, 0x5b, 0xd5, 0x0d, 0x51, - 0x08, 0x64, 0x72, 0xed, 0x93, 0xbb, 0xeb, 0x72, 0x6d, 0x55, 0x4c, 0x84, 0x65, 0xdb, 0xb5, 0xea, - 0x4e, 0x6d, 0x55, 0x4c, 0x96, 0x35, 0x98, 0x1e, 0x54, 0x27, 0x07, 0xae, 0x8c, 0xd0, 0x14, 0x27, - 0x8e, 0x98, 0x62, 0xc2, 0xd5, 0x37, 0xc5, 0xdf, 0x4f, 0xc0, 0xd4, 0x80, 0xbd, 0x62, 0xe0, 0x4b, - 0x9e, 0x86, 0x34, 0x4d, 0x51, 0xba, 0x7b, 0x3e, 0x32, 0x70, 0xd3, 0x21, 0x09, 0xdb, 0xb7, 0x83, - 0x12, 0x5c, 0xb8, 0x83, 0x48, 0x1e, 0xd1, 0x41, 0x60, 0x8a, 0xbe, 0x9a, 0xfe, 0xd3, 0x7d, 0x35, - 0x9d, 0x6e, 0x7b, 0xe7, 0x87, 0xd9, 0xf6, 0x88, 0xec, 0x78, 0xb5, 0x3d, 0x3d, 0xa0, 0xb6, 0x5f, - 0x86, 0xc9, 0x3e, 0xa2, 0xa1, 0x6b, 0xec, 0x4b, 0x02, 0x14, 0x8f, 0x0a, 0x4e, 0x4c, 0xa5, 0x4b, - 0x44, 0x2a, 0xdd, 0xe5, 0xde, 0x08, 0x9e, 0x3d, 0x7a, 0x12, 0xfa, 0xe6, 0xfa, 0x35, 0x01, 0x4e, - 0x0c, 0xee, 0x14, 0x07, 0xfa, 0xf0, 0x09, 0x18, 0x6d, 0x23, 0xef, 0xc0, 0xe2, 0xdd, 0xd2, 0xc7, - 0x06, 0xec, 0xc1, 0x58, 0xdd, 0x3b, 0xd9, 0x0c, 0x15, 0xde, 0xc4, 0x93, 0x47, 0xb5, 0x7b, 0xd4, - 0x9b, 0x3e, 0x4f, 0x3f, 0x9b, 0x80, 0xfb, 0x06, 0x92, 0x0f, 0x74, 0xf4, 0x7e, 0x00, 0xdd, 0xb4, - 0x3b, 0x1e, 0xed, 0x88, 0x68, 0x81, 0xcd, 0x12, 0x09, 0x29, 0x5e, 0xb8, 0x78, 0x76, 0x3c, 0x5f, - 0x9f, 0x24, 0x7a, 0xa0, 0x22, 0x62, 0x70, 0x31, 0x70, 0x34, 0x45, 0x1c, 0x2d, 0x1d, 0x31, 0xd2, - 0xbe, 0xc4, 0x7c, 0x12, 0x44, 0xcd, 0xd0, 0x91, 0xe9, 0x29, 0xae, 0xe7, 0x20, 0xb5, 0xad, 0x9b, - 0x2d, 0xb2, 0x83, 0x64, 0x2a, 0xe9, 0x7d, 0xd5, 0x70, 0x91, 0x3c, 0x41, 0xd5, 0x0d, 0xae, 0xc5, - 0x08, 0x92, 0x40, 0x4e, 0x08, 0x31, 0x1a, 0x41, 0x50, 0xb5, 0x8f, 0x28, 0xff, 0x72, 0x16, 0x72, - 0xa1, 0xbe, 0x5a, 0x3a, 0x0b, 0xf9, 0x6b, 0xea, 0x0d, 0x55, 0xe1, 0x67, 0x25, 0x1a, 0x89, 0x1c, - 0x96, 0x6d, 0xb3, 0xf3, 0xd2, 0x93, 0x30, 0x4d, 0x4c, 0xac, 0x8e, 0x87, 0x1c, 0x45, 0x33, 0x54, - 0xd7, 0x25, 0x41, 0xcb, 0x10, 0x53, 0x09, 0xeb, 0xea, 0x58, 0xb5, 0xc2, 0x35, 0xd2, 0x12, 0x4c, - 0x11, 0x44, 0xbb, 0x63, 0x78, 0xba, 0x6d, 0x20, 0x05, 0x9f, 0xde, 0x5c, 0xb2, 0x93, 0xf8, 0x9e, - 0x4d, 0x62, 0x8b, 0x4d, 0x66, 0x80, 0x3d, 0x72, 0xa5, 0x55, 0xb8, 0x9f, 0xc0, 0x5a, 0xc8, 0x44, - 0x8e, 0xea, 0x21, 0x05, 0x7d, 0xa6, 0xa3, 0x1a, 0xae, 0xa2, 0x9a, 0x4d, 0xe5, 0x40, 0x75, 0x0f, - 0x8a, 0xd3, 0x98, 0x60, 0x39, 0x51, 0x14, 0xe4, 0x53, 0xd8, 0x70, 0x8d, 0xd9, 0xd5, 0x88, 0x59, - 0xd5, 0x6c, 0x5e, 0x55, 0xdd, 0x03, 0xa9, 0x02, 0x27, 0x08, 0x8b, 0xeb, 0x39, 0xba, 0xd9, 0x52, - 0xb4, 0x03, 0xa4, 0x5d, 0x57, 0x3a, 0xde, 0xfe, 0xc5, 0xe2, 0x47, 0xc2, 0xef, 0x27, 0x1e, 0x36, - 0x88, 0xcd, 0x0a, 0x36, 0xd9, 0xf5, 0xf6, 0x2f, 0x4a, 0x0d, 0xc8, 0xe3, 0xc9, 0x68, 0xeb, 0xb7, - 0x90, 0xb2, 0x6f, 0x39, 0x64, 0x6b, 0x2c, 0x0c, 0x28, 0x4d, 0xa1, 0x08, 0xce, 0xd5, 0x19, 0x60, - 0xd3, 0x6a, 0xa2, 0x4a, 0xba, 0xb1, 0x5d, 0xab, 0xad, 0xca, 0x39, 0xce, 0x72, 0xc5, 0x72, 0x70, - 0x42, 0xb5, 0x2c, 0x3f, 0xc0, 0x39, 0x9a, 0x50, 0x2d, 0x8b, 0x87, 0x77, 0x09, 0xa6, 0x34, 0x8d, - 0x8e, 0x59, 0xd7, 0x14, 0x76, 0xc6, 0x72, 0x8b, 0x62, 0x24, 0x58, 0x9a, 0xb6, 0x46, 0x0d, 0x58, - 0x8e, 0xbb, 0xd2, 0x25, 0xb8, 0x2f, 0x08, 0x56, 0x18, 0x38, 0xd9, 0x37, 0xca, 0x5e, 0xe8, 0x12, - 0x4c, 0xd9, 0xdd, 0x7e, 0xa0, 0x14, 0x79, 0xa3, 0xdd, 0xed, 0x85, 0x5d, 0x80, 0x69, 0xfb, 0xc0, - 0xee, 0xc7, 0x3d, 0x1a, 0xc6, 0x49, 0xf6, 0x81, 0xdd, 0x0b, 0x7c, 0x88, 0x1c, 0xb8, 0x1d, 0xa4, - 0xa9, 0x1e, 0x6a, 0x16, 0x4f, 0x86, 0xcd, 0x43, 0x0a, 0x69, 0x1e, 0x44, 0x4d, 0x53, 0x90, 0xa9, - 0xee, 0x19, 0x48, 0x51, 0x1d, 0x64, 0xaa, 0x6e, 0xf1, 0x74, 0xd8, 0xb8, 0xa0, 0x69, 0x35, 0xa2, - 0xad, 0x12, 0xa5, 0xf4, 0x28, 0x4c, 0x5a, 0x7b, 0xd7, 0x34, 0x9a, 0x92, 0x8a, 0xed, 0xa0, 0x7d, - 0xfd, 0xc5, 0xe2, 0x83, 0x24, 0xbe, 0x13, 0x58, 0x41, 0x12, 0x72, 0x9b, 0x88, 0xa5, 0x47, 0x40, - 0xd4, 0xdc, 0x03, 0xd5, 0xb1, 0x49, 0x4d, 0x76, 0x6d, 0x55, 0x43, 0xc5, 0x87, 0xa8, 0x29, 0x95, - 0x6f, 0x71, 0x31, 0x5e, 0x12, 0xee, 0x4d, 0x7d, 0xdf, 0xe3, 0x8c, 0x0f, 0xd3, 0x25, 0x41, 0x64, - 0x8c, 0x6d, 0x16, 0x44, 0x1c, 0x8a, 0xc8, 0x8b, 0x67, 0x89, 0x59, 0xc1, 0x3e, 0xb0, 0xc3, 0xef, - 0x7d, 0x00, 0xc6, 0xb1, 0x65, 0xf0, 0xd2, 0x47, 0x68, 0x43, 0x66, 0x1f, 0x84, 0xde, 0xb8, 0x08, - 0x27, 0xb0, 0x51, 0x1b, 0x79, 0x6a, 0x53, 0xf5, 0xd4, 0x90, 0xf5, 0xe3, 0xc4, 0x1a, 0xc7, 0x7d, - 0x93, 0x29, 0x23, 0x7e, 0x3a, 0x9d, 0xbd, 0xae, 0x9f, 0x59, 0x4f, 0x50, 0x3f, 0xb1, 0x8c, 0xe7, - 0xd6, 0x07, 0xd6, 0x74, 0x97, 0x2b, 0x90, 0x0f, 0x27, 0xbe, 0x94, 0x05, 0x9a, 0xfa, 0xa2, 0x80, - 0xbb, 0xa0, 0x95, 0xfa, 0x2a, 0xee, 0x5f, 0x5e, 0xa8, 0x89, 0x09, 0xdc, 0x47, 0x6d, 0xac, 0xef, - 0xd4, 0x14, 0x79, 0x77, 0x6b, 0x67, 0x7d, 0xb3, 0x26, 0x26, 0xc3, 0x0d, 0xfb, 0x77, 0x13, 0x50, - 0x88, 0x9e, 0xbd, 0xa4, 0x9f, 0x80, 0x93, 0xfc, 0xa2, 0xc4, 0x45, 0x9e, 0x72, 0x53, 0x77, 0xc8, - 0x5a, 0x6c, 0xab, 0x74, 0x5f, 0xf4, 0xb3, 0x61, 0x9a, 0x59, 0x35, 0x90, 0xf7, 0xac, 0xee, 0xe0, - 0x95, 0xd6, 0x56, 0x3d, 0x69, 0x03, 0x4e, 0x9b, 0x96, 0xe2, 0x7a, 0xaa, 0xd9, 0x54, 0x9d, 0xa6, - 0x12, 0x5c, 0x51, 0x29, 0xaa, 0xa6, 0x21, 0xd7, 0xb5, 0xe8, 0x1e, 0xe8, 0xb3, 0x7c, 0xd4, 0xb4, - 0x1a, 0xcc, 0x38, 0xd8, 0x1c, 0xaa, 0xcc, 0xb4, 0x27, 0x73, 0x93, 0x47, 0x65, 0xee, 0x47, 0x20, - 0xdb, 0x56, 0x6d, 0x05, 0x99, 0x9e, 0xd3, 0x25, 0x1d, 0x77, 0x46, 0xce, 0xb4, 0x55, 0xbb, 0x86, - 0x9f, 0x3f, 0x9c, 0x83, 0xcf, 0x3f, 0x27, 0x21, 0x1f, 0xee, 0xba, 0xf1, 0x21, 0x46, 0x23, 0x1b, - 0x94, 0x40, 0x4a, 0xd8, 0x03, 0xf7, 0xec, 0xd1, 0xe7, 0x56, 0xf0, 0xce, 0x55, 0x19, 0xa5, 0xbd, - 0xb0, 0x4c, 0x91, 0xb8, 0x6b, 0xc0, 0xa9, 0x85, 0x68, 0xef, 0x91, 0x91, 0xd9, 0x93, 0xb4, 0x06, - 0xa3, 0xd7, 0x5c, 0xc2, 0x3d, 0x4a, 0xb8, 0x1f, 0xbc, 0x37, 0xf7, 0x33, 0x0d, 0x42, 0x9e, 0x7d, - 0xa6, 0xa1, 0x6c, 0xd5, 0xe5, 0xcd, 0xea, 0x86, 0xcc, 0xe0, 0xd2, 0x29, 0x48, 0x19, 0xea, 0xad, - 0x6e, 0x74, 0x8f, 0x23, 0xa2, 0x61, 0x03, 0x7f, 0x0a, 0x52, 0x37, 0x91, 0x7a, 0x3d, 0xba, 0xb3, - 0x10, 0xd1, 0x07, 0x98, 0xfa, 0xf3, 0x90, 0x26, 0xf1, 0x92, 0x00, 0x58, 0xc4, 0xc4, 0x11, 0x29, - 0x03, 0xa9, 0x95, 0xba, 0x8c, 0xd3, 0x5f, 0x84, 0x3c, 0x95, 0x2a, 0xdb, 0xeb, 0xb5, 0x95, 0x9a, - 0x98, 0x28, 0x2f, 0xc1, 0x28, 0x0d, 0x02, 0x5e, 0x1a, 0x7e, 0x18, 0xc4, 0x11, 0xf6, 0xc8, 0x38, - 0x04, 0xae, 0xdd, 0xdd, 0x5c, 0xae, 0xc9, 0x62, 0x22, 0x3c, 0xbd, 0x2e, 0xe4, 0xc3, 0x0d, 0xf7, - 0x87, 0x93, 0x53, 0xdf, 0x11, 0x20, 0x17, 0x6a, 0xa0, 0x71, 0xe7, 0xa3, 0x1a, 0x86, 0x75, 0x53, - 0x51, 0x0d, 0x5d, 0x75, 0x59, 0x52, 0x00, 0x11, 0x55, 0xb1, 0x64, 0xd8, 0x49, 0xfb, 0x50, 0x9c, - 0x7f, 0x55, 0x00, 0xb1, 0xb7, 0x77, 0xed, 0x71, 0x50, 0xf8, 0xb1, 0x3a, 0xf8, 0x8a, 0x00, 0x85, - 0x68, 0xc3, 0xda, 0xe3, 0xde, 0xd9, 0x1f, 0xab, 0x7b, 0x6f, 0x25, 0x60, 0x3c, 0xd2, 0xa6, 0x0e, - 0xeb, 0xdd, 0x67, 0x60, 0x52, 0x6f, 0xa2, 0xb6, 0x6d, 0x79, 0xc8, 0xd4, 0xba, 0x8a, 0x81, 0x6e, - 0x20, 0xa3, 0x58, 0x26, 0x85, 0x62, 0xfe, 0xde, 0x8d, 0xf0, 0xdc, 0x7a, 0x80, 0xdb, 0xc0, 0xb0, - 0xca, 0xd4, 0xfa, 0x6a, 0x6d, 0x73, 0xbb, 0xbe, 0x53, 0xdb, 0x5a, 0x79, 0x5e, 0xd9, 0xdd, 0xfa, - 0xa9, 0xad, 0xfa, 0xb3, 0x5b, 0xb2, 0xa8, 0xf7, 0x98, 0x7d, 0x80, 0x4b, 0x7d, 0x1b, 0xc4, 0x5e, - 0xa7, 0xa4, 0x93, 0x30, 0xc8, 0x2d, 0x71, 0x44, 0x9a, 0x82, 0x89, 0xad, 0xba, 0xd2, 0x58, 0x5f, - 0xad, 0x29, 0xb5, 0x2b, 0x57, 0x6a, 0x2b, 0x3b, 0x0d, 0x7a, 0xb5, 0xe1, 0x5b, 0xef, 0x44, 0x17, - 0xf5, 0xcb, 0x49, 0x98, 0x1a, 0xe0, 0x89, 0x54, 0x65, 0x87, 0x12, 0x7a, 0x4e, 0x7a, 0x62, 0x18, - 0xef, 0xe7, 0x70, 0x57, 0xb0, 0xad, 0x3a, 0x1e, 0x3b, 0xc3, 0x3c, 0x02, 0x38, 0x4a, 0xa6, 0xa7, - 0xef, 0xeb, 0xc8, 0x61, 0x37, 0x41, 0xf4, 0xa4, 0x32, 0x11, 0xc8, 0xe9, 0x65, 0xd0, 0xe3, 0x20, - 0xd9, 0x96, 0xab, 0x7b, 0xfa, 0x0d, 0xa4, 0xe8, 0x26, 0xbf, 0x36, 0xc2, 0x27, 0x97, 0x94, 0x2c, - 0x72, 0xcd, 0xba, 0xe9, 0xf9, 0xd6, 0x26, 0x6a, 0xa9, 0x3d, 0xd6, 0xb8, 0x80, 0x27, 0x65, 0x91, - 0x6b, 0x7c, 0xeb, 0xb3, 0x90, 0x6f, 0x5a, 0x1d, 0xdc, 0xce, 0x51, 0x3b, 0xbc, 0x5f, 0x08, 0x72, - 0x8e, 0xca, 0x7c, 0x13, 0xd6, 0xa8, 0x07, 0xf7, 0x55, 0x79, 0x39, 0x47, 0x65, 0xd4, 0xe4, 0x61, - 0x98, 0x50, 0x5b, 0x2d, 0x07, 0x93, 0x73, 0x22, 0x7a, 0xf4, 0x28, 0xf8, 0x62, 0x62, 0x38, 0xf3, - 0x0c, 0x64, 0x78, 0x1c, 0xf0, 0x96, 0x8c, 0x23, 0xa1, 0xd8, 0xf4, 0x3c, 0x9d, 0x98, 0xcd, 0xca, - 0x19, 0x93, 0x2b, 0xcf, 0x42, 0x5e, 0x77, 0x95, 0xe0, 0xfa, 0x3d, 0x71, 0x26, 0x31, 0x9b, 0x91, - 0x73, 0xba, 0xeb, 0x5f, 0x5d, 0x96, 0x5f, 0x4b, 0x40, 0x21, 0xfa, 0xf9, 0x40, 0x5a, 0x85, 0x8c, - 0x61, 0x69, 0x2a, 0x49, 0x2d, 0xfa, 0xed, 0x6a, 0x36, 0xe6, 0x8b, 0xc3, 0xdc, 0x06, 0xb3, 0x97, - 0x7d, 0xe4, 0xcc, 0x3f, 0x08, 0x90, 0xe1, 0x62, 0xe9, 0x04, 0xa4, 0x6c, 0xd5, 0x3b, 0x20, 0x74, - 0xe9, 0xe5, 0x84, 0x28, 0xc8, 0xe4, 0x19, 0xcb, 0x5d, 0x5b, 0x35, 0x49, 0x0a, 0x30, 0x39, 0x7e, - 0xc6, 0xf3, 0x6a, 0x20, 0xb5, 0x49, 0xce, 0x35, 0x56, 0xbb, 0x8d, 0x4c, 0xcf, 0xe5, 0xf3, 0xca, - 0xe4, 0x2b, 0x4c, 0x2c, 0x3d, 0x06, 0x93, 0x9e, 0xa3, 0xea, 0x46, 0xc4, 0x36, 0x45, 0x6c, 0x45, - 0xae, 0xf0, 0x8d, 0x2b, 0x70, 0x8a, 0xf3, 0x36, 0x91, 0xa7, 0x6a, 0x07, 0xa8, 0x19, 0x80, 0x46, - 0xc9, 0xfd, 0xc5, 0x49, 0x66, 0xb0, 0xca, 0xf4, 0x1c, 0x5b, 0xfe, 0x9e, 0x00, 0x93, 0xfc, 0x24, - 0xd6, 0xf4, 0x83, 0xb5, 0x09, 0xa0, 0x9a, 0xa6, 0xe5, 0x85, 0xc3, 0xd5, 0x9f, 0xca, 0x7d, 0xb8, - 0xb9, 0xaa, 0x0f, 0x92, 0x43, 0x04, 0x33, 0x6d, 0x80, 0x40, 0x73, 0x64, 0xd8, 0x4e, 0x43, 0x8e, - 0x7d, 0x1b, 0x22, 0x1f, 0x18, 0xe9, 0xd9, 0x1d, 0xa8, 0x08, 0x1f, 0xd9, 0xa4, 0x69, 0x48, 0xef, - 0xa1, 0x96, 0x6e, 0xb2, 0x1b, 0x5f, 0xfa, 0xc0, 0x6f, 0x58, 0x52, 0xfe, 0x0d, 0xcb, 0xf2, 0xa7, - 0x61, 0x4a, 0xb3, 0xda, 0xbd, 0xee, 0x2e, 0x8b, 0x3d, 0xf7, 0x07, 0xee, 0x55, 0xe1, 0x05, 0x08, - 0x5a, 0xcc, 0xf7, 0x04, 0xe1, 0xcb, 0x89, 0xe4, 0xda, 0xf6, 0xf2, 0xd7, 0x12, 0x33, 0x6b, 0x14, - 0xba, 0xcd, 0x47, 0x2a, 0xa3, 0x7d, 0x03, 0x69, 0xd8, 0x7b, 0xf8, 0xca, 0x63, 0xf0, 0x44, 0x4b, - 0xf7, 0x0e, 0x3a, 0x7b, 0x73, 0x9a, 0xd5, 0x9e, 0x6f, 0x59, 0x2d, 0x2b, 0xf8, 0xa6, 0x8a, 0x9f, - 0xc8, 0x03, 0xf9, 0x8b, 0x7d, 0x57, 0xcd, 0xfa, 0xd2, 0x99, 0xd8, 0x8f, 0xb0, 0x95, 0x2d, 0x98, - 0x62, 0xc6, 0x0a, 0xf9, 0xb0, 0x43, 0x8f, 0x27, 0xd2, 0x3d, 0x2f, 0xc7, 0x8a, 0xdf, 0x78, 0x9b, - 0x6c, 0xd7, 0xf2, 0x24, 0x83, 0x62, 0x1d, 0x3d, 0xc1, 0x54, 0x64, 0xb8, 0x2f, 0xc2, 0x47, 0x97, - 0x26, 0x72, 0x62, 0x18, 0xbf, 0xcb, 0x18, 0xa7, 0x42, 0x8c, 0x0d, 0x06, 0xad, 0xac, 0xc0, 0xf8, - 0x71, 0xb8, 0xfe, 0x8e, 0x71, 0xe5, 0x51, 0x98, 0x64, 0x0d, 0x26, 0x08, 0x89, 0xd6, 0x71, 0x3d, - 0xab, 0x4d, 0xea, 0xde, 0xbd, 0x69, 0xfe, 0xfe, 0x6d, 0xba, 0x56, 0x0a, 0x18, 0xb6, 0xe2, 0xa3, - 0x2a, 0x15, 0x20, 0xdf, 0xb2, 0x9a, 0x48, 0x33, 0x62, 0x18, 0x5e, 0x67, 0x8e, 0xf8, 0xf6, 0x95, - 0x4f, 0xc1, 0x34, 0xfe, 0x9b, 0x94, 0xa5, 0xb0, 0x27, 0xf1, 0x37, 0x69, 0xc5, 0xef, 0xbd, 0x44, - 0x97, 0xe3, 0x94, 0x4f, 0x10, 0xf2, 0x29, 0x34, 0x8b, 0x2d, 0xe4, 0x79, 0xc8, 0x71, 0x15, 0xd5, - 0x18, 0xe4, 0x5e, 0xe8, 0x2a, 0xa2, 0xf8, 0x85, 0x77, 0xa2, 0xb3, 0xb8, 0x46, 0x91, 0x55, 0xc3, - 0xa8, 0xec, 0xc2, 0xc9, 0x01, 0x59, 0x31, 0x04, 0xe7, 0xcb, 0x8c, 0x73, 0xba, 0x2f, 0x33, 0x30, - 0xed, 0x36, 0x70, 0xb9, 0x3f, 0x97, 0x43, 0x70, 0xfe, 0x0e, 0xe3, 0x94, 0x18, 0x96, 0x4f, 0x29, - 0x66, 0x7c, 0x06, 0x26, 0x6f, 0x20, 0x67, 0xcf, 0x72, 0xd9, 0xf5, 0xcf, 0x10, 0x74, 0xaf, 0x30, - 0xba, 0x09, 0x06, 0x24, 0xf7, 0x41, 0x98, 0xeb, 0x12, 0x64, 0xf6, 0x55, 0x0d, 0x0d, 0x41, 0xf1, - 0x45, 0x46, 0x31, 0x86, 0xed, 0x31, 0xb4, 0x0a, 0xf9, 0x96, 0xc5, 0x76, 0xa6, 0x78, 0xf8, 0xab, - 0x0c, 0x9e, 0xe3, 0x18, 0x46, 0x61, 0x5b, 0x76, 0xc7, 0xc0, 0xdb, 0x56, 0x3c, 0xc5, 0xef, 0x72, - 0x0a, 0x8e, 0x61, 0x14, 0xc7, 0x08, 0xeb, 0xef, 0x71, 0x0a, 0x37, 0x14, 0xcf, 0xa7, 0x21, 0x67, - 0x99, 0x46, 0xd7, 0x32, 0x87, 0x71, 0xe2, 0x4b, 0x8c, 0x01, 0x18, 0x04, 0x13, 0x5c, 0x86, 0xec, - 0xb0, 0x13, 0xf1, 0x07, 0xef, 0xf0, 0xe5, 0xc1, 0x67, 0x60, 0x0d, 0x26, 0x78, 0x81, 0xd2, 0x2d, - 0x73, 0x08, 0x8a, 0xaf, 0x30, 0x8a, 0x42, 0x08, 0xc6, 0x86, 0xe1, 0x21, 0xd7, 0x6b, 0xa1, 0x61, - 0x48, 0x5e, 0xe3, 0xc3, 0x60, 0x10, 0x16, 0xca, 0x3d, 0x64, 0x6a, 0x07, 0xc3, 0x31, 0x7c, 0x95, - 0x87, 0x92, 0x63, 0x30, 0xc5, 0x0a, 0x8c, 0xb7, 0x55, 0xc7, 0x3d, 0x50, 0x8d, 0xa1, 0xa6, 0xe3, - 0x0f, 0x19, 0x47, 0xde, 0x07, 0xb1, 0x88, 0x74, 0xcc, 0xe3, 0xd0, 0x7c, 0x8d, 0x47, 0x24, 0x04, - 0x63, 0x4b, 0xcf, 0xf5, 0xc8, 0x5d, 0xd9, 0x71, 0xd8, 0xfe, 0x88, 0x2f, 0x3d, 0x8a, 0xdd, 0x0c, - 0x33, 0x5e, 0x86, 0xac, 0xab, 0xdf, 0x1a, 0x8a, 0xe6, 0x8f, 0xf9, 0x4c, 0x13, 0x00, 0x06, 0x3f, - 0x0f, 0xa7, 0x06, 0x6e, 0x13, 0x43, 0x90, 0xfd, 0x09, 0x23, 0x3b, 0x31, 0x60, 0xab, 0x60, 0x25, - 0xe1, 0xb8, 0x94, 0x7f, 0xca, 0x4b, 0x02, 0xea, 0xe1, 0xda, 0xc6, 0x67, 0x05, 0x57, 0xdd, 0x3f, - 0x5e, 0xd4, 0xfe, 0x8c, 0x47, 0x8d, 0x62, 0x23, 0x51, 0xdb, 0x81, 0x13, 0x8c, 0xf1, 0x78, 0xf3, - 0xfa, 0x75, 0x5e, 0x58, 0x29, 0x7a, 0x37, 0x3a, 0xbb, 0x9f, 0x86, 0x19, 0x3f, 0x9c, 0xbc, 0x29, - 0x75, 0x95, 0xb6, 0x6a, 0x0f, 0xc1, 0xfc, 0x0d, 0xc6, 0xcc, 0x2b, 0xbe, 0xdf, 0xd5, 0xba, 0x9b, - 0xaa, 0x8d, 0xc9, 0x9f, 0x83, 0x22, 0x27, 0xef, 0x98, 0x0e, 0xd2, 0xac, 0x96, 0xa9, 0xdf, 0x42, - 0xcd, 0x21, 0xa8, 0xff, 0xbc, 0x67, 0xaa, 0x76, 0x43, 0x70, 0xcc, 0xbc, 0x0e, 0xa2, 0xdf, 0xab, - 0x28, 0x7a, 0xdb, 0xb6, 0x1c, 0x2f, 0x86, 0xf1, 0x2f, 0xf8, 0x4c, 0xf9, 0xb8, 0x75, 0x02, 0xab, - 0xd4, 0xa0, 0x40, 0x1e, 0x87, 0x4d, 0xc9, 0xbf, 0x64, 0x44, 0xe3, 0x01, 0x8a, 0x15, 0x0e, 0xcd, - 0x6a, 0xdb, 0xaa, 0x33, 0x4c, 0xfd, 0xfb, 0x2b, 0x5e, 0x38, 0x18, 0x84, 0x15, 0x0e, 0xaf, 0x6b, - 0x23, 0xbc, 0xdb, 0x0f, 0xc1, 0xf0, 0x4d, 0x5e, 0x38, 0x38, 0x86, 0x51, 0xf0, 0x86, 0x61, 0x08, - 0x8a, 0xbf, 0xe6, 0x14, 0x1c, 0x83, 0x29, 0x3e, 0x19, 0x6c, 0xb4, 0x0e, 0x6a, 0xe9, 0xae, 0xe7, - 0xd0, 0x56, 0xf8, 0xde, 0x54, 0xdf, 0x7a, 0x27, 0xda, 0x84, 0xc9, 0x21, 0x28, 0xae, 0x44, 0xec, - 0x0a, 0x95, 0x9c, 0x94, 0xe2, 0x1d, 0xfb, 0x36, 0xaf, 0x44, 0x21, 0x18, 0xf6, 0x2d, 0xd4, 0x21, - 0xe2, 0xb0, 0x6b, 0xf8, 0x7c, 0x30, 0x04, 0xdd, 0x77, 0x7a, 0x9c, 0x6b, 0x70, 0x2c, 0xe6, 0x0c, - 0xf5, 0x3f, 0x1d, 0xf3, 0x3a, 0xea, 0x0e, 0x95, 0x9d, 0x7f, 0xd3, 0xd3, 0xff, 0xec, 0x52, 0x24, - 0xad, 0x21, 0x13, 0x3d, 0xfd, 0x94, 0x14, 0xf7, 0x2b, 0xa0, 0xe2, 0xcf, 0xde, 0x65, 0xe3, 0x8d, - 0xb6, 0x53, 0x95, 0x0d, 0x9c, 0xe4, 0xd1, 0xa6, 0x27, 0x9e, 0xec, 0xa5, 0xbb, 0x7e, 0x9e, 0x47, - 0x7a, 0x9e, 0xca, 0x15, 0x18, 0x8f, 0x34, 0x3c, 0xf1, 0x54, 0x3f, 0xc7, 0xa8, 0xf2, 0xe1, 0x7e, - 0xa7, 0xb2, 0x04, 0x29, 0xdc, 0xbc, 0xc4, 0xc3, 0x7f, 0x9e, 0xc1, 0x89, 0x79, 0xe5, 0xe3, 0x90, - 0xe1, 0x4d, 0x4b, 0x3c, 0xf4, 0x17, 0x18, 0xd4, 0x87, 0x60, 0x38, 0x6f, 0x58, 0xe2, 0xe1, 0xbf, - 0xc8, 0xe1, 0x1c, 0x82, 0xe1, 0xc3, 0x87, 0xf0, 0x6f, 0x7f, 0x29, 0xc5, 0x36, 0x1d, 0x1e, 0xbb, - 0xcb, 0x30, 0xc6, 0x3a, 0x95, 0x78, 0xf4, 0x67, 0xd9, 0xcb, 0x39, 0xa2, 0x72, 0x01, 0xd2, 0x43, - 0x06, 0xfc, 0x57, 0x18, 0x94, 0xda, 0x57, 0x56, 0x20, 0x17, 0xea, 0x4e, 0xe2, 0xe1, 0xbf, 0xca, - 0xe0, 0x61, 0x14, 0x76, 0x9d, 0x75, 0x27, 0xf1, 0x04, 0xbf, 0xc6, 0x5d, 0x67, 0x08, 0x1c, 0x36, - 0xde, 0x98, 0xc4, 0xa3, 0x7f, 0x9d, 0x47, 0x9d, 0x43, 0x2a, 0x4f, 0x43, 0xd6, 0xdf, 0x6c, 0xe2, - 0xf1, 0xbf, 0xc1, 0xf0, 0x01, 0x06, 0x47, 0x20, 0xb4, 0xd9, 0xc5, 0x53, 0x7c, 0x8e, 0x47, 0x20, - 0x84, 0xc2, 0xcb, 0xa8, 0xb7, 0x81, 0x89, 0x67, 0xfa, 0x4d, 0xbe, 0x8c, 0x7a, 0xfa, 0x17, 0x3c, - 0x9b, 0xa4, 0xe6, 0xc7, 0x53, 0xfc, 0x16, 0x9f, 0x4d, 0x62, 0x8f, 0xdd, 0xe8, 0xed, 0x08, 0xe2, - 0x39, 0x7e, 0x9b, 0xbb, 0xd1, 0xd3, 0x10, 0x54, 0xb6, 0x41, 0xea, 0xef, 0x06, 0xe2, 0xf9, 0x3e, - 0xcf, 0xf8, 0x26, 0xfb, 0x9a, 0x81, 0xca, 0xb3, 0x70, 0x62, 0x70, 0x27, 0x10, 0xcf, 0xfa, 0x85, - 0xbb, 0x3d, 0x67, 0xb7, 0x70, 0x23, 0x50, 0xd9, 0x09, 0xb6, 0x94, 0x70, 0x17, 0x10, 0x4f, 0xfb, - 0xf2, 0xdd, 0x68, 0xe1, 0x0e, 0x37, 0x01, 0x95, 0x2a, 0x40, 0xb0, 0x01, 0xc7, 0x73, 0xbd, 0xc2, - 0xb8, 0x42, 0x20, 0xbc, 0x34, 0xd8, 0xfe, 0x1b, 0x8f, 0xff, 0x22, 0x5f, 0x1a, 0x0c, 0x81, 0x97, - 0x06, 0xdf, 0x7a, 0xe3, 0xd1, 0xaf, 0xf2, 0xa5, 0xc1, 0x21, 0x38, 0xb3, 0x43, 0xbb, 0x5b, 0x3c, - 0xc3, 0x97, 0x78, 0x66, 0x87, 0x50, 0x95, 0x2d, 0x98, 0xec, 0xdb, 0x10, 0xe3, 0xa9, 0xbe, 0xcc, - 0xa8, 0xc4, 0xde, 0xfd, 0x30, 0xbc, 0x79, 0xb1, 0xcd, 0x30, 0x9e, 0xed, 0xf7, 0x7b, 0x36, 0x2f, - 0xb6, 0x17, 0x56, 0x2e, 0x43, 0xc6, 0xec, 0x18, 0x06, 0x5e, 0x3c, 0xd2, 0xbd, 0x7f, 0xb9, 0x57, - 0xfc, 0xd7, 0xf7, 0x59, 0x74, 0x38, 0xa0, 0xb2, 0x04, 0x69, 0xd4, 0xde, 0x43, 0xcd, 0x38, 0xe4, - 0xbf, 0xbd, 0xcf, 0x0b, 0x26, 0xb6, 0xae, 0x3c, 0x0d, 0x40, 0xaf, 0x46, 0xc8, 0x67, 0xbf, 0x18, - 0xec, 0xbf, 0xbf, 0xcf, 0x7e, 0x53, 0x13, 0x40, 0x02, 0x02, 0xfa, 0x0b, 0x9d, 0x7b, 0x13, 0xbc, - 0x13, 0x25, 0x20, 0x33, 0x72, 0x09, 0xc6, 0xae, 0xb9, 0x96, 0xe9, 0xa9, 0xad, 0x38, 0xf4, 0x7f, - 0x30, 0x34, 0xb7, 0xc7, 0x01, 0x6b, 0x5b, 0x0e, 0xf2, 0xd4, 0x96, 0x1b, 0x87, 0xfd, 0x4f, 0x86, - 0xf5, 0x01, 0x18, 0xac, 0xa9, 0xae, 0x37, 0xcc, 0xb8, 0xff, 0x8b, 0x83, 0x39, 0x00, 0x3b, 0x8d, - 0xff, 0xbe, 0x8e, 0xba, 0x71, 0xd8, 0x77, 0xb9, 0xd3, 0xcc, 0xbe, 0xf2, 0x71, 0xc8, 0xe2, 0x3f, - 0xe9, 0x0f, 0xe5, 0x62, 0xc0, 0xff, 0xcd, 0xc0, 0x01, 0x02, 0xbf, 0xd9, 0xf5, 0x9a, 0x9e, 0x1e, - 0x1f, 0xec, 0xff, 0x61, 0x33, 0xcd, 0xed, 0x2b, 0x55, 0xc8, 0xb9, 0x5e, 0xb3, 0xd9, 0x61, 0xfd, - 0x69, 0x0c, 0xfc, 0x7f, 0xdf, 0xf7, 0xaf, 0x2c, 0x7c, 0x0c, 0x9e, 0xed, 0x9b, 0xd7, 0x3d, 0xdb, - 0x22, 0x9f, 0x39, 0xe2, 0x18, 0xee, 0x32, 0x86, 0x10, 0x64, 0xb9, 0x36, 0xf8, 0xfa, 0x16, 0xd6, - 0xac, 0x35, 0x8b, 0x5e, 0xdc, 0xbe, 0x50, 0x8e, 0xbf, 0x81, 0x85, 0x1f, 0x66, 0x60, 0x46, 0xb3, - 0xda, 0x7b, 0x96, 0x3b, 0xef, 0x97, 0xe3, 0x79, 0xcb, 0x64, 0x8c, 0x52, 0xd2, 0x32, 0xd1, 0xcc, - 0xf1, 0x6e, 0x72, 0xcb, 0xa7, 0x20, 0xdd, 0xe8, 0xec, 0xed, 0x75, 0x25, 0x11, 0x92, 0x6e, 0x67, - 0x8f, 0xfd, 0xdc, 0x0a, 0xff, 0x59, 0x7e, 0x33, 0x09, 0xe3, 0x55, 0xc3, 0xd8, 0xe9, 0xda, 0xc8, - 0xad, 0x9b, 0xa8, 0xbe, 0x2f, 0x15, 0x61, 0x94, 0x0c, 0xf5, 0x29, 0x62, 0x26, 0x5c, 0x1d, 0x91, - 0xd9, 0xb3, 0xaf, 0x59, 0x20, 0x77, 0xdc, 0x09, 0x5f, 0xb3, 0xe0, 0x6b, 0xce, 0xd1, 0x2b, 0x6e, - 0x5f, 0x73, 0xce, 0xd7, 0x2c, 0x92, 0x8b, 0xee, 0xa4, 0xaf, 0x59, 0xf4, 0x35, 0x4b, 0xe4, 0x43, - 0xce, 0xb8, 0xaf, 0x59, 0xf2, 0x35, 0xe7, 0xc9, 0xa7, 0x9b, 0x94, 0xaf, 0x39, 0xef, 0x6b, 0x2e, - 0x90, 0x2f, 0x36, 0x93, 0xbe, 0xe6, 0x82, 0xaf, 0xb9, 0x48, 0xbe, 0xd2, 0x48, 0xbe, 0xe6, 0xa2, - 0xaf, 0xb9, 0x44, 0x7e, 0x57, 0x35, 0xe6, 0x6b, 0x2e, 0x49, 0x33, 0x30, 0x46, 0x47, 0xf6, 0x24, - 0xf9, 0x94, 0x3f, 0x71, 0x75, 0x44, 0xe6, 0x82, 0x40, 0xf7, 0x14, 0xf9, 0xed, 0xd4, 0x68, 0xa0, - 0x7b, 0x2a, 0xd0, 0x2d, 0x90, 0xff, 0xc2, 0x21, 0x06, 0xba, 0x85, 0x40, 0x77, 0xae, 0x38, 0x8e, - 0x33, 0x24, 0xd0, 0x9d, 0x0b, 0x74, 0x8b, 0xc5, 0x02, 0x9e, 0x81, 0x40, 0xb7, 0x18, 0xe8, 0x96, - 0x8a, 0x13, 0x67, 0x84, 0xd9, 0x7c, 0xa0, 0x5b, 0x92, 0x9e, 0x80, 0x9c, 0xdb, 0xd9, 0x53, 0x58, - 0xad, 0x27, 0xbf, 0xd1, 0xca, 0x2d, 0xc0, 0x1c, 0xce, 0x09, 0x32, 0xad, 0x57, 0x47, 0x64, 0x70, - 0x3b, 0x7b, 0xac, 0x14, 0x2f, 0xe7, 0x81, 0xdc, 0x40, 0x29, 0xe4, 0xa7, 0xd5, 0xe5, 0x37, 0x04, - 0xc8, 0xee, 0xdc, 0xb4, 0xc8, 0x87, 0x7c, 0xf7, 0xff, 0x79, 0x72, 0xb9, 0xd3, 0xe7, 0x16, 0xc9, - 0xb7, 0xd6, 0xec, 0x55, 0x41, 0xe6, 0x82, 0x40, 0xb7, 0x54, 0x7c, 0x80, 0x0c, 0xc8, 0xd7, 0x2d, - 0x49, 0xf3, 0x90, 0x0f, 0x0d, 0x68, 0x81, 0xfc, 0x7a, 0x2a, 0x3a, 0x22, 0x41, 0xce, 0x05, 0x23, - 0x5a, 0x58, 0x4e, 0x03, 0x4e, 0x7b, 0xfc, 0x8f, 0x77, 0xd3, 0x2a, 0x7f, 0x2e, 0x01, 0x39, 0x7a, - 0x69, 0x4d, 0x46, 0x85, 0x5f, 0x45, 0xcf, 0x35, 0x5d, 0xe6, 0xc6, 0x88, 0xcc, 0x05, 0x92, 0x0c, - 0x40, 0x4d, 0x71, 0x86, 0x53, 0x4f, 0x96, 0x9f, 0xfc, 0xa7, 0x37, 0x4f, 0x3f, 0x7e, 0xe4, 0x0a, - 0xc2, 0xb1, 0x9b, 0xa7, 0x45, 0x7c, 0x6e, 0x57, 0x37, 0xbd, 0xa7, 0x16, 0x2e, 0xe2, 0x00, 0x07, - 0x2c, 0xd2, 0x2e, 0x64, 0x56, 0x54, 0x97, 0xfc, 0xee, 0x92, 0xb8, 0x9e, 0x5a, 0xbe, 0xf0, 0xc3, - 0x37, 0x4f, 0x9f, 0x8b, 0x61, 0x64, 0xf5, 0x75, 0x6e, 0xb3, 0x8b, 0x59, 0xcf, 0x2f, 0x62, 0xf8, - 0xd5, 0x11, 0xd9, 0xa7, 0x92, 0x16, 0xb8, 0xab, 0x5b, 0x6a, 0x9b, 0xfe, 0x4c, 0x2c, 0xb9, 0x2c, - 0x1e, 0xbe, 0x79, 0x3a, 0xbf, 0xd9, 0x0d, 0xe4, 0x81, 0x2b, 0xf8, 0x69, 0x39, 0x03, 0xa3, 0xd4, - 0xd5, 0xe5, 0xd5, 0xd7, 0xef, 0x94, 0x46, 0xde, 0xb8, 0x53, 0x1a, 0xf9, 0xc7, 0x3b, 0xa5, 0x91, - 0xb7, 0xee, 0x94, 0x84, 0x77, 0xef, 0x94, 0x84, 0xf7, 0xee, 0x94, 0x84, 0xdb, 0x87, 0x25, 0xe1, - 0xab, 0x87, 0x25, 0xe1, 0xeb, 0x87, 0x25, 0xe1, 0x5b, 0x87, 0x25, 0xe1, 0xf5, 0xc3, 0x92, 0xf0, - 0xc6, 0x61, 0x69, 0xe4, 0xad, 0xc3, 0x92, 0xf0, 0x83, 0xc3, 0xd2, 0xc8, 0xbb, 0x87, 0x25, 0xe1, - 0xbd, 0xc3, 0xd2, 0xc8, 0xed, 0xef, 0x97, 0x46, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x2f, - 0xe3, 0x3d, 0x71, 0x37, 0x00, 0x00, + // 4300 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x6b, 0x70, 0x1b, 0xd7, + 0x75, 0xe6, 0xe2, 0x41, 0x02, 0x07, 0x20, 0xb8, 0x5c, 0xd2, 0x12, 0x44, 0xc7, 0x90, 0x04, 0xdb, + 0x31, 0xfd, 0x22, 0x6d, 0x8a, 0xa4, 0x24, 0xa8, 0x89, 0x0b, 0x92, 0x10, 0x45, 0x97, 0x24, 0x98, + 0x05, 0x19, 0x3f, 0x32, 0x9d, 0x9d, 0xe5, 0xe2, 0x02, 0x5c, 0x69, 0xb1, 0xbb, 0xd9, 0x5d, 0x48, + 0x86, 0xa6, 0x3f, 0xd4, 0x71, 0x1f, 0x93, 0xe9, 0x3b, 0xed, 0x4c, 0x13, 0xd7, 0x71, 0x9b, 0x74, + 0x1a, 0xbb, 0xe9, 0x2b, 0xe9, 0x23, 0x4d, 0xd2, 0x3f, 0xfd, 0x93, 0xd6, 0xbf, 0x3a, 0xce, 0xbf, + 0x4e, 0xa7, 0xe3, 0xb1, 0x68, 0xcf, 0x34, 0x6d, 0xdd, 0xd6, 0x6d, 0xf5, 0xc3, 0x53, 0xcf, 0x74, + 0x3a, 0xf7, 0xb5, 0xbb, 0x78, 0x50, 0x0b, 0x66, 0x6a, 0xfb, 0x97, 0xb8, 0xe7, 0x9c, 0xef, 0xdb, + 0x73, 0xcf, 0x3d, 0xf7, 0xdc, 0x73, 0xef, 0x42, 0xf0, 0x7a, 0x09, 0xce, 0x34, 0x2d, 0xab, 0x69, + 0xa0, 0x79, 0xdb, 0xb1, 0x3c, 0x6b, 0xbf, 0xdd, 0x98, 0xaf, 0x23, 0x57, 0x73, 0x74, 0xdb, 0xb3, + 0x9c, 0x39, 0x22, 0x93, 0x26, 0xa8, 0xc5, 0x1c, 0xb7, 0x28, 0x6e, 0xc1, 0xe4, 0x65, 0xdd, 0x40, + 0x6b, 0xbe, 0x61, 0x0d, 0x79, 0xd2, 0x05, 0x48, 0x34, 0x74, 0x03, 0xe5, 0x85, 0x33, 0xf1, 0xd9, + 0xcc, 0xc2, 0x03, 0x73, 0x3d, 0xa0, 0xb9, 0x6e, 0xc4, 0x0e, 0x16, 0xcb, 0x04, 0x51, 0x7c, 0x27, + 0x01, 0x53, 0x03, 0xb4, 0x92, 0x04, 0x09, 0x53, 0x6d, 0x61, 0x46, 0x61, 0x36, 0x2d, 0x93, 0xbf, + 0xa5, 0x3c, 0x8c, 0xd9, 0xaa, 0x76, 0x4d, 0x6d, 0xa2, 0x7c, 0x8c, 0x88, 0xf9, 0xa3, 0x54, 0x00, + 0xa8, 0x23, 0x1b, 0x99, 0x75, 0x64, 0x6a, 0x9d, 0x7c, 0xfc, 0x4c, 0x7c, 0x36, 0x2d, 0x87, 0x24, + 0xd2, 0xa3, 0x30, 0x69, 0xb7, 0xf7, 0x0d, 0x5d, 0x53, 0x42, 0x66, 0x70, 0x26, 0x3e, 0x9b, 0x94, + 0x45, 0xaa, 0x58, 0x0b, 0x8c, 0x1f, 0x82, 0x89, 0x1b, 0x48, 0xbd, 0x16, 0x36, 0xcd, 0x10, 0xd3, + 0x1c, 0x16, 0x87, 0x0c, 0x57, 0x21, 0xdb, 0x42, 0xae, 0xab, 0x36, 0x91, 0xe2, 0x75, 0x6c, 0x94, + 0x4f, 0x90, 0xd1, 0x9f, 0xe9, 0x1b, 0x7d, 0xef, 0xc8, 0x33, 0x0c, 0xb5, 0xdb, 0xb1, 0x91, 0x54, + 0x86, 0x34, 0x32, 0xdb, 0x2d, 0xca, 0x90, 0x3c, 0x22, 0x7e, 0x15, 0xb3, 0xdd, 0xea, 0x65, 0x49, + 0x61, 0x18, 0xa3, 0x18, 0x73, 0x91, 0x73, 0x5d, 0xd7, 0x50, 0x7e, 0x94, 0x10, 0x3c, 0xd4, 0x47, + 0x50, 0xa3, 0xfa, 0x5e, 0x0e, 0x8e, 0x93, 0x56, 0x21, 0x8d, 0x5e, 0xf0, 0x90, 0xe9, 0xea, 0x96, + 0x99, 0x1f, 0x23, 0x24, 0x0f, 0x0e, 0x98, 0x45, 0x64, 0xd4, 0x7b, 0x29, 0x02, 0x9c, 0xb4, 0x0c, + 0x63, 0x96, 0xed, 0xe9, 0x96, 0xe9, 0xe6, 0x53, 0x67, 0x84, 0xd9, 0xcc, 0xc2, 0x27, 0x06, 0x26, + 0x42, 0x95, 0xda, 0xc8, 0xdc, 0x58, 0xda, 0x00, 0xd1, 0xb5, 0xda, 0x8e, 0x86, 0x14, 0xcd, 0xaa, + 0x23, 0x45, 0x37, 0x1b, 0x56, 0x3e, 0x4d, 0x08, 0x4e, 0xf7, 0x0f, 0x84, 0x18, 0xae, 0x5a, 0x75, + 0xb4, 0x61, 0x36, 0x2c, 0x39, 0xe7, 0x76, 0x3d, 0x4b, 0x27, 0x60, 0xd4, 0xed, 0x98, 0x9e, 0xfa, + 0x42, 0x3e, 0x4b, 0x32, 0x84, 0x3d, 0x15, 0xbf, 0x3b, 0x0a, 0x13, 0xc3, 0xa4, 0xd8, 0x25, 0x48, + 0x36, 0xf0, 0x28, 0xf3, 0xb1, 0xe3, 0xc4, 0x80, 0x62, 0xba, 0x83, 0x38, 0xfa, 0x23, 0x06, 0xb1, + 0x0c, 0x19, 0x13, 0xb9, 0x1e, 0xaa, 0xd3, 0x8c, 0x88, 0x0f, 0x99, 0x53, 0x40, 0x41, 0xfd, 0x29, + 0x95, 0xf8, 0x91, 0x52, 0xea, 0x59, 0x98, 0xf0, 0x5d, 0x52, 0x1c, 0xd5, 0x6c, 0xf2, 0xdc, 0x9c, + 0x8f, 0xf2, 0x64, 0xae, 0xc2, 0x71, 0x32, 0x86, 0xc9, 0x39, 0xd4, 0xf5, 0x2c, 0xad, 0x01, 0x58, + 0x26, 0xb2, 0x1a, 0x4a, 0x1d, 0x69, 0x46, 0x3e, 0x75, 0x44, 0x94, 0xaa, 0xd8, 0xa4, 0x2f, 0x4a, + 0x16, 0x95, 0x6a, 0x86, 0x74, 0x31, 0x48, 0xb5, 0xb1, 0x23, 0x32, 0x65, 0x8b, 0x2e, 0xb2, 0xbe, + 0x6c, 0xdb, 0x83, 0x9c, 0x83, 0x70, 0xde, 0xa3, 0x3a, 0x1b, 0x59, 0x9a, 0x38, 0x31, 0x17, 0x39, + 0x32, 0x99, 0xc1, 0xe8, 0xc0, 0xc6, 0x9d, 0xf0, 0xa3, 0x74, 0x3f, 0xf8, 0x02, 0x85, 0xa4, 0x15, + 0x90, 0x2a, 0x94, 0xe5, 0xc2, 0x6d, 0xb5, 0x85, 0x66, 0x6e, 0x42, 0xae, 0x3b, 0x3c, 0xd2, 0x34, + 0x24, 0x5d, 0x4f, 0x75, 0x3c, 0x92, 0x85, 0x49, 0x99, 0x3e, 0x48, 0x22, 0xc4, 0x91, 0x59, 0x27, + 0x55, 0x2e, 0x29, 0xe3, 0x3f, 0xa5, 0x1f, 0x0f, 0x06, 0x1c, 0x27, 0x03, 0xfe, 0x64, 0xff, 0x8c, + 0x76, 0x31, 0xf7, 0x8e, 0x7b, 0xe6, 0x3c, 0x8c, 0x77, 0x0d, 0x60, 0xd8, 0x57, 0x17, 0x7f, 0x0a, + 0xee, 0x19, 0x48, 0x2d, 0x3d, 0x0b, 0xd3, 0x6d, 0x53, 0x37, 0x3d, 0xe4, 0xd8, 0x0e, 0xc2, 0x19, + 0x4b, 0x5f, 0x95, 0xff, 0xa7, 0xb1, 0x23, 0x72, 0x6e, 0x2f, 0x6c, 0x4d, 0x59, 0xe4, 0xa9, 0x76, + 0xbf, 0xf0, 0x91, 0x74, 0xea, 0x87, 0x63, 0xe2, 0xad, 0x5b, 0xb7, 0x6e, 0xc5, 0x8a, 0x5f, 0x1a, + 0x85, 0xe9, 0x41, 0x6b, 0x66, 0xe0, 0xf2, 0x3d, 0x01, 0xa3, 0x66, 0xbb, 0xb5, 0x8f, 0x1c, 0x12, + 0xa4, 0xa4, 0xcc, 0x9e, 0xa4, 0x32, 0x24, 0x0d, 0x75, 0x1f, 0x19, 0xf9, 0xc4, 0x19, 0x61, 0x36, + 0xb7, 0xf0, 0xe8, 0x50, 0xab, 0x72, 0x6e, 0x13, 0x43, 0x64, 0x8a, 0x94, 0x3e, 0x0d, 0x09, 0x56, + 0xa2, 0x31, 0xc3, 0x23, 0xc3, 0x31, 0xe0, 0xb5, 0x24, 0x13, 0x9c, 0x74, 0x2f, 0xa4, 0xf1, 0xbf, + 0x34, 0x37, 0x46, 0x89, 0xcf, 0x29, 0x2c, 0xc0, 0x79, 0x21, 0xcd, 0x40, 0x8a, 0x2c, 0x93, 0x3a, + 0xe2, 0x5b, 0x9b, 0xff, 0x8c, 0x13, 0xab, 0x8e, 0x1a, 0x6a, 0xdb, 0xf0, 0x94, 0xeb, 0xaa, 0xd1, + 0x46, 0x24, 0xe1, 0xd3, 0x72, 0x96, 0x09, 0x3f, 0x8b, 0x65, 0xd2, 0x69, 0xc8, 0xd0, 0x55, 0xa5, + 0x9b, 0x75, 0xf4, 0x02, 0xa9, 0x9e, 0x49, 0x99, 0x2e, 0xb4, 0x0d, 0x2c, 0xc1, 0xaf, 0xbf, 0xea, + 0x5a, 0x26, 0x4f, 0x4d, 0xf2, 0x0a, 0x2c, 0x20, 0xaf, 0x3f, 0xdf, 0x5b, 0xb8, 0xef, 0x1b, 0x3c, + 0xbc, 0xde, 0x9c, 0x2a, 0x7e, 0x3b, 0x06, 0x09, 0x52, 0x2f, 0x26, 0x20, 0xb3, 0xfb, 0xdc, 0x4e, + 0x45, 0x59, 0xab, 0xee, 0xad, 0x6c, 0x56, 0x44, 0x41, 0xca, 0x01, 0x10, 0xc1, 0xe5, 0xcd, 0x6a, + 0x79, 0x57, 0x8c, 0xf9, 0xcf, 0x1b, 0xdb, 0xbb, 0xcb, 0x8b, 0x62, 0xdc, 0x07, 0xec, 0x51, 0x41, + 0x22, 0x6c, 0x70, 0x6e, 0x41, 0x4c, 0x4a, 0x22, 0x64, 0x29, 0xc1, 0xc6, 0xb3, 0x95, 0xb5, 0xe5, + 0x45, 0x71, 0xb4, 0x5b, 0x72, 0x6e, 0x41, 0x1c, 0x93, 0xc6, 0x21, 0x4d, 0x24, 0x2b, 0xd5, 0xea, + 0xa6, 0x98, 0xf2, 0x39, 0x6b, 0xbb, 0xf2, 0xc6, 0xf6, 0xba, 0x98, 0xf6, 0x39, 0xd7, 0xe5, 0xea, + 0xde, 0x8e, 0x08, 0x3e, 0xc3, 0x56, 0xa5, 0x56, 0x2b, 0xaf, 0x57, 0xc4, 0x8c, 0x6f, 0xb1, 0xf2, + 0xdc, 0x6e, 0xa5, 0x26, 0x66, 0xbb, 0xdc, 0x3a, 0xb7, 0x20, 0x8e, 0xfb, 0xaf, 0xa8, 0x6c, 0xef, + 0x6d, 0x89, 0x39, 0x69, 0x12, 0xc6, 0xe9, 0x2b, 0xb8, 0x13, 0x13, 0x3d, 0xa2, 0xe5, 0x45, 0x51, + 0x0c, 0x1c, 0xa1, 0x2c, 0x93, 0x5d, 0x82, 0xe5, 0x45, 0x51, 0x2a, 0xae, 0x42, 0x92, 0x64, 0x97, + 0x24, 0x41, 0x6e, 0xb3, 0xbc, 0x52, 0xd9, 0x54, 0xaa, 0x3b, 0xbb, 0x1b, 0xd5, 0xed, 0xf2, 0xa6, + 0x28, 0x04, 0x32, 0xb9, 0xf2, 0x99, 0xbd, 0x0d, 0xb9, 0xb2, 0x26, 0xc6, 0xc2, 0xb2, 0x9d, 0x4a, + 0x79, 0xb7, 0xb2, 0x26, 0xc6, 0x8b, 0x1a, 0x4c, 0x0f, 0xaa, 0x93, 0x03, 0x57, 0x46, 0x68, 0x8a, + 0x63, 0x47, 0x4c, 0x31, 0xe1, 0xea, 0x9b, 0xe2, 0xb7, 0x63, 0x30, 0x35, 0x60, 0xaf, 0x18, 0xf8, + 0x92, 0xa7, 0x20, 0x49, 0x53, 0x94, 0xee, 0x9e, 0x0f, 0x0f, 0xdc, 0x74, 0x48, 0xc2, 0xf6, 0xed, + 0xa0, 0x04, 0x17, 0xee, 0x20, 0xe2, 0x47, 0x74, 0x10, 0x98, 0xa2, 0xaf, 0xa6, 0xff, 0x64, 0x5f, + 0x4d, 0xa7, 0xdb, 0xde, 0xf2, 0x30, 0xdb, 0x1e, 0x91, 0x1d, 0xaf, 0xb6, 0x27, 0x07, 0xd4, 0xf6, + 0x4b, 0x30, 0xd9, 0x47, 0x34, 0x74, 0x8d, 0x7d, 0x51, 0x80, 0xfc, 0x51, 0xc1, 0x89, 0xa8, 0x74, + 0xb1, 0xae, 0x4a, 0x77, 0xa9, 0x37, 0x82, 0x67, 0x8f, 0x9e, 0x84, 0xbe, 0xb9, 0x7e, 0x55, 0x80, + 0x13, 0x83, 0x3b, 0xc5, 0x81, 0x3e, 0x7c, 0x1a, 0x46, 0x5b, 0xc8, 0x3b, 0xb0, 0x78, 0xb7, 0xf4, + 0xc9, 0x01, 0x7b, 0x30, 0x56, 0xf7, 0x4e, 0x36, 0x43, 0x85, 0x37, 0xf1, 0xf8, 0x51, 0xed, 0x1e, + 0xf5, 0xa6, 0xcf, 0xd3, 0x2f, 0xc4, 0xe0, 0x9e, 0x81, 0xe4, 0x03, 0x1d, 0xbd, 0x0f, 0x40, 0x37, + 0xed, 0xb6, 0x47, 0x3b, 0x22, 0x5a, 0x60, 0xd3, 0x44, 0x42, 0x8a, 0x17, 0x2e, 0x9e, 0x6d, 0xcf, + 0xd7, 0xc7, 0x89, 0x1e, 0xa8, 0x88, 0x18, 0x5c, 0x08, 0x1c, 0x4d, 0x10, 0x47, 0x0b, 0x47, 0x8c, + 0xb4, 0x2f, 0x31, 0x9f, 0x00, 0x51, 0x33, 0x74, 0x64, 0x7a, 0x8a, 0xeb, 0x39, 0x48, 0x6d, 0xe9, + 0x66, 0x93, 0xec, 0x20, 0xa9, 0x52, 0xb2, 0xa1, 0x1a, 0x2e, 0x92, 0x27, 0xa8, 0xba, 0xc6, 0xb5, + 0x18, 0x41, 0x12, 0xc8, 0x09, 0x21, 0x46, 0xbb, 0x10, 0x54, 0xed, 0x23, 0x8a, 0xbf, 0x98, 0x86, + 0x4c, 0xa8, 0xaf, 0x96, 0xce, 0x42, 0xf6, 0xaa, 0x7a, 0x5d, 0x55, 0xf8, 0x59, 0x89, 0x46, 0x22, + 0x83, 0x65, 0x3b, 0xec, 0xbc, 0xf4, 0x04, 0x4c, 0x13, 0x13, 0xab, 0xed, 0x21, 0x47, 0xd1, 0x0c, + 0xd5, 0x75, 0x49, 0xd0, 0x52, 0xc4, 0x54, 0xc2, 0xba, 0x2a, 0x56, 0xad, 0x72, 0x8d, 0xb4, 0x04, + 0x53, 0x04, 0xd1, 0x6a, 0x1b, 0x9e, 0x6e, 0x1b, 0x48, 0xc1, 0xa7, 0x37, 0x97, 0xec, 0x24, 0xbe, + 0x67, 0x93, 0xd8, 0x62, 0x8b, 0x19, 0x60, 0x8f, 0x5c, 0x69, 0x0d, 0xee, 0x23, 0xb0, 0x26, 0x32, + 0x91, 0xa3, 0x7a, 0x48, 0x41, 0x9f, 0x6f, 0xab, 0x86, 0xab, 0xa8, 0x66, 0x5d, 0x39, 0x50, 0xdd, + 0x83, 0xfc, 0x34, 0x26, 0x58, 0x89, 0xe5, 0x05, 0xf9, 0x14, 0x36, 0x5c, 0x67, 0x76, 0x15, 0x62, + 0x56, 0x36, 0xeb, 0x57, 0x54, 0xf7, 0x40, 0x2a, 0xc1, 0x09, 0xc2, 0xe2, 0x7a, 0x8e, 0x6e, 0x36, + 0x15, 0xed, 0x00, 0x69, 0xd7, 0x94, 0xb6, 0xd7, 0xb8, 0x90, 0xbf, 0x37, 0xfc, 0x7e, 0xe2, 0x61, + 0x8d, 0xd8, 0xac, 0x62, 0x93, 0x3d, 0xaf, 0x71, 0x41, 0xaa, 0x41, 0x16, 0x4f, 0x46, 0x4b, 0xbf, + 0x89, 0x94, 0x86, 0xe5, 0x90, 0xad, 0x31, 0x37, 0xa0, 0x34, 0x85, 0x22, 0x38, 0x57, 0x65, 0x80, + 0x2d, 0xab, 0x8e, 0x4a, 0xc9, 0xda, 0x4e, 0xa5, 0xb2, 0x26, 0x67, 0x38, 0xcb, 0x65, 0xcb, 0xc1, + 0x09, 0xd5, 0xb4, 0xfc, 0x00, 0x67, 0x68, 0x42, 0x35, 0x2d, 0x1e, 0xde, 0x25, 0x98, 0xd2, 0x34, + 0x3a, 0x66, 0x5d, 0x53, 0xd8, 0x19, 0xcb, 0xcd, 0x8b, 0x5d, 0xc1, 0xd2, 0xb4, 0x75, 0x6a, 0xc0, + 0x72, 0xdc, 0x95, 0x2e, 0xc2, 0x3d, 0x41, 0xb0, 0xc2, 0xc0, 0xc9, 0xbe, 0x51, 0xf6, 0x42, 0x97, + 0x60, 0xca, 0xee, 0xf4, 0x03, 0xa5, 0xae, 0x37, 0xda, 0x9d, 0x5e, 0xd8, 0x79, 0x98, 0xb6, 0x0f, + 0xec, 0x7e, 0xdc, 0x23, 0x61, 0x9c, 0x64, 0x1f, 0xd8, 0xbd, 0xc0, 0x07, 0xc9, 0x81, 0xdb, 0x41, + 0x9a, 0xea, 0xa1, 0x7a, 0xfe, 0x64, 0xd8, 0x3c, 0xa4, 0x90, 0xe6, 0x41, 0xd4, 0x34, 0x05, 0x99, + 0xea, 0xbe, 0x81, 0x14, 0xd5, 0x41, 0xa6, 0xea, 0xe6, 0x4f, 0x87, 0x8d, 0x73, 0x9a, 0x56, 0x21, + 0xda, 0x32, 0x51, 0x4a, 0x8f, 0xc0, 0xa4, 0xb5, 0x7f, 0x55, 0xa3, 0x29, 0xa9, 0xd8, 0x0e, 0x6a, + 0xe8, 0x2f, 0xe4, 0x1f, 0x20, 0xf1, 0x9d, 0xc0, 0x0a, 0x92, 0x90, 0x3b, 0x44, 0x2c, 0x3d, 0x0c, + 0xa2, 0xe6, 0x1e, 0xa8, 0x8e, 0x4d, 0x6a, 0xb2, 0x6b, 0xab, 0x1a, 0xca, 0x3f, 0x48, 0x4d, 0xa9, + 0x7c, 0x9b, 0x8b, 0xf1, 0x92, 0x70, 0x6f, 0xe8, 0x0d, 0x8f, 0x33, 0x3e, 0x44, 0x97, 0x04, 0x91, + 0x31, 0xb6, 0x59, 0x10, 0x71, 0x28, 0xba, 0x5e, 0x3c, 0x4b, 0xcc, 0x72, 0xf6, 0x81, 0x1d, 0x7e, + 0xef, 0xfd, 0x30, 0x8e, 0x2d, 0x83, 0x97, 0x3e, 0x4c, 0x1b, 0x32, 0xfb, 0x20, 0xf4, 0xc6, 0x45, + 0x38, 0x81, 0x8d, 0x5a, 0xc8, 0x53, 0xeb, 0xaa, 0xa7, 0x86, 0xac, 0x1f, 0x23, 0xd6, 0x38, 0xee, + 0x5b, 0x4c, 0xd9, 0xe5, 0xa7, 0xd3, 0xde, 0xef, 0xf8, 0x99, 0xf5, 0x38, 0xf5, 0x13, 0xcb, 0x78, + 0x6e, 0x7d, 0x68, 0x4d, 0x77, 0xb1, 0x04, 0xd9, 0x70, 0xe2, 0x4b, 0x69, 0xa0, 0xa9, 0x2f, 0x0a, + 0xb8, 0x0b, 0x5a, 0xad, 0xae, 0xe1, 0xfe, 0xe5, 0xf9, 0x8a, 0x18, 0xc3, 0x7d, 0xd4, 0xe6, 0xc6, + 0x6e, 0x45, 0x91, 0xf7, 0xb6, 0x77, 0x37, 0xb6, 0x2a, 0x62, 0x3c, 0xdc, 0xb0, 0x7f, 0x3f, 0x06, + 0xb9, 0xee, 0xb3, 0x97, 0xf4, 0x63, 0x70, 0x92, 0x5f, 0x94, 0xb8, 0xc8, 0x53, 0x6e, 0xe8, 0x0e, + 0x59, 0x8b, 0x2d, 0x95, 0xee, 0x8b, 0x7e, 0x36, 0x4c, 0x33, 0xab, 0x1a, 0xf2, 0x9e, 0xd1, 0x1d, + 0xbc, 0xd2, 0x5a, 0xaa, 0x27, 0x6d, 0xc2, 0x69, 0xd3, 0x52, 0x5c, 0x4f, 0x35, 0xeb, 0xaa, 0x53, + 0x57, 0x82, 0x2b, 0x2a, 0x45, 0xd5, 0x34, 0xe4, 0xba, 0x16, 0xdd, 0x03, 0x7d, 0x96, 0x4f, 0x98, + 0x56, 0x8d, 0x19, 0x07, 0x9b, 0x43, 0x99, 0x99, 0xf6, 0x64, 0x6e, 0xfc, 0xa8, 0xcc, 0xbd, 0x17, + 0xd2, 0x2d, 0xd5, 0x56, 0x90, 0xe9, 0x39, 0x1d, 0xd2, 0x71, 0xa7, 0xe4, 0x54, 0x4b, 0xb5, 0x2b, + 0xf8, 0xf9, 0xa3, 0x39, 0xf8, 0xfc, 0x63, 0x1c, 0xb2, 0xe1, 0xae, 0x1b, 0x1f, 0x62, 0x34, 0xb2, + 0x41, 0x09, 0xa4, 0x84, 0xdd, 0x7f, 0xd7, 0x1e, 0x7d, 0x6e, 0x15, 0xef, 0x5c, 0xa5, 0x51, 0xda, + 0x0b, 0xcb, 0x14, 0x89, 0xbb, 0x06, 0x9c, 0x5a, 0x88, 0xf6, 0x1e, 0x29, 0x99, 0x3d, 0x49, 0xeb, + 0x30, 0x7a, 0xd5, 0x25, 0xdc, 0xa3, 0x84, 0xfb, 0x81, 0xbb, 0x73, 0x3f, 0x5d, 0x23, 0xe4, 0xe9, + 0xa7, 0x6b, 0xca, 0x76, 0x55, 0xde, 0x2a, 0x6f, 0xca, 0x0c, 0x2e, 0x9d, 0x82, 0x84, 0xa1, 0xde, + 0xec, 0x74, 0xef, 0x71, 0x44, 0x34, 0x6c, 0xe0, 0x4f, 0x41, 0xe2, 0x06, 0x52, 0xaf, 0x75, 0xef, + 0x2c, 0x44, 0xf4, 0x21, 0xa6, 0xfe, 0x3c, 0x24, 0x49, 0xbc, 0x24, 0x00, 0x16, 0x31, 0x71, 0x44, + 0x4a, 0x41, 0x62, 0xb5, 0x2a, 0xe3, 0xf4, 0x17, 0x21, 0x4b, 0xa5, 0xca, 0xce, 0x46, 0x65, 0xb5, + 0x22, 0xc6, 0x8a, 0x4b, 0x30, 0x4a, 0x83, 0x80, 0x97, 0x86, 0x1f, 0x06, 0x71, 0x84, 0x3d, 0x32, + 0x0e, 0x81, 0x6b, 0xf7, 0xb6, 0x56, 0x2a, 0xb2, 0x18, 0x0b, 0x4f, 0xaf, 0x0b, 0xd9, 0x70, 0xc3, + 0xfd, 0xd1, 0xe4, 0xd4, 0xf7, 0x04, 0xc8, 0x84, 0x1a, 0x68, 0xdc, 0xf9, 0xa8, 0x86, 0x61, 0xdd, + 0x50, 0x54, 0x43, 0x57, 0x5d, 0x96, 0x14, 0x40, 0x44, 0x65, 0x2c, 0x19, 0x76, 0xd2, 0x3e, 0x12, + 0xe7, 0x5f, 0x11, 0x40, 0xec, 0xed, 0x5d, 0x7b, 0x1c, 0x14, 0x3e, 0x56, 0x07, 0x5f, 0x16, 0x20, + 0xd7, 0xdd, 0xb0, 0xf6, 0xb8, 0x77, 0xf6, 0x63, 0x75, 0xef, 0xad, 0x18, 0x8c, 0x77, 0xb5, 0xa9, + 0xc3, 0x7a, 0xf7, 0x79, 0x98, 0xd4, 0xeb, 0xa8, 0x65, 0x5b, 0x1e, 0x32, 0xb5, 0x8e, 0x62, 0xa0, + 0xeb, 0xc8, 0xc8, 0x17, 0x49, 0xa1, 0x98, 0xbf, 0x7b, 0x23, 0x3c, 0xb7, 0x11, 0xe0, 0x36, 0x31, + 0xac, 0x34, 0xb5, 0xb1, 0x56, 0xd9, 0xda, 0xa9, 0xee, 0x56, 0xb6, 0x57, 0x9f, 0x53, 0xf6, 0xb6, + 0x7f, 0x62, 0xbb, 0xfa, 0xcc, 0xb6, 0x2c, 0xea, 0x3d, 0x66, 0x1f, 0xe2, 0x52, 0xdf, 0x01, 0xb1, + 0xd7, 0x29, 0xe9, 0x24, 0x0c, 0x72, 0x4b, 0x1c, 0x91, 0xa6, 0x60, 0x62, 0xbb, 0xaa, 0xd4, 0x36, + 0xd6, 0x2a, 0x4a, 0xe5, 0xf2, 0xe5, 0xca, 0xea, 0x6e, 0x8d, 0x5e, 0x6d, 0xf8, 0xd6, 0xbb, 0xdd, + 0x8b, 0xfa, 0xa5, 0x38, 0x4c, 0x0d, 0xf0, 0x44, 0x2a, 0xb3, 0x43, 0x09, 0x3d, 0x27, 0x3d, 0x3e, + 0x8c, 0xf7, 0x73, 0xb8, 0x2b, 0xd8, 0x51, 0x1d, 0x8f, 0x9d, 0x61, 0x1e, 0x06, 0x1c, 0x25, 0xd3, + 0xd3, 0x1b, 0x3a, 0x72, 0xd8, 0x4d, 0x10, 0x3d, 0xa9, 0x4c, 0x04, 0x72, 0x7a, 0x19, 0xf4, 0x18, + 0x48, 0xb6, 0xe5, 0xea, 0x9e, 0x7e, 0x1d, 0x29, 0xba, 0xc9, 0xaf, 0x8d, 0xf0, 0xc9, 0x25, 0x21, + 0x8b, 0x5c, 0xb3, 0x61, 0x7a, 0xbe, 0xb5, 0x89, 0x9a, 0x6a, 0x8f, 0x35, 0x2e, 0xe0, 0x71, 0x59, + 0xe4, 0x1a, 0xdf, 0xfa, 0x2c, 0x64, 0xeb, 0x56, 0x1b, 0xb7, 0x73, 0xd4, 0x0e, 0xef, 0x17, 0x82, + 0x9c, 0xa1, 0x32, 0xdf, 0x84, 0x35, 0xea, 0xc1, 0x7d, 0x55, 0x56, 0xce, 0x50, 0x19, 0x35, 0x79, + 0x08, 0x26, 0xd4, 0x66, 0xd3, 0xc1, 0xe4, 0x9c, 0x88, 0x1e, 0x3d, 0x72, 0xbe, 0x98, 0x18, 0xce, + 0x3c, 0x0d, 0x29, 0x1e, 0x07, 0xbc, 0x25, 0xe3, 0x48, 0x28, 0x36, 0x3d, 0x4f, 0xc7, 0x66, 0xd3, + 0x72, 0xca, 0xe4, 0xca, 0xb3, 0x90, 0xd5, 0x5d, 0x25, 0xb8, 0x7e, 0x8f, 0x9d, 0x89, 0xcd, 0xa6, + 0xe4, 0x8c, 0xee, 0xfa, 0x57, 0x97, 0xc5, 0x57, 0x63, 0x90, 0xeb, 0xfe, 0x7c, 0x20, 0xad, 0x41, + 0xca, 0xb0, 0x34, 0x95, 0xa4, 0x16, 0xfd, 0x76, 0x35, 0x1b, 0xf1, 0xc5, 0x61, 0x6e, 0x93, 0xd9, + 0xcb, 0x3e, 0x72, 0xe6, 0xef, 0x04, 0x48, 0x71, 0xb1, 0x74, 0x02, 0x12, 0xb6, 0xea, 0x1d, 0x10, + 0xba, 0xe4, 0x4a, 0x4c, 0x14, 0x64, 0xf2, 0x8c, 0xe5, 0xae, 0xad, 0x9a, 0x24, 0x05, 0x98, 0x1c, + 0x3f, 0xe3, 0x79, 0x35, 0x90, 0x5a, 0x27, 0xe7, 0x1a, 0xab, 0xd5, 0x42, 0xa6, 0xe7, 0xf2, 0x79, + 0x65, 0xf2, 0x55, 0x26, 0x96, 0x1e, 0x85, 0x49, 0xcf, 0x51, 0x75, 0xa3, 0xcb, 0x36, 0x41, 0x6c, + 0x45, 0xae, 0xf0, 0x8d, 0x4b, 0x70, 0x8a, 0xf3, 0xd6, 0x91, 0xa7, 0x6a, 0x07, 0xa8, 0x1e, 0x80, + 0x46, 0xc9, 0xfd, 0xc5, 0x49, 0x66, 0xb0, 0xc6, 0xf4, 0x1c, 0x5b, 0xfc, 0x81, 0x00, 0x93, 0xfc, + 0x24, 0x56, 0xf7, 0x83, 0xb5, 0x05, 0xa0, 0x9a, 0xa6, 0xe5, 0x85, 0xc3, 0xd5, 0x9f, 0xca, 0x7d, + 0xb8, 0xb9, 0xb2, 0x0f, 0x92, 0x43, 0x04, 0x33, 0x2d, 0x80, 0x40, 0x73, 0x64, 0xd8, 0x4e, 0x43, + 0x86, 0x7d, 0x1b, 0x22, 0x1f, 0x18, 0xe9, 0xd9, 0x1d, 0xa8, 0x08, 0x1f, 0xd9, 0xa4, 0x69, 0x48, + 0xee, 0xa3, 0xa6, 0x6e, 0xb2, 0x1b, 0x5f, 0xfa, 0xc0, 0x6f, 0x58, 0x12, 0xfe, 0x0d, 0xcb, 0xca, + 0xe7, 0x60, 0x4a, 0xb3, 0x5a, 0xbd, 0xee, 0xae, 0x88, 0x3d, 0xf7, 0x07, 0xee, 0x15, 0xe1, 0x79, + 0x08, 0x5a, 0xcc, 0xf7, 0x05, 0xe1, 0x6b, 0xb1, 0xf8, 0xfa, 0xce, 0xca, 0x37, 0x62, 0x33, 0xeb, + 0x14, 0xba, 0xc3, 0x47, 0x2a, 0xa3, 0x86, 0x81, 0x34, 0xec, 0x3d, 0x7c, 0xfd, 0x51, 0x78, 0xbc, + 0xa9, 0x7b, 0x07, 0xed, 0xfd, 0x39, 0xcd, 0x6a, 0xcd, 0x37, 0xad, 0xa6, 0x15, 0x7c, 0x53, 0xc5, + 0x4f, 0xe4, 0x81, 0xfc, 0xc5, 0xbe, 0xab, 0xa6, 0x7d, 0xe9, 0x4c, 0xe4, 0x47, 0xd8, 0xd2, 0x36, + 0x4c, 0x31, 0x63, 0x85, 0x7c, 0xd8, 0xa1, 0xc7, 0x13, 0xe9, 0xae, 0x97, 0x63, 0xf9, 0x6f, 0xbd, + 0x43, 0xb6, 0x6b, 0x79, 0x92, 0x41, 0xb1, 0x8e, 0x9e, 0x60, 0x4a, 0x32, 0xdc, 0xd3, 0xc5, 0x47, + 0x97, 0x26, 0x72, 0x22, 0x18, 0xbf, 0xcf, 0x18, 0xa7, 0x42, 0x8c, 0x35, 0x06, 0x2d, 0xad, 0xc2, + 0xf8, 0x71, 0xb8, 0xfe, 0x86, 0x71, 0x65, 0x51, 0x98, 0x64, 0x1d, 0x26, 0x08, 0x89, 0xd6, 0x76, + 0x3d, 0xab, 0x45, 0xea, 0xde, 0xdd, 0x69, 0xfe, 0xf6, 0x1d, 0xba, 0x56, 0x72, 0x18, 0xb6, 0xea, + 0xa3, 0x4a, 0x25, 0x20, 0xdf, 0xb2, 0xea, 0x48, 0x33, 0x22, 0x18, 0x5e, 0x67, 0x8e, 0xf8, 0xf6, + 0xa5, 0xcf, 0xc2, 0x34, 0xfe, 0x9b, 0x94, 0xa5, 0xb0, 0x27, 0xd1, 0x37, 0x69, 0xf9, 0x1f, 0xbc, + 0x48, 0x97, 0xe3, 0x94, 0x4f, 0x10, 0xf2, 0x29, 0x34, 0x8b, 0x4d, 0xe4, 0x79, 0xc8, 0x71, 0x15, + 0xd5, 0x18, 0xe4, 0x5e, 0xe8, 0x2a, 0x22, 0xff, 0xe5, 0x77, 0xbb, 0x67, 0x71, 0x9d, 0x22, 0xcb, + 0x86, 0x51, 0xda, 0x83, 0x93, 0x03, 0xb2, 0x62, 0x08, 0xce, 0x97, 0x18, 0xe7, 0x74, 0x5f, 0x66, + 0x60, 0xda, 0x1d, 0xe0, 0x72, 0x7f, 0x2e, 0x87, 0xe0, 0xfc, 0x2d, 0xc6, 0x29, 0x31, 0x2c, 0x9f, + 0x52, 0xcc, 0xf8, 0x34, 0x4c, 0x5e, 0x47, 0xce, 0xbe, 0xe5, 0xb2, 0xeb, 0x9f, 0x21, 0xe8, 0x5e, + 0x66, 0x74, 0x13, 0x0c, 0x48, 0xee, 0x83, 0x30, 0xd7, 0x45, 0x48, 0x35, 0x54, 0x0d, 0x0d, 0x41, + 0xf1, 0x15, 0x46, 0x31, 0x86, 0xed, 0x31, 0xb4, 0x0c, 0xd9, 0xa6, 0xc5, 0x76, 0xa6, 0x68, 0xf8, + 0x2b, 0x0c, 0x9e, 0xe1, 0x18, 0x46, 0x61, 0x5b, 0x76, 0xdb, 0xc0, 0xdb, 0x56, 0x34, 0xc5, 0x6f, + 0x73, 0x0a, 0x8e, 0x61, 0x14, 0xc7, 0x08, 0xeb, 0xef, 0x70, 0x0a, 0x37, 0x14, 0xcf, 0xa7, 0x20, + 0x63, 0x99, 0x46, 0xc7, 0x32, 0x87, 0x71, 0xe2, 0xab, 0x8c, 0x01, 0x18, 0x04, 0x13, 0x5c, 0x82, + 0xf4, 0xb0, 0x13, 0xf1, 0x7b, 0xef, 0xf2, 0xe5, 0xc1, 0x67, 0x60, 0x1d, 0x26, 0x78, 0x81, 0xd2, + 0x2d, 0x73, 0x08, 0x8a, 0xaf, 0x33, 0x8a, 0x5c, 0x08, 0xc6, 0x86, 0xe1, 0x21, 0xd7, 0x6b, 0xa2, + 0x61, 0x48, 0x5e, 0xe5, 0xc3, 0x60, 0x10, 0x16, 0xca, 0x7d, 0x64, 0x6a, 0x07, 0xc3, 0x31, 0xbc, + 0xc6, 0x43, 0xc9, 0x31, 0x98, 0x62, 0x15, 0xc6, 0x5b, 0xaa, 0xe3, 0x1e, 0xa8, 0xc6, 0x50, 0xd3, + 0xf1, 0xfb, 0x8c, 0x23, 0xeb, 0x83, 0x58, 0x44, 0xda, 0xe6, 0x71, 0x68, 0xbe, 0xc1, 0x23, 0x12, + 0x82, 0xb1, 0xa5, 0xe7, 0x7a, 0xe4, 0xae, 0xec, 0x38, 0x6c, 0x7f, 0xc0, 0x97, 0x1e, 0xc5, 0x6e, + 0x85, 0x19, 0x2f, 0x41, 0xda, 0xd5, 0x6f, 0x0e, 0x45, 0xf3, 0x87, 0x7c, 0xa6, 0x09, 0x00, 0x83, + 0x9f, 0x83, 0x53, 0x03, 0xb7, 0x89, 0x21, 0xc8, 0xfe, 0x88, 0x91, 0x9d, 0x18, 0xb0, 0x55, 0xb0, + 0x92, 0x70, 0x5c, 0xca, 0x3f, 0xe6, 0x25, 0x01, 0xf5, 0x70, 0xed, 0xe0, 0xb3, 0x82, 0xab, 0x36, + 0x8e, 0x17, 0xb5, 0x3f, 0xe1, 0x51, 0xa3, 0xd8, 0xae, 0xa8, 0xed, 0xc2, 0x09, 0xc6, 0x78, 0xbc, + 0x79, 0xfd, 0x26, 0x2f, 0xac, 0x14, 0xbd, 0xd7, 0x3d, 0xbb, 0x9f, 0x83, 0x19, 0x3f, 0x9c, 0xbc, + 0x29, 0x75, 0x95, 0x96, 0x6a, 0x0f, 0xc1, 0xfc, 0x2d, 0xc6, 0xcc, 0x2b, 0xbe, 0xdf, 0xd5, 0xba, + 0x5b, 0xaa, 0x8d, 0xc9, 0x9f, 0x85, 0x3c, 0x27, 0x6f, 0x9b, 0x0e, 0xd2, 0xac, 0xa6, 0xa9, 0xdf, + 0x44, 0xf5, 0x21, 0xa8, 0xff, 0xb4, 0x67, 0xaa, 0xf6, 0x42, 0x70, 0xcc, 0xbc, 0x01, 0xa2, 0xdf, + 0xab, 0x28, 0x7a, 0xcb, 0xb6, 0x1c, 0x2f, 0x82, 0xf1, 0xcf, 0xf8, 0x4c, 0xf9, 0xb8, 0x0d, 0x02, + 0x2b, 0x55, 0x20, 0x47, 0x1e, 0x87, 0x4d, 0xc9, 0x3f, 0x67, 0x44, 0xe3, 0x01, 0x8a, 0x15, 0x0e, + 0xcd, 0x6a, 0xd9, 0xaa, 0x33, 0x4c, 0xfd, 0xfb, 0x0b, 0x5e, 0x38, 0x18, 0x84, 0x15, 0x0e, 0xaf, + 0x63, 0x23, 0xbc, 0xdb, 0x0f, 0xc1, 0xf0, 0x6d, 0x5e, 0x38, 0x38, 0x86, 0x51, 0xf0, 0x86, 0x61, + 0x08, 0x8a, 0xbf, 0xe4, 0x14, 0x1c, 0x83, 0x29, 0x3e, 0x13, 0x6c, 0xb4, 0x0e, 0x6a, 0xea, 0xae, + 0xe7, 0xd0, 0x56, 0xf8, 0xee, 0x54, 0xdf, 0x79, 0xb7, 0xbb, 0x09, 0x93, 0x43, 0x50, 0x5c, 0x89, + 0xd8, 0x15, 0x2a, 0x39, 0x29, 0x45, 0x3b, 0xf6, 0x5d, 0x5e, 0x89, 0x42, 0x30, 0xec, 0x5b, 0xa8, + 0x43, 0xc4, 0x61, 0xd7, 0xf0, 0xf9, 0x60, 0x08, 0xba, 0xef, 0xf5, 0x38, 0x57, 0xe3, 0x58, 0xcc, + 0x19, 0xea, 0x7f, 0xda, 0xe6, 0x35, 0xd4, 0x19, 0x2a, 0x3b, 0xff, 0xaa, 0xa7, 0xff, 0xd9, 0xa3, + 0x48, 0x5a, 0x43, 0x26, 0x7a, 0xfa, 0x29, 0x29, 0xea, 0x57, 0x40, 0xf9, 0x9f, 0xbe, 0xc3, 0xc6, + 0xdb, 0xdd, 0x4e, 0x95, 0x36, 0x71, 0x92, 0x77, 0x37, 0x3d, 0xd1, 0x64, 0x2f, 0xde, 0xf1, 0xf3, + 0xbc, 0xab, 0xe7, 0x29, 0x5d, 0x86, 0xf1, 0xae, 0x86, 0x27, 0x9a, 0xea, 0x67, 0x18, 0x55, 0x36, + 0xdc, 0xef, 0x94, 0x96, 0x20, 0x81, 0x9b, 0x97, 0x68, 0xf8, 0xcf, 0x32, 0x38, 0x31, 0x2f, 0x7d, + 0x0a, 0x52, 0xbc, 0x69, 0x89, 0x86, 0xfe, 0x1c, 0x83, 0xfa, 0x10, 0x0c, 0xe7, 0x0d, 0x4b, 0x34, + 0xfc, 0xe7, 0x39, 0x9c, 0x43, 0x30, 0x7c, 0xf8, 0x10, 0xfe, 0xf5, 0x2f, 0x24, 0xd8, 0xa6, 0xc3, + 0x63, 0x77, 0x09, 0xc6, 0x58, 0xa7, 0x12, 0x8d, 0xfe, 0x02, 0x7b, 0x39, 0x47, 0x94, 0xce, 0x43, + 0x72, 0xc8, 0x80, 0xff, 0x12, 0x83, 0x52, 0xfb, 0xd2, 0x2a, 0x64, 0x42, 0xdd, 0x49, 0x34, 0xfc, + 0x97, 0x19, 0x3c, 0x8c, 0xc2, 0xae, 0xb3, 0xee, 0x24, 0x9a, 0xe0, 0x57, 0xb8, 0xeb, 0x0c, 0x81, + 0xc3, 0xc6, 0x1b, 0x93, 0x68, 0xf4, 0xaf, 0xf2, 0xa8, 0x73, 0x48, 0xe9, 0x29, 0x48, 0xfb, 0x9b, + 0x4d, 0x34, 0xfe, 0xd7, 0x18, 0x3e, 0xc0, 0xe0, 0x08, 0x84, 0x36, 0xbb, 0x68, 0x8a, 0x2f, 0xf2, + 0x08, 0x84, 0x50, 0x78, 0x19, 0xf5, 0x36, 0x30, 0xd1, 0x4c, 0xbf, 0xce, 0x97, 0x51, 0x4f, 0xff, + 0x82, 0x67, 0x93, 0xd4, 0xfc, 0x68, 0x8a, 0xdf, 0xe0, 0xb3, 0x49, 0xec, 0xb1, 0x1b, 0xbd, 0x1d, + 0x41, 0x34, 0xc7, 0x6f, 0x72, 0x37, 0x7a, 0x1a, 0x82, 0xd2, 0x0e, 0x48, 0xfd, 0xdd, 0x40, 0x34, + 0xdf, 0x97, 0x18, 0xdf, 0x64, 0x5f, 0x33, 0x50, 0x7a, 0x06, 0x4e, 0x0c, 0xee, 0x04, 0xa2, 0x59, + 0xbf, 0x7c, 0xa7, 0xe7, 0xec, 0x16, 0x6e, 0x04, 0x4a, 0xbb, 0xc1, 0x96, 0x12, 0xee, 0x02, 0xa2, + 0x69, 0x5f, 0xba, 0xd3, 0x5d, 0xb8, 0xc3, 0x4d, 0x40, 0xa9, 0x0c, 0x10, 0x6c, 0xc0, 0xd1, 0x5c, + 0x2f, 0x33, 0xae, 0x10, 0x08, 0x2f, 0x0d, 0xb6, 0xff, 0x46, 0xe3, 0xbf, 0xc2, 0x97, 0x06, 0x43, + 0xe0, 0xa5, 0xc1, 0xb7, 0xde, 0x68, 0xf4, 0x2b, 0x7c, 0x69, 0x70, 0x08, 0xce, 0xec, 0xd0, 0xee, + 0x16, 0xcd, 0xf0, 0x55, 0x9e, 0xd9, 0x21, 0x54, 0x69, 0x1b, 0x26, 0xfb, 0x36, 0xc4, 0x68, 0xaa, + 0xaf, 0x31, 0x2a, 0xb1, 0x77, 0x3f, 0x0c, 0x6f, 0x5e, 0x6c, 0x33, 0x8c, 0x66, 0xfb, 0xdd, 0x9e, + 0xcd, 0x8b, 0xed, 0x85, 0xa5, 0x4b, 0x90, 0x32, 0xdb, 0x86, 0x81, 0x17, 0x8f, 0x74, 0xf7, 0x5f, + 0xee, 0xe5, 0xff, 0xf9, 0x03, 0x16, 0x1d, 0x0e, 0x28, 0x2d, 0x41, 0x12, 0xb5, 0xf6, 0x51, 0x3d, + 0x0a, 0xf9, 0x2f, 0x1f, 0xf0, 0x82, 0x89, 0xad, 0x4b, 0x4f, 0x01, 0xd0, 0xab, 0x11, 0xf2, 0xd9, + 0x2f, 0x02, 0xfb, 0xaf, 0x1f, 0xb0, 0xdf, 0xd4, 0x04, 0x90, 0x80, 0x80, 0xfe, 0x42, 0xe7, 0xee, + 0x04, 0xef, 0x76, 0x13, 0x90, 0x19, 0xb9, 0x08, 0x63, 0x57, 0x5d, 0xcb, 0xf4, 0xd4, 0x66, 0x14, + 0xfa, 0xdf, 0x18, 0x9a, 0xdb, 0xe3, 0x80, 0xb5, 0x2c, 0x07, 0x79, 0x6a, 0xd3, 0x8d, 0xc2, 0xfe, + 0x3b, 0xc3, 0xfa, 0x00, 0x0c, 0xd6, 0x54, 0xd7, 0x1b, 0x66, 0xdc, 0xff, 0xc1, 0xc1, 0x1c, 0x80, + 0x9d, 0xc6, 0x7f, 0x5f, 0x43, 0x9d, 0x28, 0xec, 0x7b, 0xdc, 0x69, 0x66, 0x5f, 0xfa, 0x14, 0xa4, + 0xf1, 0x9f, 0xf4, 0x87, 0x72, 0x11, 0xe0, 0xff, 0x64, 0xe0, 0x00, 0x81, 0xdf, 0xec, 0x7a, 0x75, + 0x4f, 0x8f, 0x0e, 0xf6, 0x7f, 0xb1, 0x99, 0xe6, 0xf6, 0xa5, 0x32, 0x64, 0x5c, 0xaf, 0x5e, 0x6f, + 0xb3, 0xfe, 0x34, 0x02, 0xfe, 0xdf, 0x1f, 0xf8, 0x57, 0x16, 0x3e, 0x06, 0xcf, 0xf6, 0x8d, 0x6b, + 0x9e, 0x6d, 0x91, 0xcf, 0x1c, 0x51, 0x0c, 0x77, 0x18, 0x43, 0x08, 0xb2, 0x52, 0x19, 0x7c, 0x7d, + 0x0b, 0xeb, 0xd6, 0xba, 0x45, 0x2f, 0x6e, 0x9f, 0x2f, 0x46, 0xdf, 0xc0, 0xc2, 0xff, 0xa6, 0x60, + 0x46, 0xb3, 0x5a, 0xfb, 0x96, 0x3b, 0xef, 0x97, 0xe3, 0x79, 0xcb, 0x64, 0x8c, 0x52, 0xdc, 0x32, + 0xd1, 0xcc, 0xf1, 0x6e, 0x72, 0x8b, 0xa7, 0x20, 0x59, 0x6b, 0xef, 0xef, 0x77, 0x24, 0x11, 0xe2, + 0x6e, 0x7b, 0x9f, 0xfd, 0xdc, 0x0a, 0xff, 0x59, 0x7c, 0x33, 0x0e, 0xe3, 0x65, 0xc3, 0xd8, 0xed, + 0xd8, 0xc8, 0xad, 0x9a, 0xa8, 0xda, 0x90, 0xf2, 0x30, 0x4a, 0x86, 0xfa, 0x24, 0x31, 0x13, 0xae, + 0x8c, 0xc8, 0xec, 0xd9, 0xd7, 0x2c, 0x90, 0x3b, 0xee, 0x98, 0xaf, 0x59, 0xf0, 0x35, 0xe7, 0xe8, + 0x15, 0xb7, 0xaf, 0x39, 0xe7, 0x6b, 0x16, 0xc9, 0x45, 0x77, 0xdc, 0xd7, 0x2c, 0xfa, 0x9a, 0x25, + 0xf2, 0x21, 0x67, 0xdc, 0xd7, 0x2c, 0xf9, 0x9a, 0x65, 0xf2, 0xe9, 0x26, 0xe1, 0x6b, 0x96, 0x7d, + 0xcd, 0x79, 0xf2, 0xc5, 0x66, 0xd2, 0xd7, 0x9c, 0xf7, 0x35, 0x17, 0xc8, 0x57, 0x1a, 0xc9, 0xd7, + 0x5c, 0xf0, 0x35, 0x17, 0xc9, 0xef, 0xaa, 0xc6, 0x7c, 0xcd, 0x45, 0x69, 0x06, 0xc6, 0xe8, 0xc8, + 0x9e, 0x20, 0x9f, 0xf2, 0x27, 0xae, 0x8c, 0xc8, 0x5c, 0x10, 0xe8, 0x9e, 0x24, 0xbf, 0x9d, 0x1a, + 0x0d, 0x74, 0x4f, 0x06, 0xba, 0x05, 0xf2, 0x5f, 0x38, 0xc4, 0x40, 0xb7, 0x10, 0xe8, 0xce, 0xe5, + 0xc7, 0x71, 0x86, 0x04, 0xba, 0x73, 0x81, 0x6e, 0x31, 0x9f, 0xc3, 0x33, 0x10, 0xe8, 0x16, 0x03, + 0xdd, 0x52, 0x7e, 0xe2, 0x8c, 0x30, 0x9b, 0x0d, 0x74, 0x4b, 0xd2, 0xe3, 0x90, 0x71, 0xdb, 0xfb, + 0x0a, 0xab, 0xf5, 0xe4, 0x37, 0x5a, 0x99, 0x05, 0x98, 0xc3, 0x39, 0x41, 0xa6, 0xf5, 0xca, 0x88, + 0x0c, 0x6e, 0x7b, 0x9f, 0x95, 0xe2, 0x95, 0x2c, 0x90, 0x1b, 0x28, 0x85, 0xfc, 0xb4, 0xba, 0xf8, + 0x86, 0x00, 0xe9, 0xdd, 0x1b, 0x16, 0xf9, 0x90, 0xef, 0xfe, 0x3f, 0x4f, 0x2e, 0x77, 0xfa, 0xdc, + 0x22, 0xf9, 0xd6, 0x9a, 0xbe, 0x22, 0xc8, 0x5c, 0x10, 0xe8, 0x96, 0xf2, 0xf7, 0x93, 0x01, 0xf9, + 0xba, 0x25, 0x69, 0x1e, 0xb2, 0xa1, 0x01, 0x2d, 0x90, 0x5f, 0x4f, 0x75, 0x8f, 0x48, 0x90, 0x33, + 0xc1, 0x88, 0x16, 0x56, 0x92, 0x80, 0xd3, 0x1e, 0xff, 0xe3, 0xdd, 0xb0, 0x8a, 0x5f, 0x8c, 0x41, + 0x86, 0x5e, 0x5a, 0x93, 0x51, 0xe1, 0x57, 0xd1, 0x73, 0x4d, 0x87, 0xb9, 0x31, 0x22, 0x73, 0x81, + 0x24, 0x03, 0x50, 0x53, 0x9c, 0xe1, 0xd4, 0x93, 0x95, 0x27, 0xfe, 0xe1, 0xcd, 0xd3, 0x8f, 0x1d, + 0xb9, 0x82, 0x70, 0xec, 0xe6, 0x69, 0x11, 0x9f, 0xdb, 0xd3, 0x4d, 0xef, 0xc9, 0x85, 0x0b, 0x38, + 0xc0, 0x01, 0x8b, 0xb4, 0x07, 0xa9, 0x55, 0xd5, 0x25, 0xbf, 0xbb, 0x24, 0xae, 0x27, 0x56, 0xce, + 0xff, 0xcf, 0x9b, 0xa7, 0xcf, 0x45, 0x30, 0xb2, 0xfa, 0x3a, 0xb7, 0xd5, 0xc1, 0xac, 0xcb, 0x8b, + 0x18, 0x7e, 0x65, 0x44, 0xf6, 0xa9, 0xa4, 0x05, 0xee, 0xea, 0xb6, 0xda, 0xa2, 0x3f, 0x13, 0x8b, + 0xaf, 0x88, 0x87, 0x6f, 0x9e, 0xce, 0x6e, 0x75, 0x02, 0x79, 0xe0, 0x0a, 0x7e, 0x5a, 0x49, 0xc1, + 0x28, 0x75, 0x75, 0xe5, 0xca, 0xeb, 0xb7, 0x0b, 0x23, 0x6f, 0xdc, 0x2e, 0x8c, 0xfc, 0xfd, 0xed, + 0xc2, 0xc8, 0x5b, 0xb7, 0x0b, 0xc2, 0x7b, 0xb7, 0x0b, 0xc2, 0xfb, 0xb7, 0x0b, 0xc2, 0xad, 0xc3, + 0x82, 0xf0, 0xda, 0x61, 0x41, 0xf8, 0xe6, 0x61, 0x41, 0xf8, 0xce, 0x61, 0x41, 0x78, 0xfd, 0xb0, + 0x20, 0xbc, 0x71, 0x58, 0x18, 0x79, 0xeb, 0xb0, 0x20, 0xfc, 0xf0, 0xb0, 0x30, 0xf2, 0xde, 0x61, + 0x41, 0x78, 0xff, 0xb0, 0x30, 0x72, 0xeb, 0xed, 0xc2, 0xc8, 0x6b, 0x6f, 0x17, 0x84, 0xff, 0x0b, + 0x00, 0x00, 0xff, 0xff, 0xd6, 0x23, 0x5a, 0xb4, 0x75, 0x37, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) @@ -3419,7 +4140,7 @@ func (m *Subby) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3427,26 +4148,33 @@ } func (m *Subby) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Subby) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Sub != nil { - dAtA[i] = 0xa - i++ + i -= len(*m.Sub) + copy(dAtA[i:], *m.Sub) i = encodeVarintOne(dAtA, i, uint64(len(*m.Sub))) - i += copy(dAtA[i:], *m.Sub) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *AllTypesOneOf) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3454,163 +4182,255 @@ } func (m *AllTypesOneOf) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.TestOneof != nil { - nn1, err1 := m.TestOneof.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + { + size := m.TestOneof.Size() + i -= size + if _, err := m.TestOneof.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn1 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field1) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x9 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field1) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - return i, nil + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field2) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x15 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - return i, nil + i-- + dAtA[i] = 0x15 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field3) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x18 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field3) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field3)) - return i, nil + i-- + dAtA[i] = 0x18 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field4) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x20 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field4) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field4)) - return i, nil + i-- + dAtA[i] = 0x20 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field5) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x28 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field5) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field5)) - return i, nil + i-- + dAtA[i] = 0x28 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field6) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x30 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field6) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field6)) - return i, nil + i-- + dAtA[i] = 0x30 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field7) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x38 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field7) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) - return i, nil + i-- + dAtA[i] = 0x38 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field8) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x40 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field8) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64((uint64(m.Field8)<<1)^uint64((m.Field8>>63)))) - return i, nil + i-- + dAtA[i] = 0x40 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field9) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x4d - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field9) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9)) - i += 4 - return i, nil + i-- + dAtA[i] = 0x4d + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field10) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x55 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field10) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10)) - i += 4 - return i, nil + i-- + dAtA[i] = 0x55 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field11) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x59 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field11) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11)) - i += 8 - return i, nil + i-- + dAtA[i] = 0x59 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field12) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x61 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field12) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12)) - i += 8 - return i, nil + i-- + dAtA[i] = 0x61 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field13) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x68 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field13) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i-- if m.Field13 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - return i, nil + i-- + dAtA[i] = 0x68 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field14) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x72 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field14) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= len(m.Field14) + copy(dAtA[i:], m.Field14) i = encodeVarintOne(dAtA, i, uint64(len(m.Field14))) - i += copy(dAtA[i:], m.Field14) - return i, nil + i-- + dAtA[i] = 0x72 + return len(dAtA) - i, nil } func (m *AllTypesOneOf_Field15) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_Field15) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Field15 != nil { - dAtA[i] = 0x7a - i++ + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) i = encodeVarintOne(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + i-- + dAtA[i] = 0x7a } - return i, nil + return len(dAtA) - i, nil } func (m *AllTypesOneOf_SubMessage) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllTypesOneOf_SubMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.SubMessage != nil { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintOne(dAtA, i, uint64(m.SubMessage.Size())) - n2, err2 := m.SubMessage.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + { + size, err := m.SubMessage.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOne(dAtA, i, uint64(size)) } - i += n2 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } - return i, nil + return len(dAtA) - i, nil } func (m *TwoOneofs) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3618,95 +4438,139 @@ } func (m *TwoOneofs) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.One != nil { - nn3, err3 := m.One.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 - } - i += nn3 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Two != nil { - nn4, err4 := m.Two.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 + { + size := m.Two.Size() + i -= size + if _, err := m.Two.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn4 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.One != nil { + { + size := m.One.Size() + i -= size + if _, err := m.One.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + } } - return i, nil + return len(dAtA) - i, nil } func (m *TwoOneofs_Field1) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x9 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_Field1) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - return i, nil + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *TwoOneofs_Field2) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x15 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_Field2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - return i, nil + i-- + dAtA[i] = 0x15 + return len(dAtA) - i, nil } func (m *TwoOneofs_Field3) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x18 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_Field3) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field3)) - return i, nil + i-- + dAtA[i] = 0x18 + return len(dAtA) - i, nil } func (m *TwoOneofs_Field34) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x2 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_Field34) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= len(m.Field34) + copy(dAtA[i:], m.Field34) i = encodeVarintOne(dAtA, i, uint64(len(m.Field34))) - i += copy(dAtA[i:], m.Field34) - return i, nil + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0x92 + return len(dAtA) - i, nil } func (m *TwoOneofs_Field35) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_Field35) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Field35 != nil { - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x2 - i++ + i -= len(m.Field35) + copy(dAtA[i:], m.Field35) i = encodeVarintOne(dAtA, i, uint64(len(m.Field35))) - i += copy(dAtA[i:], m.Field35) + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0x9a } - return i, nil + return len(dAtA) - i, nil } func (m *TwoOneofs_SubMessage2) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *TwoOneofs_SubMessage2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.SubMessage2 != nil { - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x2 - i++ - i = encodeVarintOne(dAtA, i, uint64(m.SubMessage2.Size())) - n5, err5 := m.SubMessage2.MarshalTo(dAtA[i:]) - if err5 != nil { - return 0, err5 + { + size, err := m.SubMessage2.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOne(dAtA, i, uint64(size)) } - i += n5 + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0xa2 } - return i, nil + return len(dAtA) - i, nil } func (m *CustomOneof) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3714,77 +4578,110 @@ } func (m *CustomOneof) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomOneof) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Custom != nil { - nn6, err6 := m.Custom.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 + { + size := m.Custom.Size() + i -= size + if _, err := m.Custom.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn6 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *CustomOneof_Stringy) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x2 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomOneof_Stringy) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= len(m.Stringy) + copy(dAtA[i:], m.Stringy) i = encodeVarintOne(dAtA, i, uint64(len(m.Stringy))) - i += copy(dAtA[i:], m.Stringy) - return i, nil + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0x92 + return len(dAtA) - i, nil } func (m *CustomOneof_CustomType) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x2 - i++ - i = encodeVarintOne(dAtA, i, uint64(m.CustomType.Size())) - n7, err7 := m.CustomType.MarshalTo(dAtA[i:]) - if err7 != nil { - return 0, err7 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomOneof_CustomType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + { + size := m.CustomType.Size() + i -= size + if _, err := m.CustomType.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintOne(dAtA, i, uint64(size)) } - i += n7 - return i, nil + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0x9a + return len(dAtA) - i, nil } func (m *CustomOneof_CastType) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0xa0 - i++ - dAtA[i] = 0x2 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomOneof_CastType) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.CastType)) - return i, nil + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0xa0 + return len(dAtA) - i, nil } func (m *CustomOneof_MyCustomName) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0xa8 - i++ - dAtA[i] = 0x2 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CustomOneof_MyCustomName) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.MyCustomName)) - return i, nil + i-- + dAtA[i] = 0x2 + i-- + dAtA[i] = 0xa8 + return len(dAtA) - i, nil } func encodeVarintOne(dAtA []byte, offset int, v uint64) int { + offset -= sovOne(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedSubby(r randyOne, easy bool) *Subby { this := &Subby{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := string(randStringOne(r)) this.Sub = &v1 } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/marshaler/onepb_test.go golang-gogoprotobuf-1.3.1/test/oneof/combos/marshaler/onepb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/marshaler/onepb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/marshaler/onepb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -489,6 +489,102 @@ } } +func TestSubbyCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSubby(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &Subby{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSubby(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestAllTypesOneOfCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedAllTypesOneOf(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &AllTypesOneOf{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedAllTypesOneOf(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestTwoOneofsCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedTwoOneofs(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &TwoOneofs{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedTwoOneofs(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestCustomOneofCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedCustomOneof(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &CustomOneof{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedCustomOneof(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} func TestOneDescription(t *testing.T) { OneDescription() } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/marshaler/one.proto golang-gogoprotobuf-1.3.1/test/oneof/combos/marshaler/one.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/marshaler/one.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/marshaler/one.proto 2020-05-17 12:22:58.000000000 +0000 @@ -54,6 +54,8 @@ option (gogoproto.unsafe_marshaler_all) = false; option (gogoproto.unsafe_unmarshaler_all) = false; +option (gogoproto.compare_all) = true; + message Subby { optional string sub = 1; } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/neither/one.pb.go golang-gogoprotobuf-1.3.1/test/oneof/combos/neither/one.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/neither/one.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/neither/one.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,7 +29,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Subby struct { Sub *string `protobuf:"bytes,1,opt,name=sub" json:"sub,omitempty"` @@ -113,55 +113,56 @@ Equal(interface{}) bool VerboseEqual(interface{}) error Size() int + Compare(interface{}) int } type AllTypesOneOf_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof" json:"Field1,omitempty"` } type AllTypesOneOf_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof" json:"Field2,omitempty"` } type AllTypesOneOf_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof" json:"Field3,omitempty"` } type AllTypesOneOf_Field4 struct { - Field4 int64 `protobuf:"varint,4,opt,name=Field4,oneof"` + Field4 int64 `protobuf:"varint,4,opt,name=Field4,oneof" json:"Field4,omitempty"` } type AllTypesOneOf_Field5 struct { - Field5 uint32 `protobuf:"varint,5,opt,name=Field5,oneof"` + Field5 uint32 `protobuf:"varint,5,opt,name=Field5,oneof" json:"Field5,omitempty"` } type AllTypesOneOf_Field6 struct { - Field6 uint64 `protobuf:"varint,6,opt,name=Field6,oneof"` + Field6 uint64 `protobuf:"varint,6,opt,name=Field6,oneof" json:"Field6,omitempty"` } type AllTypesOneOf_Field7 struct { - Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,oneof"` + Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,oneof" json:"Field7,omitempty"` } type AllTypesOneOf_Field8 struct { - Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,oneof"` + Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,oneof" json:"Field8,omitempty"` } type AllTypesOneOf_Field9 struct { - Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,oneof"` + Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,oneof" json:"Field9,omitempty"` } type AllTypesOneOf_Field10 struct { - Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,oneof"` + Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,oneof" json:"Field10,omitempty"` } type AllTypesOneOf_Field11 struct { - Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,oneof"` + Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,oneof" json:"Field11,omitempty"` } type AllTypesOneOf_Field12 struct { - Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,oneof"` + Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,oneof" json:"Field12,omitempty"` } type AllTypesOneOf_Field13 struct { - Field13 bool `protobuf:"varint,13,opt,name=Field13,oneof"` + Field13 bool `protobuf:"varint,13,opt,name=Field13,oneof" json:"Field13,omitempty"` } type AllTypesOneOf_Field14 struct { - Field14 string `protobuf:"bytes,14,opt,name=Field14,oneof"` + Field14 string `protobuf:"bytes,14,opt,name=Field14,oneof" json:"Field14,omitempty"` } type AllTypesOneOf_Field15 struct { - Field15 []byte `protobuf:"bytes,15,opt,name=Field15,oneof"` + Field15 []byte `protobuf:"bytes,15,opt,name=Field15,oneof" json:"Field15,omitempty"` } type AllTypesOneOf_SubMessage struct { - SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,oneof"` + SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,oneof" json:"sub_message,omitempty"` } func (*AllTypesOneOf_Field1) isAllTypesOneOf_TestOneof() {} @@ -300,9 +301,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*AllTypesOneOf) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _AllTypesOneOf_OneofMarshaler, _AllTypesOneOf_OneofUnmarshaler, _AllTypesOneOf_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*AllTypesOneOf) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*AllTypesOneOf_Field1)(nil), (*AllTypesOneOf_Field2)(nil), (*AllTypesOneOf_Field3)(nil), @@ -322,255 +323,6 @@ } } -func _AllTypesOneOf_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*AllTypesOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *AllTypesOneOf_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *AllTypesOneOf_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *AllTypesOneOf_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case *AllTypesOneOf_Field4: - _ = b.EncodeVarint(4<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field4)) - case *AllTypesOneOf_Field5: - _ = b.EncodeVarint(5<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field5)) - case *AllTypesOneOf_Field6: - _ = b.EncodeVarint(6<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field6)) - case *AllTypesOneOf_Field7: - _ = b.EncodeVarint(7<<3 | proto.WireVarint) - _ = b.EncodeZigzag32(uint64(x.Field7)) - case *AllTypesOneOf_Field8: - _ = b.EncodeVarint(8<<3 | proto.WireVarint) - _ = b.EncodeZigzag64(uint64(x.Field8)) - case *AllTypesOneOf_Field9: - _ = b.EncodeVarint(9<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field9)) - case *AllTypesOneOf_Field10: - _ = b.EncodeVarint(10<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field10)) - case *AllTypesOneOf_Field11: - _ = b.EncodeVarint(11<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field11)) - case *AllTypesOneOf_Field12: - _ = b.EncodeVarint(12<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field12)) - case *AllTypesOneOf_Field13: - t := uint64(0) - if x.Field13 { - t = 1 - } - _ = b.EncodeVarint(13<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *AllTypesOneOf_Field14: - _ = b.EncodeVarint(14<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field14) - case *AllTypesOneOf_Field15: - _ = b.EncodeVarint(15<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field15) - case *AllTypesOneOf_SubMessage: - _ = b.EncodeVarint(16<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("AllTypesOneOf.TestOneof has unexpected type %T", x) - } - return nil -} - -func _AllTypesOneOf_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*AllTypesOneOf) - switch tag { - case 1: // test_oneof.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field1{math.Float64frombits(x)} - return true, err - case 2: // test_oneof.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // test_oneof.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field3{int32(x)} - return true, err - case 4: // test_oneof.Field4 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field4{int64(x)} - return true, err - case 5: // test_oneof.Field5 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field5{uint32(x)} - return true, err - case 6: // test_oneof.Field6 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field6{x} - return true, err - case 7: // test_oneof.Field7 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag32() - m.TestOneof = &AllTypesOneOf_Field7{int32(x)} - return true, err - case 8: // test_oneof.Field8 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag64() - m.TestOneof = &AllTypesOneOf_Field8{int64(x)} - return true, err - case 9: // test_oneof.Field9 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field9{uint32(x)} - return true, err - case 10: // test_oneof.Field10 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field10{int32(x)} - return true, err - case 11: // test_oneof.Field11 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field11{x} - return true, err - case 12: // test_oneof.Field12 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field12{int64(x)} - return true, err - case 13: // test_oneof.Field13 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field13{x != 0} - return true, err - case 14: // test_oneof.Field14 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.TestOneof = &AllTypesOneOf_Field14{x} - return true, err - case 15: // test_oneof.Field15 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.TestOneof = &AllTypesOneOf_Field15{x} - return true, err - case 16: // test_oneof.sub_message - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.TestOneof = &AllTypesOneOf_SubMessage{msg} - return true, err - default: - return false, nil - } -} - -func _AllTypesOneOf_OneofSizer(msg proto.Message) (n int) { - m := msg.(*AllTypesOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *AllTypesOneOf_Field1: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field2: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case *AllTypesOneOf_Field4: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field4)) - case *AllTypesOneOf_Field5: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field5)) - case *AllTypesOneOf_Field6: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field6)) - case *AllTypesOneOf_Field7: - n += 1 // tag and wire - n += proto.SizeVarint(uint64((uint32(x.Field7) << 1) ^ uint32((int32(x.Field7) >> 31)))) - case *AllTypesOneOf_Field8: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(uint64(x.Field8<<1) ^ uint64((int64(x.Field8) >> 63)))) - case *AllTypesOneOf_Field9: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field10: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field11: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field12: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field13: - n += 1 // tag and wire - n += 1 - case *AllTypesOneOf_Field14: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field14))) - n += len(x.Field14) - case *AllTypesOneOf_Field15: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field15))) - n += len(x.Field15) - case *AllTypesOneOf_SubMessage: - s := proto.Size(x.SubMessage) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type TwoOneofs struct { // Types that are valid to be assigned to One: // *TwoOneofs_Field1 @@ -615,31 +367,33 @@ Equal(interface{}) bool VerboseEqual(interface{}) error Size() int + Compare(interface{}) int } type isTwoOneofs_Two interface { isTwoOneofs_Two() Equal(interface{}) bool VerboseEqual(interface{}) error Size() int + Compare(interface{}) int } type TwoOneofs_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof" json:"Field1,omitempty"` } type TwoOneofs_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof" json:"Field2,omitempty"` } type TwoOneofs_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof" json:"Field3,omitempty"` } type TwoOneofs_Field34 struct { - Field34 string `protobuf:"bytes,34,opt,name=Field34,oneof"` + Field34 string `protobuf:"bytes,34,opt,name=Field34,oneof" json:"Field34,omitempty"` } type TwoOneofs_Field35 struct { - Field35 []byte `protobuf:"bytes,35,opt,name=Field35,oneof"` + Field35 []byte `protobuf:"bytes,35,opt,name=Field35,oneof" json:"Field35,omitempty"` } type TwoOneofs_SubMessage2 struct { - SubMessage2 *Subby `protobuf:"bytes,36,opt,name=sub_message2,json=subMessage2,oneof"` + SubMessage2 *Subby `protobuf:"bytes,36,opt,name=sub_message2,json=subMessage2,oneof" json:"sub_message2,omitempty"` } func (*TwoOneofs_Field1) isTwoOneofs_One() {} @@ -704,9 +458,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*TwoOneofs) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _TwoOneofs_OneofMarshaler, _TwoOneofs_OneofUnmarshaler, _TwoOneofs_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TwoOneofs) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*TwoOneofs_Field1)(nil), (*TwoOneofs_Field2)(nil), (*TwoOneofs_Field3)(nil), @@ -716,133 +470,6 @@ } } -func _TwoOneofs_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*TwoOneofs) - // one - switch x := m.One.(type) { - case *TwoOneofs_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *TwoOneofs_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *TwoOneofs_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case nil: - default: - return fmt.Errorf("TwoOneofs.One has unexpected type %T", x) - } - // two - switch x := m.Two.(type) { - case *TwoOneofs_Field34: - _ = b.EncodeVarint(34<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field34) - case *TwoOneofs_Field35: - _ = b.EncodeVarint(35<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field35) - case *TwoOneofs_SubMessage2: - _ = b.EncodeVarint(36<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage2); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("TwoOneofs.Two has unexpected type %T", x) - } - return nil -} - -func _TwoOneofs_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*TwoOneofs) - switch tag { - case 1: // one.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.One = &TwoOneofs_Field1{math.Float64frombits(x)} - return true, err - case 2: // one.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.One = &TwoOneofs_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // one.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.One = &TwoOneofs_Field3{int32(x)} - return true, err - case 34: // two.Field34 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Two = &TwoOneofs_Field34{x} - return true, err - case 35: // two.Field35 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.Two = &TwoOneofs_Field35{x} - return true, err - case 36: // two.sub_message2 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.Two = &TwoOneofs_SubMessage2{msg} - return true, err - default: - return false, nil - } -} - -func _TwoOneofs_OneofSizer(msg proto.Message) (n int) { - m := msg.(*TwoOneofs) - // one - switch x := m.One.(type) { - case *TwoOneofs_Field1: - n += 1 // tag and wire - n += 8 - case *TwoOneofs_Field2: - n += 1 // tag and wire - n += 4 - case *TwoOneofs_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - // two - switch x := m.Two.(type) { - case *TwoOneofs_Field34: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field34))) - n += len(x.Field34) - case *TwoOneofs_Field35: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field35))) - n += len(x.Field35) - case *TwoOneofs_SubMessage2: - s := proto.Size(x.SubMessage2) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type CustomOneof struct { // Types that are valid to be assigned to Custom: // *CustomOneof_Stringy @@ -883,19 +510,20 @@ Equal(interface{}) bool VerboseEqual(interface{}) error Size() int + Compare(interface{}) int } type CustomOneof_Stringy struct { - Stringy string `protobuf:"bytes,34,opt,name=Stringy,oneof"` + Stringy string `protobuf:"bytes,34,opt,name=Stringy,oneof" json:"Stringy,omitempty"` } type CustomOneof_CustomType struct { - CustomType github_com_gogo_protobuf_test_custom.Uint128 `protobuf:"bytes,35,opt,name=CustomType,oneof,customtype=github.com/gogo/protobuf/test/custom.Uint128"` + CustomType github_com_gogo_protobuf_test_custom.Uint128 `protobuf:"bytes,35,opt,name=CustomType,oneof,customtype=github.com/gogo/protobuf/test/custom.Uint128" json:"CustomType,omitempty"` } type CustomOneof_CastType struct { - CastType github_com_gogo_protobuf_test_casttype.MyUint64Type `protobuf:"varint,36,opt,name=CastType,oneof,casttype=github.com/gogo/protobuf/test/casttype.MyUint64Type"` + CastType github_com_gogo_protobuf_test_casttype.MyUint64Type `protobuf:"varint,36,opt,name=CastType,oneof,casttype=github.com/gogo/protobuf/test/casttype.MyUint64Type" json:"CastType,omitempty"` } type CustomOneof_MyCustomName struct { - MyCustomName int64 `protobuf:"varint,37,opt,name=CustomName,oneof"` + MyCustomName int64 `protobuf:"varint,37,opt,name=CustomName,oneof" json:"CustomName,omitempty"` } func (*CustomOneof_Stringy) isCustomOneof_Custom() {} @@ -931,9 +559,9 @@ return 0 } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*CustomOneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _CustomOneof_OneofMarshaler, _CustomOneof_OneofUnmarshaler, _CustomOneof_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*CustomOneof) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*CustomOneof_Stringy)(nil), (*CustomOneof_CustomType)(nil), (*CustomOneof_CastType)(nil), @@ -941,100 +569,6 @@ } } -func _CustomOneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*CustomOneof) - // custom - switch x := m.Custom.(type) { - case *CustomOneof_Stringy: - _ = b.EncodeVarint(34<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Stringy) - case *CustomOneof_CustomType: - _ = b.EncodeVarint(35<<3 | proto.WireBytes) - dAtA, err := x.CustomType.Marshal() - if err != nil { - return err - } - _ = b.EncodeRawBytes(dAtA) - case *CustomOneof_CastType: - _ = b.EncodeVarint(36<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.CastType)) - case *CustomOneof_MyCustomName: - _ = b.EncodeVarint(37<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.MyCustomName)) - case nil: - default: - return fmt.Errorf("CustomOneof.Custom has unexpected type %T", x) - } - return nil -} - -func _CustomOneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*CustomOneof) - switch tag { - case 34: // custom.Stringy - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Custom = &CustomOneof_Stringy{x} - return true, err - case 35: // custom.CustomType - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - var cc github_com_gogo_protobuf_test_custom.Uint128 - c := &cc - err = c.Unmarshal(x) - m.Custom = &CustomOneof_CustomType{*c} - return true, err - case 36: // custom.CastType - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Custom = &CustomOneof_CastType{github_com_gogo_protobuf_test_casttype.MyUint64Type(x)} - return true, err - case 37: // custom.CustomName - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Custom = &CustomOneof_MyCustomName{int64(x)} - return true, err - default: - return false, nil - } -} - -func _CustomOneof_OneofSizer(msg proto.Message) (n int) { - m := msg.(*CustomOneof) - // custom - switch x := m.Custom.(type) { - case *CustomOneof_Stringy: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Stringy))) - n += len(x.Stringy) - case *CustomOneof_CustomType: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.CustomType.Size())) - n += x.CustomType.Size() - case *CustomOneof_CastType: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.CastType)) - case *CustomOneof_MyCustomName: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.MyCustomName)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*Subby)(nil), "one.Subby") proto.RegisterType((*AllTypesOneOf)(nil), "one.AllTypesOneOf") @@ -1045,47 +579,1234 @@ func init() { proto.RegisterFile("combos/neither/one.proto", fileDescriptor_e4ee9759a7520144) } var fileDescriptor_e4ee9759a7520144 = []byte{ - // 598 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0xd3, 0xbf, 0x4f, 0x1b, 0x3f, - 0x14, 0x00, 0x70, 0x3f, 0x42, 0x42, 0x70, 0xc2, 0x97, 0x7c, 0x6f, 0x72, 0x19, 0x8c, 0x95, 0xb6, - 0x92, 0x87, 0x92, 0x90, 0x4b, 0xc2, 0x8f, 0xb1, 0x47, 0x55, 0x65, 0xa1, 0x48, 0x07, 0xcc, 0x28, - 0x47, 0x4d, 0x88, 0x44, 0xce, 0x08, 0xfb, 0x84, 0xb2, 0xf1, 0x37, 0xf4, 0xaf, 0xe8, 0xd8, 0xb1, - 0x7f, 0x02, 0x23, 0x63, 0xd5, 0x21, 0xe2, 0xae, 0x4b, 0x47, 0x46, 0xd4, 0xa9, 0xf2, 0x1d, 0xb1, - 0x2b, 0x55, 0x55, 0x97, 0x4e, 0xb9, 0xf7, 0x3e, 0xe7, 0x97, 0xf7, 0xce, 0x36, 0x26, 0xa7, 0x72, - 0x12, 0x49, 0xd5, 0x8e, 0xc5, 0x58, 0x9f, 0x8b, 0xab, 0xb6, 0x8c, 0x45, 0xeb, 0xf2, 0x4a, 0x6a, - 0xe9, 0x95, 0x64, 0x2c, 0xd6, 0x36, 0x46, 0x63, 0x7d, 0x9e, 0x44, 0xad, 0x53, 0x39, 0x69, 0x8f, - 0xe4, 0x48, 0xb6, 0x73, 0x8b, 0x92, 0xb3, 0x3c, 0xca, 0x83, 0xfc, 0xa9, 0x58, 0xd3, 0x7c, 0x86, - 0xcb, 0x87, 0x49, 0x14, 0x4d, 0xbd, 0x06, 0x2e, 0xa9, 0x24, 0x22, 0xc0, 0x80, 0x2f, 0x87, 0xe6, - 0xb1, 0x39, 0x2b, 0xe1, 0x95, 0xd7, 0x17, 0x17, 0x47, 0xd3, 0x4b, 0xa1, 0x0e, 0x62, 0x71, 0x70, - 0xe6, 0x11, 0x5c, 0x79, 0x3b, 0x16, 0x17, 0xef, 0x3b, 0xf9, 0x6b, 0x30, 0x40, 0xe1, 0x53, 0x6c, - 0xc5, 0x27, 0x0b, 0x0c, 0xf8, 0x82, 0x15, 0xdf, 0x4a, 0x97, 0x94, 0x18, 0xf0, 0xb2, 0x95, 0xae, - 0x95, 0x1e, 0x59, 0x64, 0xc0, 0x4b, 0x56, 0x7a, 0x56, 0xfa, 0xa4, 0xcc, 0x80, 0xaf, 0x58, 0xe9, - 0x5b, 0xd9, 0x22, 0x15, 0x06, 0x7c, 0xd1, 0xca, 0x96, 0x95, 0x6d, 0xb2, 0xc4, 0x80, 0xff, 0x6f, - 0x65, 0xdb, 0xca, 0x0e, 0xa9, 0x32, 0xe0, 0x9e, 0x95, 0x1d, 0x2b, 0xbb, 0x64, 0x99, 0x01, 0x5f, - 0xb2, 0xb2, 0xeb, 0xad, 0xe1, 0xa5, 0x62, 0xb2, 0x4d, 0x82, 0x19, 0xf0, 0xd5, 0x01, 0x0a, 0xe7, - 0x09, 0x67, 0x1d, 0x52, 0x63, 0xc0, 0x2b, 0xce, 0x3a, 0xce, 0x7c, 0x52, 0x67, 0xc0, 0x1b, 0xce, - 0x7c, 0x67, 0x5d, 0xb2, 0xc2, 0x80, 0x57, 0x9d, 0x75, 0x9d, 0xf5, 0xc8, 0x7f, 0x66, 0x07, 0x9c, - 0xf5, 0x9c, 0xf5, 0xc9, 0x2a, 0x03, 0x5e, 0x77, 0xd6, 0xf7, 0x36, 0x70, 0x4d, 0x25, 0xd1, 0xc9, - 0x44, 0x28, 0x35, 0x1c, 0x09, 0xd2, 0x60, 0xc0, 0x6b, 0x3e, 0x6e, 0x99, 0x33, 0x91, 0x6f, 0xeb, - 0x00, 0x85, 0x58, 0x25, 0xd1, 0x7e, 0xe1, 0x41, 0x1d, 0x63, 0x2d, 0x94, 0x3e, 0x91, 0xb1, 0x90, - 0x67, 0xcd, 0x3b, 0xc0, 0xcb, 0x47, 0xd7, 0xf2, 0xc0, 0x04, 0xea, 0x1f, 0x6f, 0xee, 0xbc, 0xe9, - 0x6e, 0x8f, 0x34, 0xf3, 0x81, 0x20, 0x9c, 0x27, 0x9c, 0xf5, 0xc9, 0xf3, 0x7c, 0x20, 0x6b, 0x7d, - 0xaf, 0x8d, 0xeb, 0xbf, 0x0c, 0xe4, 0x93, 0x17, 0xbf, 0x4d, 0x04, 0x61, 0xcd, 0x4d, 0xe4, 0x07, - 0x65, 0x6c, 0x8e, 0xbd, 0xf9, 0xd1, 0xd7, 0xb2, 0xf9, 0x61, 0x01, 0xd7, 0xf6, 0x12, 0xa5, 0xe5, - 0x24, 0x9f, 0xca, 0xfc, 0xd5, 0xa1, 0xbe, 0x1a, 0xc7, 0xa3, 0xe9, 0x53, 0x1b, 0x28, 0x9c, 0x27, - 0xbc, 0x10, 0xe3, 0xe2, 0x55, 0x73, 0xc2, 0x8b, 0x4e, 0x82, 0xcd, 0xaf, 0xb3, 0xf5, 0x57, 0x7f, - 0xbc, 0x41, 0xe6, 0xdb, 0xb5, 0x4f, 0xf3, 0x35, 0xad, 0xe3, 0x71, 0xac, 0x3b, 0xfe, 0x8e, 0xf9, - 0xc0, 0xae, 0x8a, 0x77, 0x8c, 0xab, 0x7b, 0x43, 0xa5, 0xf3, 0x8a, 0xa6, 0xf5, 0xc5, 0x60, 0xfb, - 0xc7, 0x6c, 0xbd, 0xfb, 0x97, 0x8a, 0x43, 0xa5, 0xf5, 0xf4, 0x52, 0xb4, 0xf6, 0xa7, 0xa6, 0xea, - 0x56, 0xcf, 0x2c, 0x1f, 0xa0, 0xd0, 0x96, 0xf2, 0xfc, 0x79, 0xab, 0xef, 0x86, 0x13, 0x41, 0x5e, - 0x9a, 0xeb, 0x12, 0x34, 0xb2, 0xd9, 0x7a, 0x7d, 0x7f, 0xea, 0xf2, 0xae, 0x15, 0x13, 0x05, 0x55, - 0x5c, 0x29, 0x5a, 0x0d, 0xde, 0xdc, 0xa6, 0x14, 0xdd, 0xa5, 0x14, 0x7d, 0x49, 0x29, 0xba, 0x4f, - 0x29, 0x3c, 0xa4, 0x14, 0x1e, 0x53, 0x0a, 0x37, 0x19, 0x85, 0x8f, 0x19, 0x85, 0x4f, 0x19, 0x85, - 0xcf, 0x19, 0x85, 0xdb, 0x8c, 0xa2, 0xbb, 0x8c, 0xa2, 0xfb, 0x8c, 0xc2, 0xf7, 0x8c, 0xa2, 0x87, - 0x8c, 0xc2, 0x63, 0x46, 0xd1, 0xcd, 0x37, 0x8a, 0x7e, 0x06, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x27, - 0x4d, 0xb9, 0x78, 0x04, 0x00, 0x00, + // 599 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0xd3, 0x3f, 0x4f, 0x1b, 0x31, + 0x14, 0x00, 0x70, 0x3f, 0x42, 0x42, 0x70, 0x42, 0x49, 0x6f, 0x72, 0x19, 0x8c, 0x95, 0xb6, 0x92, + 0x87, 0x92, 0x90, 0x4b, 0xc2, 0x9f, 0xb1, 0x87, 0x54, 0x65, 0xa1, 0x48, 0x07, 0xcc, 0x28, 0x47, + 0x4d, 0x88, 0x44, 0xce, 0x08, 0xfb, 0x84, 0xb2, 0xf1, 0x19, 0xfa, 0x29, 0x18, 0x3b, 0xf6, 0x23, + 0x30, 0x66, 0xac, 0x3a, 0x44, 0xe4, 0x58, 0x3a, 0x32, 0xa2, 0x4e, 0x95, 0xef, 0x88, 0x5d, 0xa9, + 0xaa, 0xba, 0x74, 0xca, 0xbd, 0xf7, 0x3b, 0xbf, 0xbc, 0x77, 0xb6, 0x31, 0x39, 0x95, 0xa3, 0x48, + 0xaa, 0x66, 0x2c, 0x86, 0xfa, 0x5c, 0x5c, 0x35, 0x65, 0x2c, 0x1a, 0x97, 0x57, 0x52, 0x4b, 0xaf, + 0x20, 0x63, 0xb1, 0xb6, 0x31, 0x18, 0xea, 0xf3, 0x24, 0x6a, 0x9c, 0xca, 0x51, 0x73, 0x20, 0x07, + 0xb2, 0x99, 0x59, 0x94, 0x9c, 0x65, 0x51, 0x16, 0x64, 0x4f, 0xf9, 0x9a, 0xfa, 0x2b, 0x5c, 0x3c, + 0x4c, 0xa2, 0x68, 0xec, 0xd5, 0x70, 0x41, 0x25, 0x11, 0x01, 0x06, 0x7c, 0x39, 0x34, 0x8f, 0xf5, + 0x69, 0x01, 0xaf, 0xbc, 0xbf, 0xb8, 0x38, 0x1a, 0x5f, 0x0a, 0x75, 0x10, 0x8b, 0x83, 0x33, 0x8f, + 0xe0, 0xd2, 0x87, 0xa1, 0xb8, 0xf8, 0xd4, 0xca, 0x5e, 0x83, 0x1e, 0x0a, 0x9f, 0x63, 0x2b, 0x3e, + 0x59, 0x60, 0xc0, 0x17, 0xac, 0xf8, 0x56, 0xda, 0xa4, 0xc0, 0x80, 0x17, 0xad, 0xb4, 0xad, 0x74, + 0xc8, 0x22, 0x03, 0x5e, 0xb0, 0xd2, 0xb1, 0xd2, 0x25, 0x45, 0x06, 0x7c, 0xc5, 0x4a, 0xd7, 0xca, + 0x16, 0x29, 0x31, 0xe0, 0x8b, 0x56, 0xb6, 0xac, 0x6c, 0x93, 0x25, 0x06, 0xfc, 0xa5, 0x95, 0x6d, + 0x2b, 0x3b, 0xa4, 0xcc, 0x80, 0x7b, 0x56, 0x76, 0xac, 0xec, 0x92, 0x65, 0x06, 0x7c, 0xc9, 0xca, + 0xae, 0xb7, 0x86, 0x97, 0xf2, 0xc9, 0x36, 0x09, 0x66, 0xc0, 0x57, 0x7b, 0x28, 0x9c, 0x27, 0x9c, + 0xb5, 0x48, 0x85, 0x01, 0x2f, 0x39, 0x6b, 0x39, 0xf3, 0x49, 0x95, 0x01, 0xaf, 0x39, 0xf3, 0x9d, + 0xb5, 0xc9, 0x0a, 0x03, 0x5e, 0x76, 0xd6, 0x76, 0xd6, 0x21, 0x2f, 0xcc, 0x0e, 0x38, 0xeb, 0x38, + 0xeb, 0x92, 0x55, 0x06, 0xbc, 0xea, 0xac, 0xeb, 0x6d, 0xe0, 0x8a, 0x4a, 0xa2, 0x93, 0x91, 0x50, + 0xaa, 0x3f, 0x10, 0xa4, 0xc6, 0x80, 0x57, 0x7c, 0xdc, 0x30, 0x67, 0x22, 0xdb, 0xd6, 0x1e, 0x0a, + 0xb1, 0x4a, 0xa2, 0xfd, 0xdc, 0x83, 0x2a, 0xc6, 0x5a, 0x28, 0x7d, 0x22, 0x63, 0x21, 0xcf, 0xea, + 0x13, 0xc0, 0xcb, 0x47, 0xd7, 0xf2, 0xc0, 0x04, 0xea, 0x3f, 0x6f, 0xee, 0xbc, 0xe9, 0x76, 0x87, + 0xd4, 0xb3, 0x81, 0x20, 0x9c, 0x27, 0x9c, 0x75, 0xc9, 0xeb, 0x6c, 0x20, 0x6b, 0x5d, 0xaf, 0x89, + 0xab, 0xbf, 0x0d, 0xe4, 0x93, 0x37, 0x7f, 0x4c, 0x04, 0x61, 0xc5, 0x4d, 0xe4, 0x07, 0x45, 0x6c, + 0x8e, 0xbd, 0xf9, 0xd1, 0xd7, 0xb2, 0xfe, 0x79, 0x01, 0x57, 0xf6, 0x12, 0xa5, 0xe5, 0x28, 0x9b, + 0xca, 0xfc, 0xd5, 0xa1, 0xbe, 0x1a, 0xc6, 0x83, 0xf1, 0x73, 0x1b, 0x28, 0x9c, 0x27, 0xbc, 0x10, + 0xe3, 0xfc, 0x55, 0x73, 0xc2, 0xf3, 0x4e, 0x82, 0xcd, 0xef, 0xd3, 0xf5, 0x77, 0x7f, 0xbd, 0x41, + 0xe6, 0xdb, 0x35, 0x4f, 0xb3, 0x35, 0x8d, 0xe3, 0x61, 0xac, 0x5b, 0xfe, 0x8e, 0xf9, 0xc0, 0xae, + 0x8a, 0x77, 0x8c, 0xcb, 0x7b, 0x7d, 0xa5, 0xb3, 0x8a, 0xa6, 0xf5, 0xc5, 0x60, 0xfb, 0xe7, 0x74, + 0xbd, 0xfd, 0x8f, 0x8a, 0x7d, 0xa5, 0xf5, 0xf8, 0x52, 0x34, 0xf6, 0xc7, 0xa6, 0xea, 0x56, 0xc7, + 0x2c, 0xef, 0xa1, 0xd0, 0x96, 0xf2, 0xfc, 0x79, 0xab, 0x1f, 0xfb, 0x23, 0x41, 0xde, 0x9a, 0xeb, + 0x12, 0xd4, 0xd2, 0xe9, 0x7a, 0x75, 0x7f, 0xec, 0xf2, 0xae, 0x15, 0x13, 0x05, 0x65, 0x5c, 0xca, + 0x5b, 0x0d, 0x7a, 0x77, 0x33, 0x8a, 0x26, 0x33, 0x8a, 0xbe, 0xcd, 0x28, 0xba, 0x9f, 0x51, 0x78, + 0x9c, 0x51, 0x78, 0x9a, 0x51, 0xb8, 0x49, 0x29, 0xdc, 0xa6, 0x14, 0xbe, 0xa4, 0x14, 0xbe, 0xa6, + 0x14, 0xee, 0x52, 0x8a, 0x26, 0x29, 0x45, 0xf7, 0x29, 0x85, 0x1f, 0x29, 0x45, 0x8f, 0x29, 0x85, + 0xa7, 0x94, 0xa2, 0x9b, 0x07, 0x8a, 0x6e, 0x1f, 0x28, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xbe, + 0x17, 0xbb, 0x31, 0x7c, 0x04, 0x00, 0x00, +} + +func (this *Subby) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Subby) + if !ok { + that2, ok := that.(Subby) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Sub != nil && that1.Sub != nil { + if *this.Sub != *that1.Sub { + if *this.Sub < *that1.Sub { + return -1 + } + return 1 + } + } else if this.Sub != nil { + return 1 + } else if that1.Sub != nil { + return -1 + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf) + if !ok { + that2, ok := that.(AllTypesOneOf) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.TestOneof == nil { + if this.TestOneof != nil { + return 1 + } + } else if this.TestOneof == nil { + return -1 + } else { + thisType := -1 + switch this.TestOneof.(type) { + case *AllTypesOneOf_Field1: + thisType = 0 + case *AllTypesOneOf_Field2: + thisType = 1 + case *AllTypesOneOf_Field3: + thisType = 2 + case *AllTypesOneOf_Field4: + thisType = 3 + case *AllTypesOneOf_Field5: + thisType = 4 + case *AllTypesOneOf_Field6: + thisType = 5 + case *AllTypesOneOf_Field7: + thisType = 6 + case *AllTypesOneOf_Field8: + thisType = 7 + case *AllTypesOneOf_Field9: + thisType = 8 + case *AllTypesOneOf_Field10: + thisType = 9 + case *AllTypesOneOf_Field11: + thisType = 10 + case *AllTypesOneOf_Field12: + thisType = 11 + case *AllTypesOneOf_Field13: + thisType = 12 + case *AllTypesOneOf_Field14: + thisType = 13 + case *AllTypesOneOf_Field15: + thisType = 14 + case *AllTypesOneOf_SubMessage: + thisType = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.TestOneof)) + } + that1Type := -1 + switch that1.TestOneof.(type) { + case *AllTypesOneOf_Field1: + that1Type = 0 + case *AllTypesOneOf_Field2: + that1Type = 1 + case *AllTypesOneOf_Field3: + that1Type = 2 + case *AllTypesOneOf_Field4: + that1Type = 3 + case *AllTypesOneOf_Field5: + that1Type = 4 + case *AllTypesOneOf_Field6: + that1Type = 5 + case *AllTypesOneOf_Field7: + that1Type = 6 + case *AllTypesOneOf_Field8: + that1Type = 7 + case *AllTypesOneOf_Field9: + that1Type = 8 + case *AllTypesOneOf_Field10: + that1Type = 9 + case *AllTypesOneOf_Field11: + that1Type = 10 + case *AllTypesOneOf_Field12: + that1Type = 11 + case *AllTypesOneOf_Field13: + that1Type = 12 + case *AllTypesOneOf_Field14: + that1Type = 13 + case *AllTypesOneOf_Field15: + that1Type = 14 + case *AllTypesOneOf_SubMessage: + that1Type = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.TestOneof)) + } + if thisType == that1Type { + if c := this.TestOneof.Compare(that1.TestOneof); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field1) + if !ok { + that2, ok := that.(AllTypesOneOf_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field2) + if !ok { + that2, ok := that.(AllTypesOneOf_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field3) + if !ok { + that2, ok := that.(AllTypesOneOf_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field4) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field4) + if !ok { + that2, ok := that.(AllTypesOneOf_Field4) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field4 != that1.Field4 { + if this.Field4 < that1.Field4 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field5) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field5) + if !ok { + that2, ok := that.(AllTypesOneOf_Field5) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field5 != that1.Field5 { + if this.Field5 < that1.Field5 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field6) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field6) + if !ok { + that2, ok := that.(AllTypesOneOf_Field6) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field6 != that1.Field6 { + if this.Field6 < that1.Field6 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field7) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field7) + if !ok { + that2, ok := that.(AllTypesOneOf_Field7) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field7 != that1.Field7 { + if this.Field7 < that1.Field7 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field8) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field8) + if !ok { + that2, ok := that.(AllTypesOneOf_Field8) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field8 != that1.Field8 { + if this.Field8 < that1.Field8 { + return -1 + } + return 1 + } + return 0 } +func (this *AllTypesOneOf_Field9) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + that1, ok := that.(*AllTypesOneOf_Field9) + if !ok { + that2, ok := that.(AllTypesOneOf_Field9) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field9 != that1.Field9 { + if this.Field9 < that1.Field9 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field10) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field10) + if !ok { + that2, ok := that.(AllTypesOneOf_Field10) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field10 != that1.Field10 { + if this.Field10 < that1.Field10 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field11) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field11) + if !ok { + that2, ok := that.(AllTypesOneOf_Field11) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field11 != that1.Field11 { + if this.Field11 < that1.Field11 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field12) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field12) + if !ok { + that2, ok := that.(AllTypesOneOf_Field12) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field12 != that1.Field12 { + if this.Field12 < that1.Field12 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field13) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field13) + if !ok { + that2, ok := that.(AllTypesOneOf_Field13) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field13 != that1.Field13 { + if !this.Field13 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field14) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field14) + if !ok { + that2, ok := that.(AllTypesOneOf_Field14) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field14 != that1.Field14 { + if this.Field14 < that1.Field14 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field15) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field15) + if !ok { + that2, ok := that.(AllTypesOneOf_Field15) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field15, that1.Field15); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf_SubMessage) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_SubMessage) + if !ok { + that2, ok := that.(AllTypesOneOf_SubMessage) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage.Compare(that1.SubMessage); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs) + if !ok { + that2, ok := that.(TwoOneofs) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.One == nil { + if this.One != nil { + return 1 + } + } else if this.One == nil { + return -1 + } else { + thisType := -1 + switch this.One.(type) { + case *TwoOneofs_Field1: + thisType = 0 + case *TwoOneofs_Field2: + thisType = 1 + case *TwoOneofs_Field3: + thisType = 2 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.One)) + } + that1Type := -1 + switch that1.One.(type) { + case *TwoOneofs_Field1: + that1Type = 0 + case *TwoOneofs_Field2: + that1Type = 1 + case *TwoOneofs_Field3: + that1Type = 2 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.One)) + } + if thisType == that1Type { + if c := this.One.Compare(that1.One); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if that1.Two == nil { + if this.Two != nil { + return 1 + } + } else if this.Two == nil { + return -1 + } else { + thisType := -1 + switch this.Two.(type) { + case *TwoOneofs_Field34: + thisType = 3 + case *TwoOneofs_Field35: + thisType = 4 + case *TwoOneofs_SubMessage2: + thisType = 5 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Two)) + } + that1Type := -1 + switch that1.Two.(type) { + case *TwoOneofs_Field34: + that1Type = 3 + case *TwoOneofs_Field35: + that1Type = 4 + case *TwoOneofs_SubMessage2: + that1Type = 5 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Two)) + } + if thisType == that1Type { + if c := this.Two.Compare(that1.Two); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field1) + if !ok { + that2, ok := that.(TwoOneofs_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field2) + if !ok { + that2, ok := that.(TwoOneofs_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field3) + if !ok { + that2, ok := that.(TwoOneofs_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field34) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field34) + if !ok { + that2, ok := that.(TwoOneofs_Field34) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field34 != that1.Field34 { + if this.Field34 < that1.Field34 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field35) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field35) + if !ok { + that2, ok := that.(TwoOneofs_Field35) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field35, that1.Field35); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs_SubMessage2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_SubMessage2) + if !ok { + that2, ok := that.(TwoOneofs_SubMessage2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage2.Compare(that1.SubMessage2); c != 0 { + return c + } + return 0 +} +func (this *CustomOneof) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof) + if !ok { + that2, ok := that.(CustomOneof) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.Custom == nil { + if this.Custom != nil { + return 1 + } + } else if this.Custom == nil { + return -1 + } else { + thisType := -1 + switch this.Custom.(type) { + case *CustomOneof_Stringy: + thisType = 0 + case *CustomOneof_CustomType: + thisType = 1 + case *CustomOneof_CastType: + thisType = 2 + case *CustomOneof_MyCustomName: + thisType = 3 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Custom)) + } + that1Type := -1 + switch that1.Custom.(type) { + case *CustomOneof_Stringy: + that1Type = 0 + case *CustomOneof_CustomType: + that1Type = 1 + case *CustomOneof_CastType: + that1Type = 2 + case *CustomOneof_MyCustomName: + that1Type = 3 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Custom)) + } + if thisType == that1Type { + if c := this.Custom.Compare(that1.Custom); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *CustomOneof_Stringy) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof_Stringy) + if !ok { + that2, ok := that.(CustomOneof_Stringy) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Stringy != that1.Stringy { + if this.Stringy < that1.Stringy { + return -1 + } + return 1 + } + return 0 +} +func (this *CustomOneof_CustomType) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof_CustomType) + if !ok { + that2, ok := that.(CustomOneof_CustomType) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.CustomType.Compare(that1.CustomType); c != 0 { + return c + } + return 0 +} +func (this *CustomOneof_CastType) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof_CastType) + if !ok { + that2, ok := that.(CustomOneof_CastType) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.CastType != that1.CastType { + if this.CastType < that1.CastType { + return -1 + } + return 1 + } + return 0 +} +func (this *CustomOneof_MyCustomName) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*CustomOneof_MyCustomName) + if !ok { + that2, ok := that.(CustomOneof_MyCustomName) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.MyCustomName != that1.MyCustomName { + if this.MyCustomName < that1.MyCustomName { + return -1 + } + return 1 + } + return 0 +} func (this *Subby) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { return OneDescription() } @@ -1101,276 +1822,276 @@ func OneDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 4299 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x7b, 0x6b, 0x70, 0x1b, 0xd7, - 0x75, 0x3f, 0xf1, 0x22, 0x81, 0x03, 0x10, 0x5c, 0x5e, 0xd2, 0x12, 0x44, 0xc7, 0x90, 0x04, 0xdb, - 0x31, 0xfd, 0x22, 0x6d, 0x8a, 0xd4, 0x03, 0xfa, 0x27, 0xfe, 0x83, 0x24, 0x44, 0xd1, 0x25, 0x09, - 0x66, 0x41, 0xc6, 0x8f, 0x4c, 0x67, 0x67, 0xb9, 0xb8, 0x04, 0x57, 0x5a, 0xec, 0x6e, 0x76, 0x17, - 0x92, 0xa1, 0xe9, 0x07, 0x75, 0xdc, 0xc7, 0x64, 0xfa, 0x4e, 0x3b, 0xd3, 0xc4, 0x75, 0xdc, 0x26, - 0x9d, 0xc6, 0x69, 0xfa, 0x4a, 0xfa, 0x48, 0x93, 0xf4, 0x4b, 0xbf, 0xa4, 0xf5, 0xa7, 0x8e, 0xf3, - 0xad, 0xd3, 0xe9, 0x78, 0x2c, 0xc6, 0x33, 0x4d, 0x5b, 0xb7, 0x75, 0x5b, 0x7d, 0xf0, 0xd4, 0x5f, - 0x3a, 0xf7, 0xb5, 0xbb, 0x78, 0x50, 0x0b, 0x66, 0x6a, 0xe7, 0x93, 0xb8, 0xe7, 0x9c, 0xdf, 0x6f, - 0xcf, 0x3d, 0xf7, 0xdc, 0x73, 0xcf, 0xbd, 0x0b, 0xc1, 0x1b, 0x65, 0x38, 0xd3, 0xb4, 0xac, 0xa6, - 0x81, 0xe7, 0x6d, 0xc7, 0xf2, 0xac, 0xbd, 0xf6, 0xfe, 0x7c, 0x03, 0xbb, 0x9a, 0xa3, 0xdb, 0x9e, - 0xe5, 0xcc, 0x51, 0x19, 0x9a, 0x60, 0x16, 0x73, 0xc2, 0xa2, 0xb4, 0x09, 0x93, 0x57, 0x74, 0x03, - 0xaf, 0xfa, 0x86, 0x75, 0xec, 0xa1, 0x8b, 0x90, 0xdc, 0xd7, 0x0d, 0x5c, 0x88, 0x9d, 0x49, 0xcc, - 0x66, 0x17, 0x1e, 0x9a, 0xeb, 0x01, 0xcd, 0x75, 0x23, 0xb6, 0x89, 0x58, 0xa6, 0x88, 0xd2, 0x3b, - 0x49, 0x98, 0x1a, 0xa0, 0x45, 0x08, 0x92, 0xa6, 0xda, 0x22, 0x8c, 0xb1, 0xd9, 0x8c, 0x4c, 0xff, - 0x46, 0x05, 0x18, 0xb3, 0x55, 0xed, 0xba, 0xda, 0xc4, 0x85, 0x38, 0x15, 0x8b, 0x47, 0x54, 0x04, - 0x68, 0x60, 0x1b, 0x9b, 0x0d, 0x6c, 0x6a, 0x9d, 0x42, 0xe2, 0x4c, 0x62, 0x36, 0x23, 0x87, 0x24, - 0xe8, 0x71, 0x98, 0xb4, 0xdb, 0x7b, 0x86, 0xae, 0x29, 0x21, 0x33, 0x38, 0x93, 0x98, 0x4d, 0xc9, - 0x12, 0x53, 0xac, 0x06, 0xc6, 0x8f, 0xc0, 0xc4, 0x4d, 0xac, 0x5e, 0x0f, 0x9b, 0x66, 0xa9, 0x69, - 0x9e, 0x88, 0x43, 0x86, 0x2b, 0x90, 0x6b, 0x61, 0xd7, 0x55, 0x9b, 0x58, 0xf1, 0x3a, 0x36, 0x2e, - 0x24, 0xe9, 0xe8, 0xcf, 0xf4, 0x8d, 0xbe, 0x77, 0xe4, 0x59, 0x8e, 0xda, 0xe9, 0xd8, 0x18, 0x55, - 0x20, 0x83, 0xcd, 0x76, 0x8b, 0x31, 0xa4, 0x8e, 0x88, 0x5f, 0xd5, 0x6c, 0xb7, 0x7a, 0x59, 0xd2, - 0x04, 0xc6, 0x29, 0xc6, 0x5c, 0xec, 0xdc, 0xd0, 0x35, 0x5c, 0x18, 0xa5, 0x04, 0x8f, 0xf4, 0x11, - 0xd4, 0x99, 0xbe, 0x97, 0x43, 0xe0, 0xd0, 0x0a, 0x64, 0xf0, 0x4b, 0x1e, 0x36, 0x5d, 0xdd, 0x32, - 0x0b, 0x63, 0x94, 0xe4, 0xe1, 0x01, 0xb3, 0x88, 0x8d, 0x46, 0x2f, 0x45, 0x80, 0x43, 0xe7, 0x61, - 0xcc, 0xb2, 0x3d, 0xdd, 0x32, 0xdd, 0x42, 0xfa, 0x4c, 0x6c, 0x36, 0xbb, 0xf0, 0xb1, 0x81, 0x89, - 0x50, 0x63, 0x36, 0xb2, 0x30, 0x46, 0xeb, 0x20, 0xb9, 0x56, 0xdb, 0xd1, 0xb0, 0xa2, 0x59, 0x0d, - 0xac, 0xe8, 0xe6, 0xbe, 0x55, 0xc8, 0x50, 0x82, 0xd3, 0xfd, 0x03, 0xa1, 0x86, 0x2b, 0x56, 0x03, - 0xaf, 0x9b, 0xfb, 0x96, 0x9c, 0x77, 0xbb, 0x9e, 0xd1, 0x09, 0x18, 0x75, 0x3b, 0xa6, 0xa7, 0xbe, - 0x54, 0xc8, 0xd1, 0x0c, 0xe1, 0x4f, 0xa5, 0xef, 0x8c, 0xc2, 0xc4, 0x30, 0x29, 0x76, 0x19, 0x52, - 0xfb, 0x64, 0x94, 0x85, 0xf8, 0x71, 0x62, 0xc0, 0x30, 0xdd, 0x41, 0x1c, 0xfd, 0x11, 0x83, 0x58, - 0x81, 0xac, 0x89, 0x5d, 0x0f, 0x37, 0x58, 0x46, 0x24, 0x86, 0xcc, 0x29, 0x60, 0xa0, 0xfe, 0x94, - 0x4a, 0xfe, 0x48, 0x29, 0xf5, 0x3c, 0x4c, 0xf8, 0x2e, 0x29, 0x8e, 0x6a, 0x36, 0x45, 0x6e, 0xce, - 0x47, 0x79, 0x32, 0x57, 0x15, 0x38, 0x99, 0xc0, 0xe4, 0x3c, 0xee, 0x7a, 0x46, 0xab, 0x00, 0x96, - 0x89, 0xad, 0x7d, 0xa5, 0x81, 0x35, 0xa3, 0x90, 0x3e, 0x22, 0x4a, 0x35, 0x62, 0xd2, 0x17, 0x25, - 0x8b, 0x49, 0x35, 0x03, 0x5d, 0x0a, 0x52, 0x6d, 0xec, 0x88, 0x4c, 0xd9, 0x64, 0x8b, 0xac, 0x2f, - 0xdb, 0x76, 0x21, 0xef, 0x60, 0x92, 0xf7, 0xb8, 0xc1, 0x47, 0x96, 0xa1, 0x4e, 0xcc, 0x45, 0x8e, - 0x4c, 0xe6, 0x30, 0x36, 0xb0, 0x71, 0x27, 0xfc, 0x88, 0x1e, 0x04, 0x5f, 0xa0, 0xd0, 0xb4, 0x02, - 0x5a, 0x85, 0x72, 0x42, 0xb8, 0xa5, 0xb6, 0xf0, 0xcc, 0x2d, 0xc8, 0x77, 0x87, 0x07, 0x4d, 0x43, - 0xca, 0xf5, 0x54, 0xc7, 0xa3, 0x59, 0x98, 0x92, 0xd9, 0x03, 0x92, 0x20, 0x81, 0xcd, 0x06, 0xad, - 0x72, 0x29, 0x99, 0xfc, 0x89, 0xfe, 0x7f, 0x30, 0xe0, 0x04, 0x1d, 0xf0, 0xc7, 0xfb, 0x67, 0xb4, - 0x8b, 0xb9, 0x77, 0xdc, 0x33, 0x17, 0x60, 0xbc, 0x6b, 0x00, 0xc3, 0xbe, 0xba, 0xf4, 0x53, 0x70, - 0xdf, 0x40, 0x6a, 0xf4, 0x3c, 0x4c, 0xb7, 0x4d, 0xdd, 0xf4, 0xb0, 0x63, 0x3b, 0x98, 0x64, 0x2c, - 0x7b, 0x55, 0xe1, 0x9f, 0xc6, 0x8e, 0xc8, 0xb9, 0xdd, 0xb0, 0x35, 0x63, 0x91, 0xa7, 0xda, 0xfd, - 0xc2, 0xc7, 0x32, 0xe9, 0x1f, 0x8e, 0x49, 0xb7, 0x6f, 0xdf, 0xbe, 0x1d, 0x2f, 0x7d, 0x61, 0x14, - 0xa6, 0x07, 0xad, 0x99, 0x81, 0xcb, 0xf7, 0x04, 0x8c, 0x9a, 0xed, 0xd6, 0x1e, 0x76, 0x68, 0x90, - 0x52, 0x32, 0x7f, 0x42, 0x15, 0x48, 0x19, 0xea, 0x1e, 0x36, 0x0a, 0xc9, 0x33, 0xb1, 0xd9, 0xfc, - 0xc2, 0xe3, 0x43, 0xad, 0xca, 0xb9, 0x0d, 0x02, 0x91, 0x19, 0x12, 0x7d, 0x12, 0x92, 0xbc, 0x44, - 0x13, 0x86, 0xc7, 0x86, 0x63, 0x20, 0x6b, 0x49, 0xa6, 0x38, 0x74, 0x3f, 0x64, 0xc8, 0xbf, 0x2c, - 0x37, 0x46, 0xa9, 0xcf, 0x69, 0x22, 0x20, 0x79, 0x81, 0x66, 0x20, 0x4d, 0x97, 0x49, 0x03, 0x8b, - 0xad, 0xcd, 0x7f, 0x26, 0x89, 0xd5, 0xc0, 0xfb, 0x6a, 0xdb, 0xf0, 0x94, 0x1b, 0xaa, 0xd1, 0xc6, - 0x34, 0xe1, 0x33, 0x72, 0x8e, 0x0b, 0x3f, 0x4d, 0x64, 0xe8, 0x34, 0x64, 0xd9, 0xaa, 0xd2, 0xcd, - 0x06, 0x7e, 0x89, 0x56, 0xcf, 0x94, 0xcc, 0x16, 0xda, 0x3a, 0x91, 0x90, 0xd7, 0x5f, 0x73, 0x2d, - 0x53, 0xa4, 0x26, 0x7d, 0x05, 0x11, 0xd0, 0xd7, 0x5f, 0xe8, 0x2d, 0xdc, 0x0f, 0x0c, 0x1e, 0x5e, - 0x6f, 0x4e, 0x95, 0xbe, 0x15, 0x87, 0x24, 0xad, 0x17, 0x13, 0x90, 0xdd, 0x79, 0x61, 0xbb, 0xaa, - 0xac, 0xd6, 0x76, 0x97, 0x37, 0xaa, 0x52, 0x0c, 0xe5, 0x01, 0xa8, 0xe0, 0xca, 0x46, 0xad, 0xb2, - 0x23, 0xc5, 0xfd, 0xe7, 0xf5, 0xad, 0x9d, 0xf3, 0x8b, 0x52, 0xc2, 0x07, 0xec, 0x32, 0x41, 0x32, - 0x6c, 0x70, 0x6e, 0x41, 0x4a, 0x21, 0x09, 0x72, 0x8c, 0x60, 0xfd, 0xf9, 0xea, 0xea, 0xf9, 0x45, - 0x69, 0xb4, 0x5b, 0x72, 0x6e, 0x41, 0x1a, 0x43, 0xe3, 0x90, 0xa1, 0x92, 0xe5, 0x5a, 0x6d, 0x43, - 0x4a, 0xfb, 0x9c, 0xf5, 0x1d, 0x79, 0x7d, 0x6b, 0x4d, 0xca, 0xf8, 0x9c, 0x6b, 0x72, 0x6d, 0x77, - 0x5b, 0x02, 0x9f, 0x61, 0xb3, 0x5a, 0xaf, 0x57, 0xd6, 0xaa, 0x52, 0xd6, 0xb7, 0x58, 0x7e, 0x61, - 0xa7, 0x5a, 0x97, 0x72, 0x5d, 0x6e, 0x9d, 0x5b, 0x90, 0xc6, 0xfd, 0x57, 0x54, 0xb7, 0x76, 0x37, - 0xa5, 0x3c, 0x9a, 0x84, 0x71, 0xf6, 0x0a, 0xe1, 0xc4, 0x44, 0x8f, 0xe8, 0xfc, 0xa2, 0x24, 0x05, - 0x8e, 0x30, 0x96, 0xc9, 0x2e, 0xc1, 0xf9, 0x45, 0x09, 0x95, 0x56, 0x20, 0x45, 0xb3, 0x0b, 0x21, - 0xc8, 0x6f, 0x54, 0x96, 0xab, 0x1b, 0x4a, 0x6d, 0x7b, 0x67, 0xbd, 0xb6, 0x55, 0xd9, 0x90, 0x62, - 0x81, 0x4c, 0xae, 0x7e, 0x6a, 0x77, 0x5d, 0xae, 0xae, 0x4a, 0xf1, 0xb0, 0x6c, 0xbb, 0x5a, 0xd9, - 0xa9, 0xae, 0x4a, 0x89, 0x92, 0x06, 0xd3, 0x83, 0xea, 0xe4, 0xc0, 0x95, 0x11, 0x9a, 0xe2, 0xf8, - 0x11, 0x53, 0x4c, 0xb9, 0xfa, 0xa6, 0xf8, 0x07, 0x71, 0x98, 0x1a, 0xb0, 0x57, 0x0c, 0x7c, 0xc9, - 0x33, 0x90, 0x62, 0x29, 0xca, 0x76, 0xcf, 0x47, 0x07, 0x6e, 0x3a, 0x34, 0x61, 0xfb, 0x76, 0x50, - 0x8a, 0x0b, 0x77, 0x10, 0x89, 0x23, 0x3a, 0x08, 0x42, 0xd1, 0x57, 0xd3, 0x7f, 0xb2, 0xaf, 0xa6, - 0xb3, 0x6d, 0xef, 0xfc, 0x30, 0xdb, 0x1e, 0x95, 0x1d, 0xaf, 0xb6, 0xa7, 0x06, 0xd4, 0xf6, 0xcb, - 0x30, 0xd9, 0x47, 0x34, 0x74, 0x8d, 0x7d, 0x39, 0x06, 0x85, 0xa3, 0x82, 0x13, 0x51, 0xe9, 0xe2, - 0x5d, 0x95, 0xee, 0x72, 0x6f, 0x04, 0xcf, 0x1e, 0x3d, 0x09, 0x7d, 0x73, 0xfd, 0x7a, 0x0c, 0x4e, - 0x0c, 0xee, 0x14, 0x07, 0xfa, 0xf0, 0x49, 0x18, 0x6d, 0x61, 0xef, 0xc0, 0x12, 0xdd, 0xd2, 0xc7, - 0x07, 0xec, 0xc1, 0x44, 0xdd, 0x3b, 0xd9, 0x1c, 0x15, 0xde, 0xc4, 0x13, 0x47, 0xb5, 0x7b, 0xcc, - 0x9b, 0x3e, 0x4f, 0x3f, 0x17, 0x87, 0xfb, 0x06, 0x92, 0x0f, 0x74, 0xf4, 0x01, 0x00, 0xdd, 0xb4, - 0xdb, 0x1e, 0xeb, 0x88, 0x58, 0x81, 0xcd, 0x50, 0x09, 0x2d, 0x5e, 0xa4, 0x78, 0xb6, 0x3d, 0x5f, - 0x9f, 0xa0, 0x7a, 0x60, 0x22, 0x6a, 0x70, 0x31, 0x70, 0x34, 0x49, 0x1d, 0x2d, 0x1e, 0x31, 0xd2, - 0xbe, 0xc4, 0x7c, 0x0a, 0x24, 0xcd, 0xd0, 0xb1, 0xe9, 0x29, 0xae, 0xe7, 0x60, 0xb5, 0xa5, 0x9b, - 0x4d, 0xba, 0x83, 0xa4, 0xcb, 0xa9, 0x7d, 0xd5, 0x70, 0xb1, 0x3c, 0xc1, 0xd4, 0x75, 0xa1, 0x25, - 0x08, 0x9a, 0x40, 0x4e, 0x08, 0x31, 0xda, 0x85, 0x60, 0x6a, 0x1f, 0x51, 0xfa, 0xc5, 0x0c, 0x64, - 0x43, 0x7d, 0x35, 0x3a, 0x0b, 0xb9, 0x6b, 0xea, 0x0d, 0x55, 0x11, 0x67, 0x25, 0x16, 0x89, 0x2c, - 0x91, 0x6d, 0xf3, 0xf3, 0xd2, 0x53, 0x30, 0x4d, 0x4d, 0xac, 0xb6, 0x87, 0x1d, 0x45, 0x33, 0x54, - 0xd7, 0xa5, 0x41, 0x4b, 0x53, 0x53, 0x44, 0x74, 0x35, 0xa2, 0x5a, 0x11, 0x1a, 0xb4, 0x04, 0x53, - 0x14, 0xd1, 0x6a, 0x1b, 0x9e, 0x6e, 0x1b, 0x58, 0x21, 0xa7, 0x37, 0x97, 0xee, 0x24, 0xbe, 0x67, - 0x93, 0xc4, 0x62, 0x93, 0x1b, 0x10, 0x8f, 0x5c, 0xb4, 0x0a, 0x0f, 0x50, 0x58, 0x13, 0x9b, 0xd8, - 0x51, 0x3d, 0xac, 0xe0, 0xcf, 0xb6, 0x55, 0xc3, 0x55, 0x54, 0xb3, 0xa1, 0x1c, 0xa8, 0xee, 0x41, - 0x61, 0x9a, 0x10, 0x2c, 0xc7, 0x0b, 0x31, 0xf9, 0x14, 0x31, 0x5c, 0xe3, 0x76, 0x55, 0x6a, 0x56, - 0x31, 0x1b, 0x57, 0x55, 0xf7, 0x00, 0x95, 0xe1, 0x04, 0x65, 0x71, 0x3d, 0x47, 0x37, 0x9b, 0x8a, - 0x76, 0x80, 0xb5, 0xeb, 0x4a, 0xdb, 0xdb, 0xbf, 0x58, 0xb8, 0x3f, 0xfc, 0x7e, 0xea, 0x61, 0x9d, - 0xda, 0xac, 0x10, 0x93, 0x5d, 0x6f, 0xff, 0x22, 0xaa, 0x43, 0x8e, 0x4c, 0x46, 0x4b, 0xbf, 0x85, - 0x95, 0x7d, 0xcb, 0xa1, 0x5b, 0x63, 0x7e, 0x40, 0x69, 0x0a, 0x45, 0x70, 0xae, 0xc6, 0x01, 0x9b, - 0x56, 0x03, 0x97, 0x53, 0xf5, 0xed, 0x6a, 0x75, 0x55, 0xce, 0x0a, 0x96, 0x2b, 0x96, 0x43, 0x12, - 0xaa, 0x69, 0xf9, 0x01, 0xce, 0xb2, 0x84, 0x6a, 0x5a, 0x22, 0xbc, 0x4b, 0x30, 0xa5, 0x69, 0x6c, - 0xcc, 0xba, 0xa6, 0xf0, 0x33, 0x96, 0x5b, 0x90, 0xba, 0x82, 0xa5, 0x69, 0x6b, 0xcc, 0x80, 0xe7, - 0xb8, 0x8b, 0x2e, 0xc1, 0x7d, 0x41, 0xb0, 0xc2, 0xc0, 0xc9, 0xbe, 0x51, 0xf6, 0x42, 0x97, 0x60, - 0xca, 0xee, 0xf4, 0x03, 0x51, 0xd7, 0x1b, 0xed, 0x4e, 0x2f, 0xec, 0x02, 0x4c, 0xdb, 0x07, 0x76, - 0x3f, 0xee, 0xb1, 0x30, 0x0e, 0xd9, 0x07, 0x76, 0x2f, 0xf0, 0x61, 0x7a, 0xe0, 0x76, 0xb0, 0xa6, - 0x7a, 0xb8, 0x51, 0x38, 0x19, 0x36, 0x0f, 0x29, 0xd0, 0x3c, 0x48, 0x9a, 0xa6, 0x60, 0x53, 0xdd, - 0x33, 0xb0, 0xa2, 0x3a, 0xd8, 0x54, 0xdd, 0xc2, 0xe9, 0xb0, 0x71, 0x5e, 0xd3, 0xaa, 0x54, 0x5b, - 0xa1, 0x4a, 0xf4, 0x18, 0x4c, 0x5a, 0x7b, 0xd7, 0x34, 0x96, 0x92, 0x8a, 0xed, 0xe0, 0x7d, 0xfd, - 0xa5, 0xc2, 0x43, 0x34, 0xbe, 0x13, 0x44, 0x41, 0x13, 0x72, 0x9b, 0x8a, 0xd1, 0xa3, 0x20, 0x69, - 0xee, 0x81, 0xea, 0xd8, 0xb4, 0x26, 0xbb, 0xb6, 0xaa, 0xe1, 0xc2, 0xc3, 0xcc, 0x94, 0xc9, 0xb7, - 0x84, 0x98, 0x2c, 0x09, 0xf7, 0xa6, 0xbe, 0xef, 0x09, 0xc6, 0x47, 0xd8, 0x92, 0xa0, 0x32, 0xce, - 0x36, 0x0b, 0x12, 0x09, 0x45, 0xd7, 0x8b, 0x67, 0xa9, 0x59, 0xde, 0x3e, 0xb0, 0xc3, 0xef, 0x7d, - 0x10, 0xc6, 0x89, 0x65, 0xf0, 0xd2, 0x47, 0x59, 0x43, 0x66, 0x1f, 0x84, 0xde, 0xb8, 0x08, 0x27, - 0x88, 0x51, 0x0b, 0x7b, 0x6a, 0x43, 0xf5, 0xd4, 0x90, 0xf5, 0x13, 0xd4, 0x9a, 0xc4, 0x7d, 0x93, - 0x2b, 0xbb, 0xfc, 0x74, 0xda, 0x7b, 0x1d, 0x3f, 0xb3, 0x9e, 0x64, 0x7e, 0x12, 0x99, 0xc8, 0xad, - 0x0f, 0xad, 0xe9, 0x2e, 0x95, 0x21, 0x17, 0x4e, 0x7c, 0x94, 0x01, 0x96, 0xfa, 0x52, 0x8c, 0x74, - 0x41, 0x2b, 0xb5, 0x55, 0xd2, 0xbf, 0xbc, 0x58, 0x95, 0xe2, 0xa4, 0x8f, 0xda, 0x58, 0xdf, 0xa9, - 0x2a, 0xf2, 0xee, 0xd6, 0xce, 0xfa, 0x66, 0x55, 0x4a, 0x84, 0x1b, 0xf6, 0xef, 0xc5, 0x21, 0xdf, - 0x7d, 0xf6, 0x42, 0xff, 0x0f, 0x4e, 0x8a, 0x8b, 0x12, 0x17, 0x7b, 0xca, 0x4d, 0xdd, 0xa1, 0x6b, - 0xb1, 0xa5, 0xb2, 0x7d, 0xd1, 0xcf, 0x86, 0x69, 0x6e, 0x55, 0xc7, 0xde, 0x73, 0xba, 0x43, 0x56, - 0x5a, 0x4b, 0xf5, 0xd0, 0x06, 0x9c, 0x36, 0x2d, 0xc5, 0xf5, 0x54, 0xb3, 0xa1, 0x3a, 0x0d, 0x25, - 0xb8, 0xa2, 0x52, 0x54, 0x4d, 0xc3, 0xae, 0x6b, 0xb1, 0x3d, 0xd0, 0x67, 0xf9, 0x98, 0x69, 0xd5, - 0xb9, 0x71, 0xb0, 0x39, 0x54, 0xb8, 0x69, 0x4f, 0xe6, 0x26, 0x8e, 0xca, 0xdc, 0xfb, 0x21, 0xd3, - 0x52, 0x6d, 0x05, 0x9b, 0x9e, 0xd3, 0xa1, 0x1d, 0x77, 0x5a, 0x4e, 0xb7, 0x54, 0xbb, 0x4a, 0x9e, - 0x3f, 0x9a, 0x83, 0xcf, 0x3f, 0x26, 0x20, 0x17, 0xee, 0xba, 0xc9, 0x21, 0x46, 0xa3, 0x1b, 0x54, - 0x8c, 0x96, 0xb0, 0x07, 0xef, 0xd9, 0xa3, 0xcf, 0xad, 0x90, 0x9d, 0xab, 0x3c, 0xca, 0x7a, 0x61, - 0x99, 0x21, 0x49, 0xd7, 0x40, 0x52, 0x0b, 0xb3, 0xde, 0x23, 0x2d, 0xf3, 0x27, 0xb4, 0x06, 0xa3, - 0xd7, 0x5c, 0xca, 0x3d, 0x4a, 0xb9, 0x1f, 0xba, 0x37, 0xf7, 0xb3, 0x75, 0x4a, 0x9e, 0x79, 0xb6, - 0xae, 0x6c, 0xd5, 0xe4, 0xcd, 0xca, 0x86, 0xcc, 0xe1, 0xe8, 0x14, 0x24, 0x0d, 0xf5, 0x56, 0xa7, - 0x7b, 0x8f, 0xa3, 0xa2, 0x61, 0x03, 0x7f, 0x0a, 0x92, 0x37, 0xb1, 0x7a, 0xbd, 0x7b, 0x67, 0xa1, - 0xa2, 0x0f, 0x31, 0xf5, 0xe7, 0x21, 0x45, 0xe3, 0x85, 0x00, 0x78, 0xc4, 0xa4, 0x11, 0x94, 0x86, - 0xe4, 0x4a, 0x4d, 0x26, 0xe9, 0x2f, 0x41, 0x8e, 0x49, 0x95, 0xed, 0xf5, 0xea, 0x4a, 0x55, 0x8a, - 0x97, 0x96, 0x60, 0x94, 0x05, 0x81, 0x2c, 0x0d, 0x3f, 0x0c, 0xd2, 0x08, 0x7f, 0xe4, 0x1c, 0x31, - 0xa1, 0xdd, 0xdd, 0x5c, 0xae, 0xca, 0x52, 0x3c, 0x3c, 0xbd, 0x2e, 0xe4, 0xc2, 0x0d, 0xf7, 0x47, - 0x93, 0x53, 0xdf, 0x8d, 0x41, 0x36, 0xd4, 0x40, 0x93, 0xce, 0x47, 0x35, 0x0c, 0xeb, 0xa6, 0xa2, - 0x1a, 0xba, 0xea, 0xf2, 0xa4, 0x00, 0x2a, 0xaa, 0x10, 0xc9, 0xb0, 0x93, 0xf6, 0x91, 0x38, 0xff, - 0x5a, 0x0c, 0xa4, 0xde, 0xde, 0xb5, 0xc7, 0xc1, 0xd8, 0x8f, 0xd5, 0xc1, 0x57, 0x63, 0x90, 0xef, - 0x6e, 0x58, 0x7b, 0xdc, 0x3b, 0xfb, 0x63, 0x75, 0xef, 0xed, 0x38, 0x8c, 0x77, 0xb5, 0xa9, 0xc3, - 0x7a, 0xf7, 0x59, 0x98, 0xd4, 0x1b, 0xb8, 0x65, 0x5b, 0x1e, 0x36, 0xb5, 0x8e, 0x62, 0xe0, 0x1b, - 0xd8, 0x28, 0x94, 0x68, 0xa1, 0x98, 0xbf, 0x77, 0x23, 0x3c, 0xb7, 0x1e, 0xe0, 0x36, 0x08, 0xac, - 0x3c, 0xb5, 0xbe, 0x5a, 0xdd, 0xdc, 0xae, 0xed, 0x54, 0xb7, 0x56, 0x5e, 0x50, 0x76, 0xb7, 0x7e, - 0x62, 0xab, 0xf6, 0xdc, 0x96, 0x2c, 0xe9, 0x3d, 0x66, 0x1f, 0xe2, 0x52, 0xdf, 0x06, 0xa9, 0xd7, - 0x29, 0x74, 0x12, 0x06, 0xb9, 0x25, 0x8d, 0xa0, 0x29, 0x98, 0xd8, 0xaa, 0x29, 0xf5, 0xf5, 0xd5, - 0xaa, 0x52, 0xbd, 0x72, 0xa5, 0xba, 0xb2, 0x53, 0x67, 0x57, 0x1b, 0xbe, 0xf5, 0x4e, 0xf7, 0xa2, - 0x7e, 0x25, 0x01, 0x53, 0x03, 0x3c, 0x41, 0x15, 0x7e, 0x28, 0x61, 0xe7, 0xa4, 0x27, 0x87, 0xf1, - 0x7e, 0x8e, 0x74, 0x05, 0xdb, 0xaa, 0xe3, 0xf1, 0x33, 0xcc, 0xa3, 0x40, 0xa2, 0x64, 0x7a, 0xfa, - 0xbe, 0x8e, 0x1d, 0x7e, 0x13, 0xc4, 0x4e, 0x2a, 0x13, 0x81, 0x9c, 0x5d, 0x06, 0x3d, 0x01, 0xc8, - 0xb6, 0x5c, 0xdd, 0xd3, 0x6f, 0x60, 0x45, 0x37, 0xc5, 0xb5, 0x11, 0x39, 0xb9, 0x24, 0x65, 0x49, - 0x68, 0xd6, 0x4d, 0xcf, 0xb7, 0x36, 0x71, 0x53, 0xed, 0xb1, 0x26, 0x05, 0x3c, 0x21, 0x4b, 0x42, - 0xe3, 0x5b, 0x9f, 0x85, 0x5c, 0xc3, 0x6a, 0x93, 0x76, 0x8e, 0xd9, 0x91, 0xfd, 0x22, 0x26, 0x67, - 0x99, 0xcc, 0x37, 0xe1, 0x8d, 0x7a, 0x70, 0x5f, 0x95, 0x93, 0xb3, 0x4c, 0xc6, 0x4c, 0x1e, 0x81, - 0x09, 0xb5, 0xd9, 0x74, 0x08, 0xb9, 0x20, 0x62, 0x47, 0x8f, 0xbc, 0x2f, 0xa6, 0x86, 0x33, 0xcf, - 0x42, 0x5a, 0xc4, 0x81, 0x6c, 0xc9, 0x24, 0x12, 0x8a, 0xcd, 0xce, 0xd3, 0xf1, 0xd9, 0x8c, 0x9c, - 0x36, 0x85, 0xf2, 0x2c, 0xe4, 0x74, 0x57, 0x09, 0xae, 0xdf, 0xe3, 0x67, 0xe2, 0xb3, 0x69, 0x39, - 0xab, 0xbb, 0xfe, 0xd5, 0x65, 0xe9, 0xf5, 0x38, 0xe4, 0xbb, 0x3f, 0x1f, 0xa0, 0x55, 0x48, 0x1b, - 0x96, 0xa6, 0xd2, 0xd4, 0x62, 0xdf, 0xae, 0x66, 0x23, 0xbe, 0x38, 0xcc, 0x6d, 0x70, 0x7b, 0xd9, - 0x47, 0xce, 0xfc, 0x5d, 0x0c, 0xd2, 0x42, 0x8c, 0x4e, 0x40, 0xd2, 0x56, 0xbd, 0x03, 0x4a, 0x97, - 0x5a, 0x8e, 0x4b, 0x31, 0x99, 0x3e, 0x13, 0xb9, 0x6b, 0xab, 0x26, 0x4d, 0x01, 0x2e, 0x27, 0xcf, - 0x64, 0x5e, 0x0d, 0xac, 0x36, 0xe8, 0xb9, 0xc6, 0x6a, 0xb5, 0xb0, 0xe9, 0xb9, 0x62, 0x5e, 0xb9, - 0x7c, 0x85, 0x8b, 0xd1, 0xe3, 0x30, 0xe9, 0x39, 0xaa, 0x6e, 0x74, 0xd9, 0x26, 0xa9, 0xad, 0x24, - 0x14, 0xbe, 0x71, 0x19, 0x4e, 0x09, 0xde, 0x06, 0xf6, 0x54, 0xed, 0x00, 0x37, 0x02, 0xd0, 0x28, - 0xbd, 0xbf, 0x38, 0xc9, 0x0d, 0x56, 0xb9, 0x5e, 0x60, 0x4b, 0xdf, 0x8f, 0xc1, 0xa4, 0x38, 0x89, - 0x35, 0xfc, 0x60, 0x6d, 0x02, 0xa8, 0xa6, 0x69, 0x79, 0xe1, 0x70, 0xf5, 0xa7, 0x72, 0x1f, 0x6e, - 0xae, 0xe2, 0x83, 0xe4, 0x10, 0xc1, 0x4c, 0x0b, 0x20, 0xd0, 0x1c, 0x19, 0xb6, 0xd3, 0x90, 0xe5, - 0xdf, 0x86, 0xe8, 0x07, 0x46, 0x76, 0x76, 0x07, 0x26, 0x22, 0x47, 0x36, 0x34, 0x0d, 0xa9, 0x3d, - 0xdc, 0xd4, 0x4d, 0x7e, 0xe3, 0xcb, 0x1e, 0xc4, 0x0d, 0x4b, 0xd2, 0xbf, 0x61, 0x59, 0xfe, 0x0c, - 0x4c, 0x69, 0x56, 0xab, 0xd7, 0xdd, 0x65, 0xa9, 0xe7, 0xfe, 0xc0, 0xbd, 0x1a, 0x7b, 0x11, 0x82, - 0x16, 0xf3, 0xfd, 0x58, 0xec, 0x2b, 0xf1, 0xc4, 0xda, 0xf6, 0xf2, 0xd7, 0xe3, 0x33, 0x6b, 0x0c, - 0xba, 0x2d, 0x46, 0x2a, 0xe3, 0x7d, 0x03, 0x6b, 0xc4, 0x7b, 0xf8, 0xea, 0xe3, 0xf0, 0x64, 0x53, - 0xf7, 0x0e, 0xda, 0x7b, 0x73, 0x9a, 0xd5, 0x9a, 0x6f, 0x5a, 0x4d, 0x2b, 0xf8, 0xa6, 0x4a, 0x9e, - 0xe8, 0x03, 0xfd, 0x8b, 0x7f, 0x57, 0xcd, 0xf8, 0xd2, 0x99, 0xc8, 0x8f, 0xb0, 0xe5, 0x2d, 0x98, - 0xe2, 0xc6, 0x0a, 0xfd, 0xb0, 0xc3, 0x8e, 0x27, 0xe8, 0x9e, 0x97, 0x63, 0x85, 0x6f, 0xbe, 0x43, - 0xb7, 0x6b, 0x79, 0x92, 0x43, 0x89, 0x8e, 0x9d, 0x60, 0xca, 0x32, 0xdc, 0xd7, 0xc5, 0xc7, 0x96, - 0x26, 0x76, 0x22, 0x18, 0xbf, 0xc7, 0x19, 0xa7, 0x42, 0x8c, 0x75, 0x0e, 0x2d, 0xaf, 0xc0, 0xf8, - 0x71, 0xb8, 0xfe, 0x86, 0x73, 0xe5, 0x70, 0x98, 0x64, 0x0d, 0x26, 0x28, 0x89, 0xd6, 0x76, 0x3d, - 0xab, 0x45, 0xeb, 0xde, 0xbd, 0x69, 0xfe, 0xf6, 0x1d, 0xb6, 0x56, 0xf2, 0x04, 0xb6, 0xe2, 0xa3, - 0xca, 0x65, 0xa0, 0xdf, 0xb2, 0x1a, 0x58, 0x33, 0x22, 0x18, 0xde, 0xe0, 0x8e, 0xf8, 0xf6, 0xe5, - 0x4f, 0xc3, 0x34, 0xf9, 0x9b, 0x96, 0xa5, 0xb0, 0x27, 0xd1, 0x37, 0x69, 0x85, 0xef, 0xbf, 0xcc, - 0x96, 0xe3, 0x94, 0x4f, 0x10, 0xf2, 0x29, 0x34, 0x8b, 0x4d, 0xec, 0x79, 0xd8, 0x71, 0x15, 0xd5, - 0x18, 0xe4, 0x5e, 0xe8, 0x2a, 0xa2, 0xf0, 0xc5, 0x77, 0xbb, 0x67, 0x71, 0x8d, 0x21, 0x2b, 0x86, - 0x51, 0xde, 0x85, 0x93, 0x03, 0xb2, 0x62, 0x08, 0xce, 0x57, 0x38, 0xe7, 0x74, 0x5f, 0x66, 0x10, - 0xda, 0x6d, 0x10, 0x72, 0x7f, 0x2e, 0x87, 0xe0, 0xfc, 0x2d, 0xce, 0x89, 0x38, 0x56, 0x4c, 0x29, - 0x61, 0x7c, 0x16, 0x26, 0x6f, 0x60, 0x67, 0xcf, 0x72, 0xf9, 0xf5, 0xcf, 0x10, 0x74, 0xaf, 0x72, - 0xba, 0x09, 0x0e, 0xa4, 0xf7, 0x41, 0x84, 0xeb, 0x12, 0xa4, 0xf7, 0x55, 0x0d, 0x0f, 0x41, 0xf1, - 0x25, 0x4e, 0x31, 0x46, 0xec, 0x09, 0xb4, 0x02, 0xb9, 0xa6, 0xc5, 0x77, 0xa6, 0x68, 0xf8, 0x6b, - 0x1c, 0x9e, 0x15, 0x18, 0x4e, 0x61, 0x5b, 0x76, 0xdb, 0x20, 0xdb, 0x56, 0x34, 0xc5, 0x6f, 0x0b, - 0x0a, 0x81, 0xe1, 0x14, 0xc7, 0x08, 0xeb, 0xef, 0x08, 0x0a, 0x37, 0x14, 0xcf, 0x67, 0x20, 0x6b, - 0x99, 0x46, 0xc7, 0x32, 0x87, 0x71, 0xe2, 0xcb, 0x9c, 0x01, 0x38, 0x84, 0x10, 0x5c, 0x86, 0xcc, - 0xb0, 0x13, 0xf1, 0x7b, 0xef, 0x8a, 0xe5, 0x21, 0x66, 0x60, 0x0d, 0x26, 0x44, 0x81, 0xd2, 0x2d, - 0x73, 0x08, 0x8a, 0xaf, 0x72, 0x8a, 0x7c, 0x08, 0xc6, 0x87, 0xe1, 0x61, 0xd7, 0x6b, 0xe2, 0x61, - 0x48, 0x5e, 0x17, 0xc3, 0xe0, 0x10, 0x1e, 0xca, 0x3d, 0x6c, 0x6a, 0x07, 0xc3, 0x31, 0x7c, 0x4d, - 0x84, 0x52, 0x60, 0x08, 0xc5, 0x0a, 0x8c, 0xb7, 0x54, 0xc7, 0x3d, 0x50, 0x8d, 0xa1, 0xa6, 0xe3, - 0xf7, 0x39, 0x47, 0xce, 0x07, 0xf1, 0x88, 0xb4, 0xcd, 0xe3, 0xd0, 0x7c, 0x5d, 0x44, 0x24, 0x04, - 0xe3, 0x4b, 0xcf, 0xf5, 0xe8, 0x5d, 0xd9, 0x71, 0xd8, 0xfe, 0x40, 0x2c, 0x3d, 0x86, 0xdd, 0x0c, - 0x33, 0x5e, 0x86, 0x8c, 0xab, 0xdf, 0x1a, 0x8a, 0xe6, 0x0f, 0xc5, 0x4c, 0x53, 0x00, 0x01, 0xbf, - 0x00, 0xa7, 0x06, 0x6e, 0x13, 0x43, 0x90, 0xfd, 0x11, 0x27, 0x3b, 0x31, 0x60, 0xab, 0xe0, 0x25, - 0xe1, 0xb8, 0x94, 0x7f, 0x2c, 0x4a, 0x02, 0xee, 0xe1, 0xda, 0x26, 0x67, 0x05, 0x57, 0xdd, 0x3f, - 0x5e, 0xd4, 0xfe, 0x44, 0x44, 0x8d, 0x61, 0xbb, 0xa2, 0xb6, 0x03, 0x27, 0x38, 0xe3, 0xf1, 0xe6, - 0xf5, 0x1b, 0xa2, 0xb0, 0x32, 0xf4, 0x6e, 0xf7, 0xec, 0x7e, 0x06, 0x66, 0xfc, 0x70, 0x8a, 0xa6, - 0xd4, 0x55, 0x5a, 0xaa, 0x3d, 0x04, 0xf3, 0x37, 0x39, 0xb3, 0xa8, 0xf8, 0x7e, 0x57, 0xeb, 0x6e, - 0xaa, 0x36, 0x21, 0x7f, 0x1e, 0x0a, 0x82, 0xbc, 0x6d, 0x3a, 0x58, 0xb3, 0x9a, 0xa6, 0x7e, 0x0b, - 0x37, 0x86, 0xa0, 0xfe, 0xd3, 0x9e, 0xa9, 0xda, 0x0d, 0xc1, 0x09, 0xf3, 0x3a, 0x48, 0x7e, 0xaf, - 0xa2, 0xe8, 0x2d, 0xdb, 0x72, 0xbc, 0x08, 0xc6, 0x3f, 0x13, 0x33, 0xe5, 0xe3, 0xd6, 0x29, 0xac, - 0x5c, 0x85, 0x3c, 0x7d, 0x1c, 0x36, 0x25, 0xff, 0x9c, 0x13, 0x8d, 0x07, 0x28, 0x5e, 0x38, 0x34, - 0xab, 0x65, 0xab, 0xce, 0x30, 0xf5, 0xef, 0x2f, 0x44, 0xe1, 0xe0, 0x10, 0x5e, 0x38, 0xbc, 0x8e, - 0x8d, 0xc9, 0x6e, 0x3f, 0x04, 0xc3, 0xb7, 0x44, 0xe1, 0x10, 0x18, 0x4e, 0x21, 0x1a, 0x86, 0x21, - 0x28, 0xfe, 0x52, 0x50, 0x08, 0x0c, 0xa1, 0xf8, 0x54, 0xb0, 0xd1, 0x3a, 0xb8, 0xa9, 0xbb, 0x9e, - 0xc3, 0x5a, 0xe1, 0x7b, 0x53, 0x7d, 0xfb, 0xdd, 0xee, 0x26, 0x4c, 0x0e, 0x41, 0x49, 0x25, 0xe2, - 0x57, 0xa8, 0xf4, 0xa4, 0x14, 0xed, 0xd8, 0x77, 0x44, 0x25, 0x0a, 0xc1, 0x88, 0x6f, 0xa1, 0x0e, - 0x91, 0x84, 0x5d, 0x23, 0xe7, 0x83, 0x21, 0xe8, 0xbe, 0xdb, 0xe3, 0x5c, 0x5d, 0x60, 0x09, 0x67, - 0xa8, 0xff, 0x69, 0x9b, 0xd7, 0x71, 0x67, 0xa8, 0xec, 0xfc, 0xab, 0x9e, 0xfe, 0x67, 0x97, 0x21, - 0x59, 0x0d, 0x99, 0xe8, 0xe9, 0xa7, 0x50, 0xd4, 0xaf, 0x80, 0x0a, 0x3f, 0x7d, 0x97, 0x8f, 0xb7, - 0xbb, 0x9d, 0x2a, 0x6f, 0x90, 0x24, 0xef, 0x6e, 0x7a, 0xa2, 0xc9, 0x5e, 0xbe, 0xeb, 0xe7, 0x79, - 0x57, 0xcf, 0x53, 0xbe, 0x02, 0xe3, 0x5d, 0x0d, 0x4f, 0x34, 0xd5, 0xcf, 0x70, 0xaa, 0x5c, 0xb8, - 0xdf, 0x29, 0x2f, 0x41, 0x92, 0x34, 0x2f, 0xd1, 0xf0, 0x9f, 0xe5, 0x70, 0x6a, 0x5e, 0xfe, 0x04, - 0xa4, 0x45, 0xd3, 0x12, 0x0d, 0xfd, 0x39, 0x0e, 0xf5, 0x21, 0x04, 0x2e, 0x1a, 0x96, 0x68, 0xf8, - 0xcf, 0x0b, 0xb8, 0x80, 0x10, 0xf8, 0xf0, 0x21, 0xfc, 0xeb, 0x5f, 0x48, 0xf2, 0x4d, 0x47, 0xc4, - 0xee, 0x32, 0x8c, 0xf1, 0x4e, 0x25, 0x1a, 0xfd, 0x39, 0xfe, 0x72, 0x81, 0x28, 0x5f, 0x80, 0xd4, - 0x90, 0x01, 0xff, 0x25, 0x0e, 0x65, 0xf6, 0xe5, 0x15, 0xc8, 0x86, 0xba, 0x93, 0x68, 0xf8, 0x2f, - 0x73, 0x78, 0x18, 0x45, 0x5c, 0xe7, 0xdd, 0x49, 0x34, 0xc1, 0xaf, 0x08, 0xd7, 0x39, 0x82, 0x84, - 0x4d, 0x34, 0x26, 0xd1, 0xe8, 0x5f, 0x15, 0x51, 0x17, 0x90, 0xf2, 0x33, 0x90, 0xf1, 0x37, 0x9b, - 0x68, 0xfc, 0xaf, 0x71, 0x7c, 0x80, 0x21, 0x11, 0x08, 0x6d, 0x76, 0xd1, 0x14, 0x9f, 0x17, 0x11, - 0x08, 0xa1, 0xc8, 0x32, 0xea, 0x6d, 0x60, 0xa2, 0x99, 0x7e, 0x5d, 0x2c, 0xa3, 0x9e, 0xfe, 0x85, - 0xcc, 0x26, 0xad, 0xf9, 0xd1, 0x14, 0xbf, 0x21, 0x66, 0x93, 0xda, 0x13, 0x37, 0x7a, 0x3b, 0x82, - 0x68, 0x8e, 0xdf, 0x14, 0x6e, 0xf4, 0x34, 0x04, 0xe5, 0x6d, 0x40, 0xfd, 0xdd, 0x40, 0x34, 0xdf, - 0x17, 0x38, 0xdf, 0x64, 0x5f, 0x33, 0x50, 0x7e, 0x0e, 0x4e, 0x0c, 0xee, 0x04, 0xa2, 0x59, 0xbf, - 0x78, 0xb7, 0xe7, 0xec, 0x16, 0x6e, 0x04, 0xca, 0x3b, 0xc1, 0x96, 0x12, 0xee, 0x02, 0xa2, 0x69, - 0x5f, 0xb9, 0xdb, 0x5d, 0xb8, 0xc3, 0x4d, 0x40, 0xb9, 0x02, 0x10, 0x6c, 0xc0, 0xd1, 0x5c, 0xaf, - 0x72, 0xae, 0x10, 0x88, 0x2c, 0x0d, 0xbe, 0xff, 0x46, 0xe3, 0xbf, 0x24, 0x96, 0x06, 0x47, 0x90, - 0xa5, 0x21, 0xb6, 0xde, 0x68, 0xf4, 0x6b, 0x62, 0x69, 0x08, 0x08, 0xc9, 0xec, 0xd0, 0xee, 0x16, - 0xcd, 0xf0, 0x65, 0x91, 0xd9, 0x21, 0x54, 0x79, 0x0b, 0x26, 0xfb, 0x36, 0xc4, 0x68, 0xaa, 0xaf, - 0x70, 0x2a, 0xa9, 0x77, 0x3f, 0x0c, 0x6f, 0x5e, 0x7c, 0x33, 0x8c, 0x66, 0xfb, 0xdd, 0x9e, 0xcd, - 0x8b, 0xef, 0x85, 0xe5, 0xcb, 0x90, 0x36, 0xdb, 0x86, 0x41, 0x16, 0x0f, 0xba, 0xf7, 0x2f, 0xf7, - 0x0a, 0xff, 0xfc, 0x01, 0x8f, 0x8e, 0x00, 0x94, 0x97, 0x20, 0x85, 0x5b, 0x7b, 0xb8, 0x11, 0x85, - 0xfc, 0x97, 0x0f, 0x44, 0xc1, 0x24, 0xd6, 0xe5, 0x67, 0x00, 0xd8, 0xd5, 0x08, 0xfd, 0xec, 0x17, - 0x81, 0xfd, 0xd7, 0x0f, 0xf8, 0x6f, 0x6a, 0x02, 0x48, 0x40, 0xc0, 0x7e, 0xa1, 0x73, 0x6f, 0x82, - 0x77, 0xbb, 0x09, 0xe8, 0x8c, 0x5c, 0x82, 0xb1, 0x6b, 0xae, 0x65, 0x7a, 0x6a, 0x33, 0x0a, 0xfd, - 0x6f, 0x1c, 0x2d, 0xec, 0x49, 0xc0, 0x5a, 0x96, 0x83, 0x3d, 0xb5, 0xe9, 0x46, 0x61, 0xff, 0x9d, - 0x63, 0x7d, 0x00, 0x01, 0x6b, 0xaa, 0xeb, 0x0d, 0x33, 0xee, 0xff, 0x10, 0x60, 0x01, 0x20, 0x4e, - 0x93, 0xbf, 0xaf, 0xe3, 0x4e, 0x14, 0xf6, 0x3d, 0xe1, 0x34, 0xb7, 0x2f, 0x7f, 0x02, 0x32, 0xe4, - 0x4f, 0xf6, 0x43, 0xb9, 0x08, 0xf0, 0x7f, 0x72, 0x70, 0x80, 0x20, 0x6f, 0x76, 0xbd, 0x86, 0xa7, - 0x47, 0x07, 0xfb, 0xbf, 0xf8, 0x4c, 0x0b, 0xfb, 0x72, 0x05, 0xb2, 0xae, 0xd7, 0x68, 0xb4, 0x79, - 0x7f, 0x1a, 0x01, 0xff, 0xef, 0x0f, 0xfc, 0x2b, 0x0b, 0x1f, 0x43, 0x66, 0xfb, 0xe6, 0x75, 0xcf, - 0xb6, 0xe8, 0x67, 0x8e, 0x28, 0x86, 0xbb, 0x9c, 0x21, 0x04, 0x59, 0xae, 0x0e, 0xbe, 0xbe, 0x85, - 0x35, 0x6b, 0xcd, 0x62, 0x17, 0xb7, 0x2f, 0x96, 0xa2, 0x6f, 0x60, 0xe1, 0xfd, 0x34, 0x14, 0x34, - 0xab, 0xb5, 0x67, 0xb9, 0xf3, 0x26, 0xd6, 0xbd, 0x03, 0xec, 0xcc, 0x5b, 0x26, 0xe7, 0x43, 0x09, - 0xcb, 0xc4, 0x33, 0xc7, 0xbb, 0xc7, 0x2d, 0x9d, 0x82, 0x54, 0xbd, 0xbd, 0xb7, 0xd7, 0x41, 0x12, - 0x24, 0xdc, 0xf6, 0x1e, 0xff, 0xb1, 0x15, 0xf9, 0xb3, 0xf4, 0x56, 0x02, 0xc6, 0x2b, 0x86, 0xb1, - 0xd3, 0xb1, 0xb1, 0x5b, 0x33, 0x71, 0x6d, 0x1f, 0x15, 0x60, 0x94, 0x0e, 0xf4, 0x69, 0x6a, 0x16, - 0xbb, 0x3a, 0x22, 0xf3, 0x67, 0x5f, 0xb3, 0x40, 0x6f, 0xb8, 0xe3, 0xbe, 0x66, 0xc1, 0xd7, 0x9c, - 0x63, 0x17, 0xdc, 0xbe, 0xe6, 0x9c, 0xaf, 0x59, 0xa4, 0xd7, 0xdc, 0x09, 0x5f, 0xb3, 0xe8, 0x6b, - 0x96, 0xe8, 0x67, 0x9c, 0x71, 0x5f, 0xb3, 0xe4, 0x6b, 0xce, 0xd3, 0x0f, 0x37, 0x49, 0x5f, 0x73, - 0xde, 0xd7, 0x5c, 0xa0, 0xdf, 0x6b, 0x26, 0x7d, 0xcd, 0x05, 0x5f, 0x73, 0x91, 0x7e, 0xa3, 0x41, - 0xbe, 0xe6, 0xa2, 0xaf, 0xb9, 0x44, 0x7f, 0x55, 0x35, 0xe6, 0x6b, 0x2e, 0xa1, 0x19, 0x18, 0x63, - 0x23, 0x7b, 0x8a, 0x7e, 0xc8, 0x9f, 0xb8, 0x3a, 0x22, 0x0b, 0x41, 0xa0, 0x7b, 0x9a, 0xfe, 0x72, - 0x6a, 0x34, 0xd0, 0x3d, 0x1d, 0xe8, 0x16, 0xe8, 0x7f, 0xe0, 0x90, 0x02, 0xdd, 0x42, 0xa0, 0x3b, - 0x57, 0x18, 0x27, 0xf9, 0x11, 0xe8, 0xce, 0x05, 0xba, 0xc5, 0x42, 0x9e, 0xcc, 0x40, 0xa0, 0x5b, - 0x0c, 0x74, 0x4b, 0x85, 0x89, 0x33, 0xb1, 0xd9, 0x5c, 0xa0, 0x5b, 0x42, 0x4f, 0x42, 0xd6, 0x6d, - 0xef, 0x29, 0xbc, 0xd2, 0xd3, 0x5f, 0x68, 0x65, 0x17, 0x60, 0x8e, 0xe4, 0x04, 0x9d, 0xd6, 0xab, - 0x23, 0x32, 0xb8, 0xed, 0x3d, 0x5e, 0x88, 0x97, 0x73, 0x40, 0xef, 0x9f, 0x14, 0xfa, 0xc3, 0xea, - 0xd2, 0x9b, 0x31, 0xc8, 0xec, 0xdc, 0xb4, 0xe8, 0x67, 0x7c, 0xf7, 0xff, 0x78, 0x72, 0x85, 0xd3, - 0xe7, 0x16, 0xe9, 0x97, 0xd6, 0xcc, 0xd5, 0x98, 0x2c, 0x04, 0x81, 0x6e, 0xa9, 0xf0, 0x20, 0x1d, - 0x90, 0xaf, 0x5b, 0x42, 0xf3, 0x90, 0x0b, 0x0d, 0x68, 0x81, 0xfe, 0x76, 0xaa, 0x7b, 0x44, 0x31, - 0x39, 0x1b, 0x8c, 0x68, 0x61, 0x39, 0x05, 0x24, 0xed, 0xc9, 0x3f, 0xde, 0x4d, 0xab, 0xf4, 0xf9, - 0x38, 0x64, 0xd9, 0x95, 0x35, 0x1d, 0x15, 0x79, 0x15, 0x3b, 0xd5, 0x74, 0xb8, 0x1b, 0x23, 0xb2, - 0x10, 0x20, 0x19, 0x80, 0x99, 0x92, 0x0c, 0x67, 0x9e, 0x2c, 0x3f, 0xf5, 0x0f, 0x6f, 0x9d, 0x7e, - 0xe2, 0xc8, 0x15, 0x44, 0x62, 0x37, 0xcf, 0x4a, 0xf8, 0xdc, 0xae, 0x6e, 0x7a, 0x4f, 0x2f, 0x5c, - 0x24, 0x01, 0x0e, 0x58, 0xd0, 0x2e, 0xa4, 0x57, 0x54, 0x97, 0xfe, 0xea, 0x92, 0xba, 0x9e, 0x5c, - 0xbe, 0xf0, 0x3f, 0x6f, 0x9d, 0x3e, 0x17, 0xc1, 0xc8, 0xab, 0xeb, 0xdc, 0x66, 0x87, 0xb0, 0x9e, - 0x5f, 0x24, 0xf0, 0xab, 0x23, 0xb2, 0x4f, 0x85, 0x16, 0x84, 0xab, 0x5b, 0x6a, 0x8b, 0xfd, 0x48, - 0x2c, 0xb1, 0x2c, 0x1d, 0xbe, 0x75, 0x3a, 0xb7, 0xd9, 0x09, 0xe4, 0x81, 0x2b, 0xe4, 0x69, 0x39, - 0x0d, 0xa3, 0xcc, 0xd5, 0xe5, 0xd5, 0x37, 0xee, 0x14, 0x47, 0xde, 0xbc, 0x53, 0x1c, 0xf9, 0xfb, - 0x3b, 0xc5, 0x91, 0xb7, 0xef, 0x14, 0x63, 0xef, 0xdd, 0x29, 0xc6, 0xde, 0xbf, 0x53, 0x8c, 0xdd, - 0x3e, 0x2c, 0xc6, 0xbe, 0x76, 0x58, 0x8c, 0x7d, 0xe3, 0xb0, 0x18, 0xfb, 0xf6, 0x61, 0x31, 0xf6, - 0xc6, 0x61, 0x71, 0xe4, 0xcd, 0xc3, 0xe2, 0xc8, 0xdb, 0x87, 0xc5, 0xd8, 0x0f, 0x0f, 0x8b, 0x23, - 0xef, 0x1d, 0x16, 0x63, 0xef, 0x1f, 0x16, 0x47, 0x6e, 0xff, 0xa0, 0x38, 0xf2, 0xbf, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x6b, 0x55, 0xee, 0x1b, 0x6f, 0x37, 0x00, 0x00, + // 4303 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0x1b, 0xe7, + 0x75, 0xe6, 0xe2, 0x42, 0x02, 0x07, 0x20, 0xb8, 0x5c, 0xd2, 0x12, 0x44, 0xc7, 0x90, 0x04, 0xdb, + 0x31, 0x7d, 0x23, 0x6d, 0x8a, 0xa4, 0x24, 0xa8, 0x89, 0x0b, 0x92, 0x10, 0x45, 0x97, 0x24, 0x98, + 0x05, 0x19, 0x5f, 0x32, 0x9d, 0x9d, 0xe5, 0xe2, 0x07, 0xb8, 0xd2, 0x62, 0x77, 0xb3, 0xbb, 0x90, + 0x0c, 0x4d, 0x1f, 0xd4, 0x71, 0x2f, 0x93, 0xe9, 0x3d, 0xed, 0x4c, 0x13, 0xd7, 0x71, 0x9b, 0x74, + 0x1a, 0xbb, 0xe9, 0x2d, 0xe9, 0x25, 0x4d, 0xd2, 0x97, 0xbe, 0xa4, 0xf5, 0x53, 0xc7, 0x79, 0xeb, + 0x74, 0x3a, 0x1e, 0x8b, 0xf6, 0x4c, 0xd3, 0xd6, 0x6d, 0xdd, 0x56, 0x0f, 0x9e, 0xba, 0x0f, 0x9d, + 0xff, 0xb6, 0xbb, 0xb8, 0x50, 0x0b, 0x66, 0x6a, 0xfb, 0x49, 0xdc, 0x73, 0xce, 0xf7, 0xed, 0xf9, + 0xcf, 0x7f, 0xfe, 0xf3, 0x9f, 0xff, 0x5f, 0x08, 0x5e, 0x2f, 0xc1, 0x99, 0xa6, 0x65, 0x35, 0x0d, + 0x34, 0x6f, 0x3b, 0x96, 0x67, 0xed, 0xb7, 0x1b, 0xf3, 0x75, 0xe4, 0x6a, 0x8e, 0x6e, 0x7b, 0x96, + 0x33, 0x47, 0x64, 0xd2, 0x04, 0xb5, 0x98, 0xe3, 0x16, 0xc5, 0x2d, 0x98, 0xbc, 0xac, 0x1b, 0x68, + 0xcd, 0x37, 0xac, 0x21, 0x4f, 0xba, 0x00, 0x89, 0x86, 0x6e, 0xa0, 0xbc, 0x70, 0x26, 0x3e, 0x9b, + 0x59, 0x78, 0x60, 0xae, 0x07, 0x34, 0xd7, 0x8d, 0xd8, 0xc1, 0x62, 0x99, 0x20, 0x8a, 0xef, 0x24, + 0x60, 0x6a, 0x80, 0x56, 0x92, 0x20, 0x61, 0xaa, 0x2d, 0xcc, 0x28, 0xcc, 0xa6, 0x65, 0xf2, 0xb7, + 0x94, 0x87, 0x31, 0x5b, 0xd5, 0xae, 0xa9, 0x4d, 0x94, 0x8f, 0x11, 0x31, 0x7f, 0x94, 0x0a, 0x00, + 0x75, 0x64, 0x23, 0xb3, 0x8e, 0x4c, 0xad, 0x93, 0x8f, 0x9f, 0x89, 0xcf, 0xa6, 0xe5, 0x90, 0x44, + 0x7a, 0x14, 0x26, 0xed, 0xf6, 0xbe, 0xa1, 0x6b, 0x4a, 0xc8, 0x0c, 0xce, 0xc4, 0x67, 0x93, 0xb2, + 0x48, 0x15, 0x6b, 0x81, 0xf1, 0x43, 0x30, 0x71, 0x03, 0xa9, 0xd7, 0xc2, 0xa6, 0x19, 0x62, 0x9a, + 0xc3, 0xe2, 0x90, 0xe1, 0x2a, 0x64, 0x5b, 0xc8, 0x75, 0xd5, 0x26, 0x52, 0xbc, 0x8e, 0x8d, 0xf2, + 0x09, 0x32, 0xfa, 0x33, 0x7d, 0xa3, 0xef, 0x1d, 0x79, 0x86, 0xa1, 0x76, 0x3b, 0x36, 0x92, 0xca, + 0x90, 0x46, 0x66, 0xbb, 0x45, 0x19, 0x92, 0x47, 0xc4, 0xaf, 0x62, 0xb6, 0x5b, 0xbd, 0x2c, 0x29, + 0x0c, 0x63, 0x14, 0x63, 0x2e, 0x72, 0xae, 0xeb, 0x1a, 0xca, 0x8f, 0x12, 0x82, 0x87, 0xfa, 0x08, + 0x6a, 0x54, 0xdf, 0xcb, 0xc1, 0x71, 0xd2, 0x2a, 0xa4, 0xd1, 0x0b, 0x1e, 0x32, 0x5d, 0xdd, 0x32, + 0xf3, 0x63, 0x84, 0xe4, 0xc1, 0x01, 0xb3, 0x88, 0x8c, 0x7a, 0x2f, 0x45, 0x80, 0x93, 0x96, 0x61, + 0xcc, 0xb2, 0x3d, 0xdd, 0x32, 0xdd, 0x7c, 0xea, 0x8c, 0x30, 0x9b, 0x59, 0xf8, 0xc4, 0xc0, 0x44, + 0xa8, 0x52, 0x1b, 0x99, 0x1b, 0x4b, 0x1b, 0x20, 0xba, 0x56, 0xdb, 0xd1, 0x90, 0xa2, 0x59, 0x75, + 0xa4, 0xe8, 0x66, 0xc3, 0xca, 0xa7, 0x09, 0xc1, 0xe9, 0xfe, 0x81, 0x10, 0xc3, 0x55, 0xab, 0x8e, + 0x36, 0xcc, 0x86, 0x25, 0xe7, 0xdc, 0xae, 0x67, 0xe9, 0x04, 0x8c, 0xba, 0x1d, 0xd3, 0x53, 0x5f, + 0xc8, 0x67, 0x49, 0x86, 0xb0, 0xa7, 0xe2, 0x77, 0x47, 0x61, 0x62, 0x98, 0x14, 0xbb, 0x04, 0xc9, + 0x06, 0x1e, 0x65, 0x3e, 0x76, 0x9c, 0x18, 0x50, 0x4c, 0x77, 0x10, 0x47, 0x7f, 0xc4, 0x20, 0x96, + 0x21, 0x63, 0x22, 0xd7, 0x43, 0x75, 0x9a, 0x11, 0xf1, 0x21, 0x73, 0x0a, 0x28, 0xa8, 0x3f, 0xa5, + 0x12, 0x3f, 0x52, 0x4a, 0x3d, 0x0b, 0x13, 0xbe, 0x4b, 0x8a, 0xa3, 0x9a, 0x4d, 0x9e, 0x9b, 0xf3, + 0x51, 0x9e, 0xcc, 0x55, 0x38, 0x4e, 0xc6, 0x30, 0x39, 0x87, 0xba, 0x9e, 0xa5, 0x35, 0x00, 0xcb, + 0x44, 0x56, 0x43, 0xa9, 0x23, 0xcd, 0xc8, 0xa7, 0x8e, 0x88, 0x52, 0x15, 0x9b, 0xf4, 0x45, 0xc9, + 0xa2, 0x52, 0xcd, 0x90, 0x2e, 0x06, 0xa9, 0x36, 0x76, 0x44, 0xa6, 0x6c, 0xd1, 0x45, 0xd6, 0x97, + 0x6d, 0x7b, 0x90, 0x73, 0x10, 0xce, 0x7b, 0x54, 0x67, 0x23, 0x4b, 0x13, 0x27, 0xe6, 0x22, 0x47, + 0x26, 0x33, 0x18, 0x1d, 0xd8, 0xb8, 0x13, 0x7e, 0x94, 0xee, 0x07, 0x5f, 0xa0, 0x90, 0xb4, 0x02, + 0x52, 0x85, 0xb2, 0x5c, 0xb8, 0xad, 0xb6, 0xd0, 0xcc, 0x4d, 0xc8, 0x75, 0x87, 0x47, 0x9a, 0x86, + 0xa4, 0xeb, 0xa9, 0x8e, 0x47, 0xb2, 0x30, 0x29, 0xd3, 0x07, 0x49, 0x84, 0x38, 0x32, 0xeb, 0xa4, + 0xca, 0x25, 0x65, 0xfc, 0xa7, 0xf4, 0xe3, 0xc1, 0x80, 0xe3, 0x64, 0xc0, 0x9f, 0xec, 0x9f, 0xd1, + 0x2e, 0xe6, 0xde, 0x71, 0xcf, 0x9c, 0x87, 0xf1, 0xae, 0x01, 0x0c, 0xfb, 0xea, 0xe2, 0x4f, 0xc1, + 0x3d, 0x03, 0xa9, 0xa5, 0x67, 0x61, 0xba, 0x6d, 0xea, 0xa6, 0x87, 0x1c, 0xdb, 0x41, 0x38, 0x63, + 0xe9, 0xab, 0xf2, 0xff, 0x34, 0x76, 0x44, 0xce, 0xed, 0x85, 0xad, 0x29, 0x8b, 0x3c, 0xd5, 0xee, + 0x17, 0x3e, 0x92, 0x4e, 0xfd, 0x70, 0x4c, 0xbc, 0x75, 0xeb, 0xd6, 0xad, 0x58, 0xf1, 0x4b, 0xa3, + 0x30, 0x3d, 0x68, 0xcd, 0x0c, 0x5c, 0xbe, 0x27, 0x60, 0xd4, 0x6c, 0xb7, 0xf6, 0x91, 0x43, 0x82, + 0x94, 0x94, 0xd9, 0x93, 0x54, 0x86, 0xa4, 0xa1, 0xee, 0x23, 0x23, 0x9f, 0x38, 0x23, 0xcc, 0xe6, + 0x16, 0x1e, 0x1d, 0x6a, 0x55, 0xce, 0x6d, 0x62, 0x88, 0x4c, 0x91, 0xd2, 0xa7, 0x21, 0xc1, 0x4a, + 0x34, 0x66, 0x78, 0x64, 0x38, 0x06, 0xbc, 0x96, 0x64, 0x82, 0x93, 0xee, 0x85, 0x34, 0xfe, 0x97, + 0xe6, 0xc6, 0x28, 0xf1, 0x39, 0x85, 0x05, 0x38, 0x2f, 0xa4, 0x19, 0x48, 0x91, 0x65, 0x52, 0x47, + 0x7c, 0x6b, 0xf3, 0x9f, 0x71, 0x62, 0xd5, 0x51, 0x43, 0x6d, 0x1b, 0x9e, 0x72, 0x5d, 0x35, 0xda, + 0x88, 0x24, 0x7c, 0x5a, 0xce, 0x32, 0xe1, 0x67, 0xb1, 0x4c, 0x3a, 0x0d, 0x19, 0xba, 0xaa, 0x74, + 0xb3, 0x8e, 0x5e, 0x20, 0xd5, 0x33, 0x29, 0xd3, 0x85, 0xb6, 0x81, 0x25, 0xf8, 0xf5, 0x57, 0x5d, + 0xcb, 0xe4, 0xa9, 0x49, 0x5e, 0x81, 0x05, 0xe4, 0xf5, 0xe7, 0x7b, 0x0b, 0xf7, 0x7d, 0x83, 0x87, + 0xd7, 0x9b, 0x53, 0xc5, 0x6f, 0xc7, 0x20, 0x41, 0xea, 0xc5, 0x04, 0x64, 0x76, 0x9f, 0xdb, 0xa9, + 0x28, 0x6b, 0xd5, 0xbd, 0x95, 0xcd, 0x8a, 0x28, 0x48, 0x39, 0x00, 0x22, 0xb8, 0xbc, 0x59, 0x2d, + 0xef, 0x8a, 0x31, 0xff, 0x79, 0x63, 0x7b, 0x77, 0x79, 0x51, 0x8c, 0xfb, 0x80, 0x3d, 0x2a, 0x48, + 0x84, 0x0d, 0xce, 0x2d, 0x88, 0x49, 0x49, 0x84, 0x2c, 0x25, 0xd8, 0x78, 0xb6, 0xb2, 0xb6, 0xbc, + 0x28, 0x8e, 0x76, 0x4b, 0xce, 0x2d, 0x88, 0x63, 0xd2, 0x38, 0xa4, 0x89, 0x64, 0xa5, 0x5a, 0xdd, + 0x14, 0x53, 0x3e, 0x67, 0x6d, 0x57, 0xde, 0xd8, 0x5e, 0x17, 0xd3, 0x3e, 0xe7, 0xba, 0x5c, 0xdd, + 0xdb, 0x11, 0xc1, 0x67, 0xd8, 0xaa, 0xd4, 0x6a, 0xe5, 0xf5, 0x8a, 0x98, 0xf1, 0x2d, 0x56, 0x9e, + 0xdb, 0xad, 0xd4, 0xc4, 0x6c, 0x97, 0x5b, 0xe7, 0x16, 0xc4, 0x71, 0xff, 0x15, 0x95, 0xed, 0xbd, + 0x2d, 0x31, 0x27, 0x4d, 0xc2, 0x38, 0x7d, 0x05, 0x77, 0x62, 0xa2, 0x47, 0xb4, 0xbc, 0x28, 0x8a, + 0x81, 0x23, 0x94, 0x65, 0xb2, 0x4b, 0xb0, 0xbc, 0x28, 0x4a, 0xc5, 0x55, 0x48, 0x92, 0xec, 0x92, + 0x24, 0xc8, 0x6d, 0x96, 0x57, 0x2a, 0x9b, 0x4a, 0x75, 0x67, 0x77, 0xa3, 0xba, 0x5d, 0xde, 0x14, + 0x85, 0x40, 0x26, 0x57, 0x3e, 0xb3, 0xb7, 0x21, 0x57, 0xd6, 0xc4, 0x58, 0x58, 0xb6, 0x53, 0x29, + 0xef, 0x56, 0xd6, 0xc4, 0x78, 0x51, 0x83, 0xe9, 0x41, 0x75, 0x72, 0xe0, 0xca, 0x08, 0x4d, 0x71, + 0xec, 0x88, 0x29, 0x26, 0x5c, 0x7d, 0x53, 0xfc, 0x76, 0x0c, 0xa6, 0x06, 0xec, 0x15, 0x03, 0x5f, + 0xf2, 0x14, 0x24, 0x69, 0x8a, 0xd2, 0xdd, 0xf3, 0xe1, 0x81, 0x9b, 0x0e, 0x49, 0xd8, 0xbe, 0x1d, + 0x94, 0xe0, 0xc2, 0x1d, 0x44, 0xfc, 0x88, 0x0e, 0x02, 0x53, 0xf4, 0xd5, 0xf4, 0x9f, 0xec, 0xab, + 0xe9, 0x74, 0xdb, 0x5b, 0x1e, 0x66, 0xdb, 0x23, 0xb2, 0xe3, 0xd5, 0xf6, 0xe4, 0x80, 0xda, 0x7e, + 0x09, 0x26, 0xfb, 0x88, 0x86, 0xae, 0xb1, 0x2f, 0x0a, 0x90, 0x3f, 0x2a, 0x38, 0x11, 0x95, 0x2e, + 0xd6, 0x55, 0xe9, 0x2e, 0xf5, 0x46, 0xf0, 0xec, 0xd1, 0x93, 0xd0, 0x37, 0xd7, 0xaf, 0x0a, 0x70, + 0x62, 0x70, 0xa7, 0x38, 0xd0, 0x87, 0x4f, 0xc3, 0x68, 0x0b, 0x79, 0x07, 0x16, 0xef, 0x96, 0x3e, + 0x39, 0x60, 0x0f, 0xc6, 0xea, 0xde, 0xc9, 0x66, 0xa8, 0xf0, 0x26, 0x1e, 0x3f, 0xaa, 0xdd, 0xa3, + 0xde, 0xf4, 0x79, 0xfa, 0x85, 0x18, 0xdc, 0x33, 0x90, 0x7c, 0xa0, 0xa3, 0xf7, 0x01, 0xe8, 0xa6, + 0xdd, 0xf6, 0x68, 0x47, 0x44, 0x0b, 0x6c, 0x9a, 0x48, 0x48, 0xf1, 0xc2, 0xc5, 0xb3, 0xed, 0xf9, + 0xfa, 0x38, 0xd1, 0x03, 0x15, 0x11, 0x83, 0x0b, 0x81, 0xa3, 0x09, 0xe2, 0x68, 0xe1, 0x88, 0x91, + 0xf6, 0x25, 0xe6, 0x13, 0x20, 0x6a, 0x86, 0x8e, 0x4c, 0x4f, 0x71, 0x3d, 0x07, 0xa9, 0x2d, 0xdd, + 0x6c, 0x92, 0x1d, 0x24, 0x55, 0x4a, 0x36, 0x54, 0xc3, 0x45, 0xf2, 0x04, 0x55, 0xd7, 0xb8, 0x16, + 0x23, 0x48, 0x02, 0x39, 0x21, 0xc4, 0x68, 0x17, 0x82, 0xaa, 0x7d, 0x44, 0xf1, 0x17, 0xd3, 0x90, + 0x09, 0xf5, 0xd5, 0xd2, 0x59, 0xc8, 0x5e, 0x55, 0xaf, 0xab, 0x0a, 0x3f, 0x2b, 0xd1, 0x48, 0x64, + 0xb0, 0x6c, 0x87, 0x9d, 0x97, 0x9e, 0x80, 0x69, 0x62, 0x62, 0xb5, 0x3d, 0xe4, 0x28, 0x9a, 0xa1, + 0xba, 0x2e, 0x09, 0x5a, 0x8a, 0x98, 0x4a, 0x58, 0x57, 0xc5, 0xaa, 0x55, 0xae, 0x91, 0x96, 0x60, + 0x8a, 0x20, 0x5a, 0x6d, 0xc3, 0xd3, 0x6d, 0x03, 0x29, 0xf8, 0xf4, 0xe6, 0x92, 0x9d, 0xc4, 0xf7, + 0x6c, 0x12, 0x5b, 0x6c, 0x31, 0x03, 0xec, 0x91, 0x2b, 0xad, 0xc1, 0x7d, 0x04, 0xd6, 0x44, 0x26, + 0x72, 0x54, 0x0f, 0x29, 0xe8, 0xf3, 0x6d, 0xd5, 0x70, 0x15, 0xd5, 0xac, 0x2b, 0x07, 0xaa, 0x7b, + 0x90, 0x9f, 0xc6, 0x04, 0x2b, 0xb1, 0xbc, 0x20, 0x9f, 0xc2, 0x86, 0xeb, 0xcc, 0xae, 0x42, 0xcc, + 0xca, 0x66, 0xfd, 0x8a, 0xea, 0x1e, 0x48, 0x25, 0x38, 0x41, 0x58, 0x5c, 0xcf, 0xd1, 0xcd, 0xa6, + 0xa2, 0x1d, 0x20, 0xed, 0x9a, 0xd2, 0xf6, 0x1a, 0x17, 0xf2, 0xf7, 0x86, 0xdf, 0x4f, 0x3c, 0xac, + 0x11, 0x9b, 0x55, 0x6c, 0xb2, 0xe7, 0x35, 0x2e, 0x48, 0x35, 0xc8, 0xe2, 0xc9, 0x68, 0xe9, 0x37, + 0x91, 0xd2, 0xb0, 0x1c, 0xb2, 0x35, 0xe6, 0x06, 0x94, 0xa6, 0x50, 0x04, 0xe7, 0xaa, 0x0c, 0xb0, + 0x65, 0xd5, 0x51, 0x29, 0x59, 0xdb, 0xa9, 0x54, 0xd6, 0xe4, 0x0c, 0x67, 0xb9, 0x6c, 0x39, 0x38, + 0xa1, 0x9a, 0x96, 0x1f, 0xe0, 0x0c, 0x4d, 0xa8, 0xa6, 0xc5, 0xc3, 0xbb, 0x04, 0x53, 0x9a, 0x46, + 0xc7, 0xac, 0x6b, 0x0a, 0x3b, 0x63, 0xb9, 0x79, 0xb1, 0x2b, 0x58, 0x9a, 0xb6, 0x4e, 0x0d, 0x58, + 0x8e, 0xbb, 0xd2, 0x45, 0xb8, 0x27, 0x08, 0x56, 0x18, 0x38, 0xd9, 0x37, 0xca, 0x5e, 0xe8, 0x12, + 0x4c, 0xd9, 0x9d, 0x7e, 0xa0, 0xd4, 0xf5, 0x46, 0xbb, 0xd3, 0x0b, 0x3b, 0x0f, 0xd3, 0xf6, 0x81, + 0xdd, 0x8f, 0x7b, 0x24, 0x8c, 0x93, 0xec, 0x03, 0xbb, 0x17, 0xf8, 0x20, 0x39, 0x70, 0x3b, 0x48, + 0x53, 0x3d, 0x54, 0xcf, 0x9f, 0x0c, 0x9b, 0x87, 0x14, 0xd2, 0x3c, 0x88, 0x9a, 0xa6, 0x20, 0x53, + 0xdd, 0x37, 0x90, 0xa2, 0x3a, 0xc8, 0x54, 0xdd, 0xfc, 0xe9, 0xb0, 0x71, 0x4e, 0xd3, 0x2a, 0x44, + 0x5b, 0x26, 0x4a, 0xe9, 0x11, 0x98, 0xb4, 0xf6, 0xaf, 0x6a, 0x34, 0x25, 0x15, 0xdb, 0x41, 0x0d, + 0xfd, 0x85, 0xfc, 0x03, 0x24, 0xbe, 0x13, 0x58, 0x41, 0x12, 0x72, 0x87, 0x88, 0xa5, 0x87, 0x41, + 0xd4, 0xdc, 0x03, 0xd5, 0xb1, 0x49, 0x4d, 0x76, 0x6d, 0x55, 0x43, 0xf9, 0x07, 0xa9, 0x29, 0x95, + 0x6f, 0x73, 0x31, 0x5e, 0x12, 0xee, 0x0d, 0xbd, 0xe1, 0x71, 0xc6, 0x87, 0xe8, 0x92, 0x20, 0x32, + 0xc6, 0x36, 0x0b, 0x22, 0x0e, 0x45, 0xd7, 0x8b, 0x67, 0x89, 0x59, 0xce, 0x3e, 0xb0, 0xc3, 0xef, + 0xbd, 0x1f, 0xc6, 0xb1, 0x65, 0xf0, 0xd2, 0x87, 0x69, 0x43, 0x66, 0x1f, 0x84, 0xde, 0xb8, 0x08, + 0x27, 0xb0, 0x51, 0x0b, 0x79, 0x6a, 0x5d, 0xf5, 0xd4, 0x90, 0xf5, 0x63, 0xc4, 0x1a, 0xc7, 0x7d, + 0x8b, 0x29, 0xbb, 0xfc, 0x74, 0xda, 0xfb, 0x1d, 0x3f, 0xb3, 0x1e, 0xa7, 0x7e, 0x62, 0x19, 0xcf, + 0xad, 0x0f, 0xad, 0xe9, 0x2e, 0x96, 0x20, 0x1b, 0x4e, 0x7c, 0x29, 0x0d, 0x34, 0xf5, 0x45, 0x01, + 0x77, 0x41, 0xab, 0xd5, 0x35, 0xdc, 0xbf, 0x3c, 0x5f, 0x11, 0x63, 0xb8, 0x8f, 0xda, 0xdc, 0xd8, + 0xad, 0x28, 0xf2, 0xde, 0xf6, 0xee, 0xc6, 0x56, 0x45, 0x8c, 0x87, 0x1b, 0xf6, 0xef, 0xc7, 0x20, + 0xd7, 0x7d, 0xf6, 0x92, 0x7e, 0x0c, 0x4e, 0xf2, 0x8b, 0x12, 0x17, 0x79, 0xca, 0x0d, 0xdd, 0x21, + 0x6b, 0xb1, 0xa5, 0xd2, 0x7d, 0xd1, 0xcf, 0x86, 0x69, 0x66, 0x55, 0x43, 0xde, 0x33, 0xba, 0x83, + 0x57, 0x5a, 0x4b, 0xf5, 0xa4, 0x4d, 0x38, 0x6d, 0x5a, 0x8a, 0xeb, 0xa9, 0x66, 0x5d, 0x75, 0xea, + 0x4a, 0x70, 0x45, 0xa5, 0xa8, 0x9a, 0x86, 0x5c, 0xd7, 0xa2, 0x7b, 0xa0, 0xcf, 0xf2, 0x09, 0xd3, + 0xaa, 0x31, 0xe3, 0x60, 0x73, 0x28, 0x33, 0xd3, 0x9e, 0xcc, 0x8d, 0x1f, 0x95, 0xb9, 0xf7, 0x42, + 0xba, 0xa5, 0xda, 0x0a, 0x32, 0x3d, 0xa7, 0x43, 0x3a, 0xee, 0x94, 0x9c, 0x6a, 0xa9, 0x76, 0x05, + 0x3f, 0x7f, 0x34, 0x07, 0x9f, 0x7f, 0x8c, 0x43, 0x36, 0xdc, 0x75, 0xe3, 0x43, 0x8c, 0x46, 0x36, + 0x28, 0x81, 0x94, 0xb0, 0xfb, 0xef, 0xda, 0xa3, 0xcf, 0xad, 0xe2, 0x9d, 0xab, 0x34, 0x4a, 0x7b, + 0x61, 0x99, 0x22, 0x71, 0xd7, 0x80, 0x53, 0x0b, 0xd1, 0xde, 0x23, 0x25, 0xb3, 0x27, 0x69, 0x1d, + 0x46, 0xaf, 0xba, 0x84, 0x7b, 0x94, 0x70, 0x3f, 0x70, 0x77, 0xee, 0xa7, 0x6b, 0x84, 0x3c, 0xfd, + 0x74, 0x4d, 0xd9, 0xae, 0xca, 0x5b, 0xe5, 0x4d, 0x99, 0xc1, 0xa5, 0x53, 0x90, 0x30, 0xd4, 0x9b, + 0x9d, 0xee, 0x3d, 0x8e, 0x88, 0x86, 0x0d, 0xfc, 0x29, 0x48, 0xdc, 0x40, 0xea, 0xb5, 0xee, 0x9d, + 0x85, 0x88, 0x3e, 0xc4, 0xd4, 0x9f, 0x87, 0x24, 0x89, 0x97, 0x04, 0xc0, 0x22, 0x26, 0x8e, 0x48, + 0x29, 0x48, 0xac, 0x56, 0x65, 0x9c, 0xfe, 0x22, 0x64, 0xa9, 0x54, 0xd9, 0xd9, 0xa8, 0xac, 0x56, + 0xc4, 0x58, 0x71, 0x09, 0x46, 0x69, 0x10, 0xf0, 0xd2, 0xf0, 0xc3, 0x20, 0x8e, 0xb0, 0x47, 0xc6, + 0x21, 0x70, 0xed, 0xde, 0xd6, 0x4a, 0x45, 0x16, 0x63, 0xe1, 0xe9, 0x75, 0x21, 0x1b, 0x6e, 0xb8, + 0x3f, 0x9a, 0x9c, 0xfa, 0x9e, 0x00, 0x99, 0x50, 0x03, 0x8d, 0x3b, 0x1f, 0xd5, 0x30, 0xac, 0x1b, + 0x8a, 0x6a, 0xe8, 0xaa, 0xcb, 0x92, 0x02, 0x88, 0xa8, 0x8c, 0x25, 0xc3, 0x4e, 0xda, 0x47, 0xe2, + 0xfc, 0x2b, 0x02, 0x88, 0xbd, 0xbd, 0x6b, 0x8f, 0x83, 0xc2, 0xc7, 0xea, 0xe0, 0xcb, 0x02, 0xe4, + 0xba, 0x1b, 0xd6, 0x1e, 0xf7, 0xce, 0x7e, 0xac, 0xee, 0xbd, 0x15, 0x83, 0xf1, 0xae, 0x36, 0x75, + 0x58, 0xef, 0x3e, 0x0f, 0x93, 0x7a, 0x1d, 0xb5, 0x6c, 0xcb, 0x43, 0xa6, 0xd6, 0x51, 0x0c, 0x74, + 0x1d, 0x19, 0xf9, 0x22, 0x29, 0x14, 0xf3, 0x77, 0x6f, 0x84, 0xe7, 0x36, 0x02, 0xdc, 0x26, 0x86, + 0x95, 0xa6, 0x36, 0xd6, 0x2a, 0x5b, 0x3b, 0xd5, 0xdd, 0xca, 0xf6, 0xea, 0x73, 0xca, 0xde, 0xf6, + 0x4f, 0x6c, 0x57, 0x9f, 0xd9, 0x96, 0x45, 0xbd, 0xc7, 0xec, 0x43, 0x5c, 0xea, 0x3b, 0x20, 0xf6, + 0x3a, 0x25, 0x9d, 0x84, 0x41, 0x6e, 0x89, 0x23, 0xd2, 0x14, 0x4c, 0x6c, 0x57, 0x95, 0xda, 0xc6, + 0x5a, 0x45, 0xa9, 0x5c, 0xbe, 0x5c, 0x59, 0xdd, 0xad, 0xd1, 0xab, 0x0d, 0xdf, 0x7a, 0xb7, 0x7b, + 0x51, 0xbf, 0x14, 0x87, 0xa9, 0x01, 0x9e, 0x48, 0x65, 0x76, 0x28, 0xa1, 0xe7, 0xa4, 0xc7, 0x87, + 0xf1, 0x7e, 0x0e, 0x77, 0x05, 0x3b, 0xaa, 0xe3, 0xb1, 0x33, 0xcc, 0xc3, 0x80, 0xa3, 0x64, 0x7a, + 0x7a, 0x43, 0x47, 0x0e, 0xbb, 0x09, 0xa2, 0x27, 0x95, 0x89, 0x40, 0x4e, 0x2f, 0x83, 0x1e, 0x03, + 0xc9, 0xb6, 0x5c, 0xdd, 0xd3, 0xaf, 0x23, 0x45, 0x37, 0xf9, 0xb5, 0x11, 0x3e, 0xb9, 0x24, 0x64, + 0x91, 0x6b, 0x36, 0x4c, 0xcf, 0xb7, 0x36, 0x51, 0x53, 0xed, 0xb1, 0xc6, 0x05, 0x3c, 0x2e, 0x8b, + 0x5c, 0xe3, 0x5b, 0x9f, 0x85, 0x6c, 0xdd, 0x6a, 0xe3, 0x76, 0x8e, 0xda, 0xe1, 0xfd, 0x42, 0x90, + 0x33, 0x54, 0xe6, 0x9b, 0xb0, 0x46, 0x3d, 0xb8, 0xaf, 0xca, 0xca, 0x19, 0x2a, 0xa3, 0x26, 0x0f, + 0xc1, 0x84, 0xda, 0x6c, 0x3a, 0x98, 0x9c, 0x13, 0xd1, 0xa3, 0x47, 0xce, 0x17, 0x13, 0xc3, 0x99, + 0xa7, 0x21, 0xc5, 0xe3, 0x80, 0xb7, 0x64, 0x1c, 0x09, 0xc5, 0xa6, 0xe7, 0xe9, 0xd8, 0x6c, 0x5a, + 0x4e, 0x99, 0x5c, 0x79, 0x16, 0xb2, 0xba, 0xab, 0x04, 0xd7, 0xef, 0xb1, 0x33, 0xb1, 0xd9, 0x94, + 0x9c, 0xd1, 0x5d, 0xff, 0xea, 0xb2, 0xf8, 0x6a, 0x0c, 0x72, 0xdd, 0x9f, 0x0f, 0xa4, 0x35, 0x48, + 0x19, 0x96, 0xa6, 0x92, 0xd4, 0xa2, 0xdf, 0xae, 0x66, 0x23, 0xbe, 0x38, 0xcc, 0x6d, 0x32, 0x7b, + 0xd9, 0x47, 0xce, 0xfc, 0x9d, 0x00, 0x29, 0x2e, 0x96, 0x4e, 0x40, 0xc2, 0x56, 0xbd, 0x03, 0x42, + 0x97, 0x5c, 0x89, 0x89, 0x82, 0x4c, 0x9e, 0xb1, 0xdc, 0xb5, 0x55, 0x93, 0xa4, 0x00, 0x93, 0xe3, + 0x67, 0x3c, 0xaf, 0x06, 0x52, 0xeb, 0xe4, 0x5c, 0x63, 0xb5, 0x5a, 0xc8, 0xf4, 0x5c, 0x3e, 0xaf, + 0x4c, 0xbe, 0xca, 0xc4, 0xd2, 0xa3, 0x30, 0xe9, 0x39, 0xaa, 0x6e, 0x74, 0xd9, 0x26, 0x88, 0xad, + 0xc8, 0x15, 0xbe, 0x71, 0x09, 0x4e, 0x71, 0xde, 0x3a, 0xf2, 0x54, 0xed, 0x00, 0xd5, 0x03, 0xd0, + 0x28, 0xb9, 0xbf, 0x38, 0xc9, 0x0c, 0xd6, 0x98, 0x9e, 0x63, 0x8b, 0x3f, 0x10, 0x60, 0x92, 0x9f, + 0xc4, 0xea, 0x7e, 0xb0, 0xb6, 0x00, 0x54, 0xd3, 0xb4, 0xbc, 0x70, 0xb8, 0xfa, 0x53, 0xb9, 0x0f, + 0x37, 0x57, 0xf6, 0x41, 0x72, 0x88, 0x60, 0xa6, 0x05, 0x10, 0x68, 0x8e, 0x0c, 0xdb, 0x69, 0xc8, + 0xb0, 0x6f, 0x43, 0xe4, 0x03, 0x23, 0x3d, 0xbb, 0x03, 0x15, 0xe1, 0x23, 0x9b, 0x34, 0x0d, 0xc9, + 0x7d, 0xd4, 0xd4, 0x4d, 0x76, 0xe3, 0x4b, 0x1f, 0xf8, 0x0d, 0x4b, 0xc2, 0xbf, 0x61, 0x59, 0xf9, + 0x1c, 0x4c, 0x69, 0x56, 0xab, 0xd7, 0xdd, 0x15, 0xb1, 0xe7, 0xfe, 0xc0, 0xbd, 0x22, 0x3c, 0x0f, + 0x41, 0x8b, 0xf9, 0xbe, 0x20, 0x7c, 0x2d, 0x16, 0x5f, 0xdf, 0x59, 0xf9, 0x46, 0x6c, 0x66, 0x9d, + 0x42, 0x77, 0xf8, 0x48, 0x65, 0xd4, 0x30, 0x90, 0x86, 0xbd, 0x87, 0xaf, 0x3f, 0x0a, 0x8f, 0x37, + 0x75, 0xef, 0xa0, 0xbd, 0x3f, 0xa7, 0x59, 0xad, 0xf9, 0xa6, 0xd5, 0xb4, 0x82, 0x6f, 0xaa, 0xf8, + 0x89, 0x3c, 0x90, 0xbf, 0xd8, 0x77, 0xd5, 0xb4, 0x2f, 0x9d, 0x89, 0xfc, 0x08, 0x5b, 0xda, 0x86, + 0x29, 0x66, 0xac, 0x90, 0x0f, 0x3b, 0xf4, 0x78, 0x22, 0xdd, 0xf5, 0x72, 0x2c, 0xff, 0xad, 0x77, + 0xc8, 0x76, 0x2d, 0x4f, 0x32, 0x28, 0xd6, 0xd1, 0x13, 0x4c, 0x49, 0x86, 0x7b, 0xba, 0xf8, 0xe8, + 0xd2, 0x44, 0x4e, 0x04, 0xe3, 0xf7, 0x19, 0xe3, 0x54, 0x88, 0xb1, 0xc6, 0xa0, 0xa5, 0x55, 0x18, + 0x3f, 0x0e, 0xd7, 0xdf, 0x30, 0xae, 0x2c, 0x0a, 0x93, 0xac, 0xc3, 0x04, 0x21, 0xd1, 0xda, 0xae, + 0x67, 0xb5, 0x48, 0xdd, 0xbb, 0x3b, 0xcd, 0xdf, 0xbe, 0x43, 0xd7, 0x4a, 0x0e, 0xc3, 0x56, 0x7d, + 0x54, 0xa9, 0x04, 0xe4, 0x5b, 0x56, 0x1d, 0x69, 0x46, 0x04, 0xc3, 0xeb, 0xcc, 0x11, 0xdf, 0xbe, + 0xf4, 0x59, 0x98, 0xc6, 0x7f, 0x93, 0xb2, 0x14, 0xf6, 0x24, 0xfa, 0x26, 0x2d, 0xff, 0x83, 0x17, + 0xe9, 0x72, 0x9c, 0xf2, 0x09, 0x42, 0x3e, 0x85, 0x66, 0xb1, 0x89, 0x3c, 0x0f, 0x39, 0xae, 0xa2, + 0x1a, 0x83, 0xdc, 0x0b, 0x5d, 0x45, 0xe4, 0xbf, 0xfc, 0x6e, 0xf7, 0x2c, 0xae, 0x53, 0x64, 0xd9, + 0x30, 0x4a, 0x7b, 0x70, 0x72, 0x40, 0x56, 0x0c, 0xc1, 0xf9, 0x12, 0xe3, 0x9c, 0xee, 0xcb, 0x0c, + 0x4c, 0xbb, 0x03, 0x5c, 0xee, 0xcf, 0xe5, 0x10, 0x9c, 0xbf, 0xc5, 0x38, 0x25, 0x86, 0xe5, 0x53, + 0x8a, 0x19, 0x9f, 0x86, 0xc9, 0xeb, 0xc8, 0xd9, 0xb7, 0x5c, 0x76, 0xfd, 0x33, 0x04, 0xdd, 0xcb, + 0x8c, 0x6e, 0x82, 0x01, 0xc9, 0x7d, 0x10, 0xe6, 0xba, 0x08, 0xa9, 0x86, 0xaa, 0xa1, 0x21, 0x28, + 0xbe, 0xc2, 0x28, 0xc6, 0xb0, 0x3d, 0x86, 0x96, 0x21, 0xdb, 0xb4, 0xd8, 0xce, 0x14, 0x0d, 0x7f, + 0x85, 0xc1, 0x33, 0x1c, 0xc3, 0x28, 0x6c, 0xcb, 0x6e, 0x1b, 0x78, 0xdb, 0x8a, 0xa6, 0xf8, 0x6d, + 0x4e, 0xc1, 0x31, 0x8c, 0xe2, 0x18, 0x61, 0xfd, 0x1d, 0x4e, 0xe1, 0x86, 0xe2, 0xf9, 0x14, 0x64, + 0x2c, 0xd3, 0xe8, 0x58, 0xe6, 0x30, 0x4e, 0x7c, 0x95, 0x31, 0x00, 0x83, 0x60, 0x82, 0x4b, 0x90, + 0x1e, 0x76, 0x22, 0x7e, 0xef, 0x5d, 0xbe, 0x3c, 0xf8, 0x0c, 0xac, 0xc3, 0x04, 0x2f, 0x50, 0xba, + 0x65, 0x0e, 0x41, 0xf1, 0x75, 0x46, 0x91, 0x0b, 0xc1, 0xd8, 0x30, 0x3c, 0xe4, 0x7a, 0x4d, 0x34, + 0x0c, 0xc9, 0xab, 0x7c, 0x18, 0x0c, 0xc2, 0x42, 0xb9, 0x8f, 0x4c, 0xed, 0x60, 0x38, 0x86, 0xd7, + 0x78, 0x28, 0x39, 0x06, 0x53, 0xac, 0xc2, 0x78, 0x4b, 0x75, 0xdc, 0x03, 0xd5, 0x18, 0x6a, 0x3a, + 0x7e, 0x9f, 0x71, 0x64, 0x7d, 0x10, 0x8b, 0x48, 0xdb, 0x3c, 0x0e, 0xcd, 0x37, 0x78, 0x44, 0x42, + 0x30, 0xb6, 0xf4, 0x5c, 0x8f, 0xdc, 0x95, 0x1d, 0x87, 0xed, 0x0f, 0xf8, 0xd2, 0xa3, 0xd8, 0xad, + 0x30, 0xe3, 0x25, 0x48, 0xbb, 0xfa, 0xcd, 0xa1, 0x68, 0xfe, 0x90, 0xcf, 0x34, 0x01, 0x60, 0xf0, + 0x73, 0x70, 0x6a, 0xe0, 0x36, 0x31, 0x04, 0xd9, 0x1f, 0x31, 0xb2, 0x13, 0x03, 0xb6, 0x0a, 0x56, + 0x12, 0x8e, 0x4b, 0xf9, 0xc7, 0xbc, 0x24, 0xa0, 0x1e, 0xae, 0x1d, 0x7c, 0x56, 0x70, 0xd5, 0xc6, + 0xf1, 0xa2, 0xf6, 0x27, 0x3c, 0x6a, 0x14, 0xdb, 0x15, 0xb5, 0x5d, 0x38, 0xc1, 0x18, 0x8f, 0x37, + 0xaf, 0xdf, 0xe4, 0x85, 0x95, 0xa2, 0xf7, 0xba, 0x67, 0xf7, 0x73, 0x30, 0xe3, 0x87, 0x93, 0x37, + 0xa5, 0xae, 0xd2, 0x52, 0xed, 0x21, 0x98, 0xbf, 0xc5, 0x98, 0x79, 0xc5, 0xf7, 0xbb, 0x5a, 0x77, + 0x4b, 0xb5, 0x31, 0xf9, 0xb3, 0x90, 0xe7, 0xe4, 0x6d, 0xd3, 0x41, 0x9a, 0xd5, 0x34, 0xf5, 0x9b, + 0xa8, 0x3e, 0x04, 0xf5, 0x9f, 0xf6, 0x4c, 0xd5, 0x5e, 0x08, 0x8e, 0x99, 0x37, 0x40, 0xf4, 0x7b, + 0x15, 0x45, 0x6f, 0xd9, 0x96, 0xe3, 0x45, 0x30, 0xfe, 0x19, 0x9f, 0x29, 0x1f, 0xb7, 0x41, 0x60, + 0xa5, 0x0a, 0xe4, 0xc8, 0xe3, 0xb0, 0x29, 0xf9, 0xe7, 0x8c, 0x68, 0x3c, 0x40, 0xb1, 0xc2, 0xa1, + 0x59, 0x2d, 0x5b, 0x75, 0x86, 0xa9, 0x7f, 0x7f, 0xc1, 0x0b, 0x07, 0x83, 0xb0, 0xc2, 0xe1, 0x75, + 0x6c, 0x84, 0x77, 0xfb, 0x21, 0x18, 0xbe, 0xcd, 0x0b, 0x07, 0xc7, 0x30, 0x0a, 0xde, 0x30, 0x0c, + 0x41, 0xf1, 0x97, 0x9c, 0x82, 0x63, 0x30, 0xc5, 0x67, 0x82, 0x8d, 0xd6, 0x41, 0x4d, 0xdd, 0xf5, + 0x1c, 0xda, 0x0a, 0xdf, 0x9d, 0xea, 0x3b, 0xef, 0x76, 0x37, 0x61, 0x72, 0x08, 0x8a, 0x2b, 0x11, + 0xbb, 0x42, 0x25, 0x27, 0xa5, 0x68, 0xc7, 0xbe, 0xcb, 0x2b, 0x51, 0x08, 0x86, 0x7d, 0x0b, 0x75, + 0x88, 0x38, 0xec, 0x1a, 0x3e, 0x1f, 0x0c, 0x41, 0xf7, 0xbd, 0x1e, 0xe7, 0x6a, 0x1c, 0x8b, 0x39, + 0x43, 0xfd, 0x4f, 0xdb, 0xbc, 0x86, 0x3a, 0x43, 0x65, 0xe7, 0x5f, 0xf5, 0xf4, 0x3f, 0x7b, 0x14, + 0x49, 0x6b, 0xc8, 0x44, 0x4f, 0x3f, 0x25, 0x45, 0xfd, 0x0a, 0x28, 0xff, 0xd3, 0x77, 0xd8, 0x78, + 0xbb, 0xdb, 0xa9, 0xd2, 0x26, 0x4e, 0xf2, 0xee, 0xa6, 0x27, 0x9a, 0xec, 0xc5, 0x3b, 0x7e, 0x9e, + 0x77, 0xf5, 0x3c, 0xa5, 0xcb, 0x30, 0xde, 0xd5, 0xf0, 0x44, 0x53, 0xfd, 0x0c, 0xa3, 0xca, 0x86, + 0xfb, 0x9d, 0xd2, 0x12, 0x24, 0x70, 0xf3, 0x12, 0x0d, 0xff, 0x59, 0x06, 0x27, 0xe6, 0xa5, 0x4f, + 0x41, 0x8a, 0x37, 0x2d, 0xd1, 0xd0, 0x9f, 0x63, 0x50, 0x1f, 0x82, 0xe1, 0xbc, 0x61, 0x89, 0x86, + 0xff, 0x3c, 0x87, 0x73, 0x08, 0x86, 0x0f, 0x1f, 0xc2, 0xbf, 0xfe, 0x85, 0x04, 0xdb, 0x74, 0x78, + 0xec, 0x2e, 0xc1, 0x18, 0xeb, 0x54, 0xa2, 0xd1, 0x5f, 0x60, 0x2f, 0xe7, 0x88, 0xd2, 0x79, 0x48, + 0x0e, 0x19, 0xf0, 0x5f, 0x62, 0x50, 0x6a, 0x5f, 0x5a, 0x85, 0x4c, 0xa8, 0x3b, 0x89, 0x86, 0xff, + 0x32, 0x83, 0x87, 0x51, 0xd8, 0x75, 0xd6, 0x9d, 0x44, 0x13, 0xfc, 0x0a, 0x77, 0x9d, 0x21, 0x70, + 0xd8, 0x78, 0x63, 0x12, 0x8d, 0xfe, 0x55, 0x1e, 0x75, 0x0e, 0x29, 0x3d, 0x05, 0x69, 0x7f, 0xb3, + 0x89, 0xc6, 0xff, 0x1a, 0xc3, 0x07, 0x18, 0x1c, 0x81, 0xd0, 0x66, 0x17, 0x4d, 0xf1, 0x45, 0x1e, + 0x81, 0x10, 0x0a, 0x2f, 0xa3, 0xde, 0x06, 0x26, 0x9a, 0xe9, 0xd7, 0xf9, 0x32, 0xea, 0xe9, 0x5f, + 0xf0, 0x6c, 0x92, 0x9a, 0x1f, 0x4d, 0xf1, 0x1b, 0x7c, 0x36, 0x89, 0x3d, 0x76, 0xa3, 0xb7, 0x23, + 0x88, 0xe6, 0xf8, 0x4d, 0xee, 0x46, 0x4f, 0x43, 0x50, 0xda, 0x01, 0xa9, 0xbf, 0x1b, 0x88, 0xe6, + 0xfb, 0x12, 0xe3, 0x9b, 0xec, 0x6b, 0x06, 0x4a, 0xcf, 0xc0, 0x89, 0xc1, 0x9d, 0x40, 0x34, 0xeb, + 0x97, 0xef, 0xf4, 0x9c, 0xdd, 0xc2, 0x8d, 0x40, 0x69, 0x37, 0xd8, 0x52, 0xc2, 0x5d, 0x40, 0x34, + 0xed, 0x4b, 0x77, 0xba, 0x0b, 0x77, 0xb8, 0x09, 0x28, 0x95, 0x01, 0x82, 0x0d, 0x38, 0x9a, 0xeb, + 0x65, 0xc6, 0x15, 0x02, 0xe1, 0xa5, 0xc1, 0xf6, 0xdf, 0x68, 0xfc, 0x57, 0xf8, 0xd2, 0x60, 0x08, + 0xbc, 0x34, 0xf8, 0xd6, 0x1b, 0x8d, 0x7e, 0x85, 0x2f, 0x0d, 0x0e, 0xc1, 0x99, 0x1d, 0xda, 0xdd, + 0xa2, 0x19, 0xbe, 0xca, 0x33, 0x3b, 0x84, 0x2a, 0x6d, 0xc3, 0x64, 0xdf, 0x86, 0x18, 0x4d, 0xf5, + 0x35, 0x46, 0x25, 0xf6, 0xee, 0x87, 0xe1, 0xcd, 0x8b, 0x6d, 0x86, 0xd1, 0x6c, 0xbf, 0xdb, 0xb3, + 0x79, 0xb1, 0xbd, 0xb0, 0x74, 0x09, 0x52, 0x66, 0xdb, 0x30, 0xf0, 0xe2, 0x91, 0xee, 0xfe, 0xcb, + 0xbd, 0xfc, 0x3f, 0x7f, 0xc0, 0xa2, 0xc3, 0x01, 0xa5, 0x25, 0x48, 0xa2, 0xd6, 0x3e, 0xaa, 0x47, + 0x21, 0xff, 0xe5, 0x03, 0x5e, 0x30, 0xb1, 0x75, 0xe9, 0x29, 0x00, 0x7a, 0x35, 0x42, 0x3e, 0xfb, + 0x45, 0x60, 0xff, 0xf5, 0x03, 0xf6, 0x9b, 0x9a, 0x00, 0x12, 0x10, 0xd0, 0x5f, 0xe8, 0xdc, 0x9d, + 0xe0, 0xdd, 0x6e, 0x02, 0x32, 0x23, 0x17, 0x61, 0xec, 0xaa, 0x6b, 0x99, 0x9e, 0xda, 0x8c, 0x42, + 0xff, 0x1b, 0x43, 0x73, 0x7b, 0x1c, 0xb0, 0x96, 0xe5, 0x20, 0x4f, 0x6d, 0xba, 0x51, 0xd8, 0x7f, + 0x67, 0x58, 0x1f, 0x80, 0xc1, 0x9a, 0xea, 0x7a, 0xc3, 0x8c, 0xfb, 0x3f, 0x38, 0x98, 0x03, 0xb0, + 0xd3, 0xf8, 0xef, 0x6b, 0xa8, 0x13, 0x85, 0x7d, 0x8f, 0x3b, 0xcd, 0xec, 0x4b, 0x9f, 0x82, 0x34, + 0xfe, 0x93, 0xfe, 0x50, 0x2e, 0x02, 0xfc, 0x9f, 0x0c, 0x1c, 0x20, 0xf0, 0x9b, 0x5d, 0xaf, 0xee, + 0xe9, 0xd1, 0xc1, 0xfe, 0x2f, 0x36, 0xd3, 0xdc, 0xbe, 0x54, 0x86, 0x8c, 0xeb, 0xd5, 0xeb, 0x6d, + 0xd6, 0x9f, 0x46, 0xc0, 0xff, 0xfb, 0x03, 0xff, 0xca, 0xc2, 0xc7, 0xe0, 0xd9, 0xbe, 0x71, 0xcd, + 0xb3, 0x2d, 0xf2, 0x99, 0x23, 0x8a, 0xe1, 0x0e, 0x63, 0x08, 0x41, 0x56, 0x2a, 0x83, 0xaf, 0x6f, + 0x61, 0xdd, 0x5a, 0xb7, 0xe8, 0xc5, 0xed, 0xf3, 0xc5, 0xe8, 0x1b, 0x58, 0xf8, 0xdf, 0x14, 0xe4, + 0x35, 0xab, 0xb5, 0x6f, 0xb9, 0xf3, 0x26, 0xd2, 0xbd, 0x03, 0xe4, 0xcc, 0x5b, 0x26, 0xe3, 0x93, + 0xe2, 0x96, 0x89, 0x66, 0x8e, 0x77, 0x8f, 0x5b, 0x3c, 0x05, 0xc9, 0x5a, 0x7b, 0x7f, 0xbf, 0x23, + 0x89, 0x10, 0x77, 0xdb, 0xfb, 0xec, 0xc7, 0x56, 0xf8, 0xcf, 0xe2, 0x9b, 0x71, 0x18, 0x2f, 0x1b, + 0xc6, 0x6e, 0xc7, 0x46, 0x6e, 0xd5, 0x44, 0xd5, 0x86, 0x94, 0x87, 0x51, 0x32, 0xd0, 0x27, 0x89, + 0x99, 0x70, 0x65, 0x44, 0x66, 0xcf, 0xbe, 0x66, 0x81, 0xdc, 0x70, 0xc7, 0x7c, 0xcd, 0x82, 0xaf, + 0x39, 0x47, 0x2f, 0xb8, 0x7d, 0xcd, 0x39, 0x5f, 0xb3, 0x48, 0xae, 0xb9, 0xe3, 0xbe, 0x66, 0xd1, + 0xd7, 0x2c, 0x91, 0xcf, 0x38, 0xe3, 0xbe, 0x66, 0xc9, 0xd7, 0x2c, 0x93, 0x0f, 0x37, 0x09, 0x5f, + 0xb3, 0xec, 0x6b, 0xce, 0x93, 0xef, 0x35, 0x93, 0xbe, 0xe6, 0xbc, 0xaf, 0xb9, 0x40, 0xbe, 0xd1, + 0x48, 0xbe, 0xe6, 0x82, 0xaf, 0xb9, 0x48, 0x7e, 0x55, 0x35, 0xe6, 0x6b, 0x2e, 0x4a, 0x33, 0x30, + 0x46, 0x47, 0xf6, 0x04, 0xf9, 0x90, 0x3f, 0x71, 0x65, 0x44, 0xe6, 0x82, 0x40, 0xf7, 0x24, 0xf9, + 0xe5, 0xd4, 0x68, 0xa0, 0x7b, 0x32, 0xd0, 0x2d, 0x90, 0xff, 0xc0, 0x21, 0x06, 0xba, 0x85, 0x40, + 0x77, 0x2e, 0x3f, 0x8e, 0xf3, 0x23, 0xd0, 0x9d, 0x0b, 0x74, 0x8b, 0xf9, 0x1c, 0x9e, 0x81, 0x40, + 0xb7, 0x18, 0xe8, 0x96, 0xf2, 0x13, 0x67, 0x84, 0xd9, 0x6c, 0xa0, 0x5b, 0x92, 0x1e, 0x87, 0x8c, + 0xdb, 0xde, 0x57, 0x58, 0xa5, 0x27, 0xbf, 0xd0, 0xca, 0x2c, 0xc0, 0x1c, 0xce, 0x09, 0x32, 0xad, + 0x57, 0x46, 0x64, 0x70, 0xdb, 0xfb, 0xac, 0x10, 0xaf, 0x64, 0x81, 0xdc, 0x3f, 0x29, 0xe4, 0x87, + 0xd5, 0xc5, 0x37, 0x04, 0x48, 0xef, 0xde, 0xb0, 0xc8, 0x67, 0x7c, 0xf7, 0xff, 0x79, 0x72, 0xb9, + 0xd3, 0xe7, 0x16, 0xc9, 0x97, 0xd6, 0xf4, 0x15, 0x41, 0xe6, 0x82, 0x40, 0xb7, 0x94, 0xbf, 0x9f, + 0x0c, 0xc8, 0xd7, 0x2d, 0x49, 0xf3, 0x90, 0x0d, 0x0d, 0x68, 0x81, 0xfc, 0x76, 0xaa, 0x7b, 0x44, + 0x82, 0x9c, 0x09, 0x46, 0xb4, 0xb0, 0x92, 0x04, 0x9c, 0xf6, 0xf8, 0x1f, 0xef, 0x86, 0x55, 0xfc, + 0x62, 0x0c, 0x32, 0xf4, 0xca, 0x9a, 0x8c, 0x0a, 0xbf, 0x8a, 0x9e, 0x6a, 0x3a, 0xcc, 0x8d, 0x11, + 0x99, 0x0b, 0x24, 0x19, 0x80, 0x9a, 0xe2, 0x0c, 0xa7, 0x9e, 0xac, 0x3c, 0xf1, 0x0f, 0x6f, 0x9e, + 0x7e, 0xec, 0xc8, 0x15, 0x84, 0x63, 0x37, 0x4f, 0x4b, 0xf8, 0xdc, 0x9e, 0x6e, 0x7a, 0x4f, 0x2e, + 0x5c, 0xc0, 0x01, 0x0e, 0x58, 0xa4, 0x3d, 0x48, 0xad, 0xaa, 0x2e, 0xf9, 0xd5, 0x25, 0x71, 0x3d, + 0xb1, 0x72, 0xfe, 0x7f, 0xde, 0x3c, 0x7d, 0x2e, 0x82, 0x91, 0x55, 0xd7, 0xb9, 0xad, 0x0e, 0x66, + 0x5d, 0x5e, 0xc4, 0xf0, 0x2b, 0x23, 0xb2, 0x4f, 0x25, 0x2d, 0x70, 0x57, 0xb7, 0xd5, 0x16, 0xfd, + 0x91, 0x58, 0x7c, 0x45, 0x3c, 0x7c, 0xf3, 0x74, 0x76, 0xab, 0x13, 0xc8, 0x03, 0x57, 0xf0, 0xd3, + 0x4a, 0x0a, 0x46, 0xa9, 0xab, 0x2b, 0x57, 0x5e, 0xbf, 0x5d, 0x18, 0x79, 0xe3, 0x76, 0x61, 0xe4, + 0xef, 0x6f, 0x17, 0x46, 0xde, 0xba, 0x5d, 0x10, 0xde, 0xbb, 0x5d, 0x10, 0xde, 0xbf, 0x5d, 0x10, + 0x6e, 0x1d, 0x16, 0x84, 0xd7, 0x0e, 0x0b, 0xc2, 0x37, 0x0f, 0x0b, 0xc2, 0x77, 0x0e, 0x0b, 0xc2, + 0xeb, 0x87, 0x85, 0x91, 0x37, 0x0e, 0x0b, 0x23, 0x6f, 0x1d, 0x16, 0x84, 0x1f, 0x1e, 0x16, 0x46, + 0xde, 0x3b, 0x2c, 0x08, 0xef, 0x1f, 0x16, 0x46, 0x6e, 0xbd, 0x5d, 0x18, 0x79, 0xed, 0xed, 0x82, + 0xf0, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x64, 0x85, 0x97, 0x73, 0x37, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) @@ -3377,7 +4098,7 @@ } func NewPopulatedSubby(r randyOne, easy bool) *Subby { this := &Subby{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := string(randStringOne(r)) this.Sub = &v1 } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/neither/onepb_test.go golang-gogoprotobuf-1.3.1/test/oneof/combos/neither/onepb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/neither/onepb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/neither/onepb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -377,6 +377,102 @@ } } +func TestSubbyCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSubby(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &Subby{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSubby(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestAllTypesOneOfCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedAllTypesOneOf(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &AllTypesOneOf{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedAllTypesOneOf(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestTwoOneofsCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedTwoOneofs(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &TwoOneofs{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedTwoOneofs(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestCustomOneofCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedCustomOneof(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &CustomOneof{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedCustomOneof(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} func TestOneDescription(t *testing.T) { OneDescription() } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/neither/one.proto golang-gogoprotobuf-1.3.1/test/oneof/combos/neither/one.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/neither/one.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/neither/one.proto 2020-05-17 12:22:58.000000000 +0000 @@ -54,6 +54,8 @@ option (gogoproto.unsafe_marshaler_all) = false; option (gogoproto.unsafe_unmarshaler_all) = false; +option (gogoproto.compare_all) = true; + message Subby { optional string sub = 1; } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/unmarshaler/one.pb.go golang-gogoprotobuf-1.3.1/test/oneof/combos/unmarshaler/one.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/unmarshaler/one.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/unmarshaler/one.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -31,7 +31,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Subby struct { Sub *string `protobuf:"bytes,1,opt,name=sub" json:"sub,omitempty"` @@ -115,55 +115,56 @@ Equal(interface{}) bool VerboseEqual(interface{}) error Size() int + Compare(interface{}) int } type AllTypesOneOf_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof" json:"Field1,omitempty"` } type AllTypesOneOf_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof" json:"Field2,omitempty"` } type AllTypesOneOf_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof" json:"Field3,omitempty"` } type AllTypesOneOf_Field4 struct { - Field4 int64 `protobuf:"varint,4,opt,name=Field4,oneof"` + Field4 int64 `protobuf:"varint,4,opt,name=Field4,oneof" json:"Field4,omitempty"` } type AllTypesOneOf_Field5 struct { - Field5 uint32 `protobuf:"varint,5,opt,name=Field5,oneof"` + Field5 uint32 `protobuf:"varint,5,opt,name=Field5,oneof" json:"Field5,omitempty"` } type AllTypesOneOf_Field6 struct { - Field6 uint64 `protobuf:"varint,6,opt,name=Field6,oneof"` + Field6 uint64 `protobuf:"varint,6,opt,name=Field6,oneof" json:"Field6,omitempty"` } type AllTypesOneOf_Field7 struct { - Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,oneof"` + Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,oneof" json:"Field7,omitempty"` } type AllTypesOneOf_Field8 struct { - Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,oneof"` + Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,oneof" json:"Field8,omitempty"` } type AllTypesOneOf_Field9 struct { - Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,oneof"` + Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,oneof" json:"Field9,omitempty"` } type AllTypesOneOf_Field10 struct { - Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,oneof"` + Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,oneof" json:"Field10,omitempty"` } type AllTypesOneOf_Field11 struct { - Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,oneof"` + Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,oneof" json:"Field11,omitempty"` } type AllTypesOneOf_Field12 struct { - Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,oneof"` + Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,oneof" json:"Field12,omitempty"` } type AllTypesOneOf_Field13 struct { - Field13 bool `protobuf:"varint,13,opt,name=Field13,oneof"` + Field13 bool `protobuf:"varint,13,opt,name=Field13,oneof" json:"Field13,omitempty"` } type AllTypesOneOf_Field14 struct { - Field14 string `protobuf:"bytes,14,opt,name=Field14,oneof"` + Field14 string `protobuf:"bytes,14,opt,name=Field14,oneof" json:"Field14,omitempty"` } type AllTypesOneOf_Field15 struct { - Field15 []byte `protobuf:"bytes,15,opt,name=Field15,oneof"` + Field15 []byte `protobuf:"bytes,15,opt,name=Field15,oneof" json:"Field15,omitempty"` } type AllTypesOneOf_SubMessage struct { - SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,oneof"` + SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,oneof" json:"sub_message,omitempty"` } func (*AllTypesOneOf_Field1) isAllTypesOneOf_TestOneof() {} @@ -302,9 +303,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*AllTypesOneOf) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _AllTypesOneOf_OneofMarshaler, _AllTypesOneOf_OneofUnmarshaler, _AllTypesOneOf_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*AllTypesOneOf) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*AllTypesOneOf_Field1)(nil), (*AllTypesOneOf_Field2)(nil), (*AllTypesOneOf_Field3)(nil), @@ -324,255 +325,6 @@ } } -func _AllTypesOneOf_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*AllTypesOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *AllTypesOneOf_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *AllTypesOneOf_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *AllTypesOneOf_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case *AllTypesOneOf_Field4: - _ = b.EncodeVarint(4<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field4)) - case *AllTypesOneOf_Field5: - _ = b.EncodeVarint(5<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field5)) - case *AllTypesOneOf_Field6: - _ = b.EncodeVarint(6<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field6)) - case *AllTypesOneOf_Field7: - _ = b.EncodeVarint(7<<3 | proto.WireVarint) - _ = b.EncodeZigzag32(uint64(x.Field7)) - case *AllTypesOneOf_Field8: - _ = b.EncodeVarint(8<<3 | proto.WireVarint) - _ = b.EncodeZigzag64(uint64(x.Field8)) - case *AllTypesOneOf_Field9: - _ = b.EncodeVarint(9<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field9)) - case *AllTypesOneOf_Field10: - _ = b.EncodeVarint(10<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field10)) - case *AllTypesOneOf_Field11: - _ = b.EncodeVarint(11<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field11)) - case *AllTypesOneOf_Field12: - _ = b.EncodeVarint(12<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field12)) - case *AllTypesOneOf_Field13: - t := uint64(0) - if x.Field13 { - t = 1 - } - _ = b.EncodeVarint(13<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *AllTypesOneOf_Field14: - _ = b.EncodeVarint(14<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field14) - case *AllTypesOneOf_Field15: - _ = b.EncodeVarint(15<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field15) - case *AllTypesOneOf_SubMessage: - _ = b.EncodeVarint(16<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("AllTypesOneOf.TestOneof has unexpected type %T", x) - } - return nil -} - -func _AllTypesOneOf_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*AllTypesOneOf) - switch tag { - case 1: // test_oneof.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field1{math.Float64frombits(x)} - return true, err - case 2: // test_oneof.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // test_oneof.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field3{int32(x)} - return true, err - case 4: // test_oneof.Field4 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field4{int64(x)} - return true, err - case 5: // test_oneof.Field5 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field5{uint32(x)} - return true, err - case 6: // test_oneof.Field6 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field6{x} - return true, err - case 7: // test_oneof.Field7 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag32() - m.TestOneof = &AllTypesOneOf_Field7{int32(x)} - return true, err - case 8: // test_oneof.Field8 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag64() - m.TestOneof = &AllTypesOneOf_Field8{int64(x)} - return true, err - case 9: // test_oneof.Field9 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field9{uint32(x)} - return true, err - case 10: // test_oneof.Field10 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &AllTypesOneOf_Field10{int32(x)} - return true, err - case 11: // test_oneof.Field11 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field11{x} - return true, err - case 12: // test_oneof.Field12 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &AllTypesOneOf_Field12{int64(x)} - return true, err - case 13: // test_oneof.Field13 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &AllTypesOneOf_Field13{x != 0} - return true, err - case 14: // test_oneof.Field14 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.TestOneof = &AllTypesOneOf_Field14{x} - return true, err - case 15: // test_oneof.Field15 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.TestOneof = &AllTypesOneOf_Field15{x} - return true, err - case 16: // test_oneof.sub_message - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.TestOneof = &AllTypesOneOf_SubMessage{msg} - return true, err - default: - return false, nil - } -} - -func _AllTypesOneOf_OneofSizer(msg proto.Message) (n int) { - m := msg.(*AllTypesOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *AllTypesOneOf_Field1: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field2: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case *AllTypesOneOf_Field4: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field4)) - case *AllTypesOneOf_Field5: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field5)) - case *AllTypesOneOf_Field6: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field6)) - case *AllTypesOneOf_Field7: - n += 1 // tag and wire - n += proto.SizeVarint(uint64((uint32(x.Field7) << 1) ^ uint32((int32(x.Field7) >> 31)))) - case *AllTypesOneOf_Field8: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(uint64(x.Field8<<1) ^ uint64((int64(x.Field8) >> 63)))) - case *AllTypesOneOf_Field9: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field10: - n += 1 // tag and wire - n += 4 - case *AllTypesOneOf_Field11: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field12: - n += 1 // tag and wire - n += 8 - case *AllTypesOneOf_Field13: - n += 1 // tag and wire - n += 1 - case *AllTypesOneOf_Field14: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field14))) - n += len(x.Field14) - case *AllTypesOneOf_Field15: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field15))) - n += len(x.Field15) - case *AllTypesOneOf_SubMessage: - s := proto.Size(x.SubMessage) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type TwoOneofs struct { // Types that are valid to be assigned to One: // *TwoOneofs_Field1 @@ -617,31 +369,33 @@ Equal(interface{}) bool VerboseEqual(interface{}) error Size() int + Compare(interface{}) int } type isTwoOneofs_Two interface { isTwoOneofs_Two() Equal(interface{}) bool VerboseEqual(interface{}) error Size() int + Compare(interface{}) int } type TwoOneofs_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,oneof" json:"Field1,omitempty"` } type TwoOneofs_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,oneof" json:"Field2,omitempty"` } type TwoOneofs_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,oneof" json:"Field3,omitempty"` } type TwoOneofs_Field34 struct { - Field34 string `protobuf:"bytes,34,opt,name=Field34,oneof"` + Field34 string `protobuf:"bytes,34,opt,name=Field34,oneof" json:"Field34,omitempty"` } type TwoOneofs_Field35 struct { - Field35 []byte `protobuf:"bytes,35,opt,name=Field35,oneof"` + Field35 []byte `protobuf:"bytes,35,opt,name=Field35,oneof" json:"Field35,omitempty"` } type TwoOneofs_SubMessage2 struct { - SubMessage2 *Subby `protobuf:"bytes,36,opt,name=sub_message2,json=subMessage2,oneof"` + SubMessage2 *Subby `protobuf:"bytes,36,opt,name=sub_message2,json=subMessage2,oneof" json:"sub_message2,omitempty"` } func (*TwoOneofs_Field1) isTwoOneofs_One() {} @@ -675,419 +429,1386 @@ if x, ok := m.GetOne().(*TwoOneofs_Field2); ok { return x.Field2 } - return 0 -} - -func (m *TwoOneofs) GetField3() int32 { - if x, ok := m.GetOne().(*TwoOneofs_Field3); ok { - return x.Field3 + return 0 +} + +func (m *TwoOneofs) GetField3() int32 { + if x, ok := m.GetOne().(*TwoOneofs_Field3); ok { + return x.Field3 + } + return 0 +} + +func (m *TwoOneofs) GetField34() string { + if x, ok := m.GetTwo().(*TwoOneofs_Field34); ok { + return x.Field34 + } + return "" +} + +func (m *TwoOneofs) GetField35() []byte { + if x, ok := m.GetTwo().(*TwoOneofs_Field35); ok { + return x.Field35 + } + return nil +} + +func (m *TwoOneofs) GetSubMessage2() *Subby { + if x, ok := m.GetTwo().(*TwoOneofs_SubMessage2); ok { + return x.SubMessage2 + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TwoOneofs) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*TwoOneofs_Field1)(nil), + (*TwoOneofs_Field2)(nil), + (*TwoOneofs_Field3)(nil), + (*TwoOneofs_Field34)(nil), + (*TwoOneofs_Field35)(nil), + (*TwoOneofs_SubMessage2)(nil), + } +} + +type CustomOneof struct { + // Types that are valid to be assigned to Custom: + // *CustomOneof_Stringy + // *CustomOneof_CustomType + // *CustomOneof_CastType + // *CustomOneof_MyCustomName + Custom isCustomOneof_Custom `protobuf_oneof:"custom"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CustomOneof) Reset() { *m = CustomOneof{} } +func (*CustomOneof) ProtoMessage() {} +func (*CustomOneof) Descriptor() ([]byte, []int) { + return fileDescriptor_9eef12518f7c4f58, []int{3} +} +func (m *CustomOneof) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CustomOneof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CustomOneof.Marshal(b, m, deterministic) +} +func (m *CustomOneof) XXX_Merge(src proto.Message) { + xxx_messageInfo_CustomOneof.Merge(m, src) +} +func (m *CustomOneof) XXX_Size() int { + return xxx_messageInfo_CustomOneof.Size(m) +} +func (m *CustomOneof) XXX_DiscardUnknown() { + xxx_messageInfo_CustomOneof.DiscardUnknown(m) +} + +var xxx_messageInfo_CustomOneof proto.InternalMessageInfo + +type isCustomOneof_Custom interface { + isCustomOneof_Custom() + Equal(interface{}) bool + VerboseEqual(interface{}) error + Size() int + Compare(interface{}) int +} + +type CustomOneof_Stringy struct { + Stringy string `protobuf:"bytes,34,opt,name=Stringy,oneof" json:"Stringy,omitempty"` +} +type CustomOneof_CustomType struct { + CustomType github_com_gogo_protobuf_test_custom.Uint128 `protobuf:"bytes,35,opt,name=CustomType,oneof,customtype=github.com/gogo/protobuf/test/custom.Uint128" json:"CustomType,omitempty"` +} +type CustomOneof_CastType struct { + CastType github_com_gogo_protobuf_test_casttype.MyUint64Type `protobuf:"varint,36,opt,name=CastType,oneof,casttype=github.com/gogo/protobuf/test/casttype.MyUint64Type" json:"CastType,omitempty"` +} +type CustomOneof_MyCustomName struct { + MyCustomName int64 `protobuf:"varint,37,opt,name=CustomName,oneof" json:"CustomName,omitempty"` +} + +func (*CustomOneof_Stringy) isCustomOneof_Custom() {} +func (*CustomOneof_CustomType) isCustomOneof_Custom() {} +func (*CustomOneof_CastType) isCustomOneof_Custom() {} +func (*CustomOneof_MyCustomName) isCustomOneof_Custom() {} + +func (m *CustomOneof) GetCustom() isCustomOneof_Custom { + if m != nil { + return m.Custom + } + return nil +} + +func (m *CustomOneof) GetStringy() string { + if x, ok := m.GetCustom().(*CustomOneof_Stringy); ok { + return x.Stringy + } + return "" +} + +func (m *CustomOneof) GetCastType() github_com_gogo_protobuf_test_casttype.MyUint64Type { + if x, ok := m.GetCustom().(*CustomOneof_CastType); ok { + return x.CastType + } + return 0 +} + +func (m *CustomOneof) GetMyCustomName() int64 { + if x, ok := m.GetCustom().(*CustomOneof_MyCustomName); ok { + return x.MyCustomName + } + return 0 +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*CustomOneof) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*CustomOneof_Stringy)(nil), + (*CustomOneof_CustomType)(nil), + (*CustomOneof_CastType)(nil), + (*CustomOneof_MyCustomName)(nil), + } +} + +func init() { + proto.RegisterType((*Subby)(nil), "one.Subby") + proto.RegisterType((*AllTypesOneOf)(nil), "one.AllTypesOneOf") + proto.RegisterType((*TwoOneofs)(nil), "one.TwoOneofs") + proto.RegisterType((*CustomOneof)(nil), "one.CustomOneof") +} + +func init() { proto.RegisterFile("combos/unmarshaler/one.proto", fileDescriptor_9eef12518f7c4f58) } + +var fileDescriptor_9eef12518f7c4f58 = []byte{ + // 606 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0xd3, 0xbf, 0x4f, 0x1b, 0x3f, + 0x14, 0x00, 0x70, 0x3f, 0x42, 0x42, 0x70, 0xc2, 0x97, 0x7c, 0x6f, 0x72, 0x51, 0x65, 0xac, 0xb4, + 0x95, 0x3c, 0x94, 0x84, 0x5c, 0x12, 0x7e, 0x8c, 0x3d, 0xa4, 0x2a, 0x0b, 0x45, 0x3a, 0x60, 0x46, + 0x39, 0x6a, 0x42, 0xa4, 0xe4, 0x8c, 0xe2, 0x3b, 0xa1, 0x6c, 0xfc, 0x0d, 0xfd, 0x2b, 0x18, 0x3b, + 0xf6, 0x4f, 0x60, 0xcc, 0x58, 0x75, 0x88, 0xb8, 0x63, 0xe9, 0xc8, 0x88, 0x3a, 0x55, 0xbe, 0x23, + 0x76, 0xa5, 0xaa, 0xea, 0xd2, 0x29, 0xf7, 0xde, 0xe7, 0xfc, 0xf2, 0xde, 0xd9, 0xc6, 0x2f, 0xcf, + 0xe5, 0x38, 0x90, 0xaa, 0x19, 0x87, 0xe3, 0xfe, 0x44, 0x5d, 0xf6, 0x47, 0x62, 0xd2, 0x94, 0xa1, + 0x68, 0x5c, 0x4d, 0x64, 0x24, 0x9d, 0x82, 0x0c, 0xc5, 0xc6, 0xd6, 0x60, 0x18, 0x5d, 0xc6, 0x41, + 0xe3, 0x5c, 0x8e, 0x9b, 0x03, 0x39, 0x90, 0xcd, 0xcc, 0x82, 0xf8, 0x22, 0x8b, 0xb2, 0x20, 0x7b, + 0xca, 0xd7, 0xd4, 0x5f, 0xe0, 0xe2, 0x71, 0x1c, 0x04, 0x53, 0xa7, 0x86, 0x0b, 0x2a, 0x0e, 0x08, + 0x30, 0xe0, 0xab, 0xbe, 0x7e, 0xac, 0xcf, 0x0b, 0x78, 0xed, 0xdd, 0x68, 0x74, 0x32, 0xbd, 0x12, + 0xea, 0x28, 0x14, 0x47, 0x17, 0x0e, 0xc1, 0xa5, 0xf7, 0x43, 0x31, 0xfa, 0xd8, 0xca, 0x5e, 0x83, + 0x1e, 0xf2, 0x9f, 0x63, 0x23, 0x2e, 0x59, 0x62, 0xc0, 0x97, 0x8c, 0xb8, 0x46, 0xda, 0xa4, 0xc0, + 0x80, 0x17, 0x8d, 0xb4, 0x8d, 0x74, 0xc8, 0x32, 0x03, 0x5e, 0x30, 0xd2, 0x31, 0xd2, 0x25, 0x45, + 0x06, 0x7c, 0xcd, 0x48, 0xd7, 0xc8, 0x0e, 0x29, 0x31, 0xe0, 0xcb, 0x46, 0x76, 0x8c, 0xec, 0x92, + 0x15, 0x06, 0xfc, 0x7f, 0x23, 0xbb, 0x46, 0xf6, 0x48, 0x99, 0x01, 0x77, 0x8c, 0xec, 0x19, 0xd9, + 0x27, 0xab, 0x0c, 0xf8, 0x8a, 0x91, 0x7d, 0x67, 0x03, 0xaf, 0xe4, 0x93, 0x6d, 0x13, 0xcc, 0x80, + 0xaf, 0xf7, 0x90, 0xbf, 0x48, 0x58, 0x6b, 0x91, 0x0a, 0x03, 0x5e, 0xb2, 0xd6, 0xb2, 0xe6, 0x92, + 0x2a, 0x03, 0x5e, 0xb3, 0xe6, 0x5a, 0x6b, 0x93, 0x35, 0x06, 0xbc, 0x6c, 0xad, 0x6d, 0xad, 0x43, + 0xfe, 0xd3, 0x3b, 0x60, 0xad, 0x63, 0xad, 0x4b, 0xd6, 0x19, 0xf0, 0xaa, 0xb5, 0xae, 0xb3, 0x85, + 0x2b, 0x2a, 0x0e, 0xce, 0xc6, 0x42, 0xa9, 0xfe, 0x40, 0x90, 0x1a, 0x03, 0x5e, 0x71, 0x71, 0x43, + 0x9f, 0x89, 0x6c, 0x5b, 0x7b, 0xc8, 0xc7, 0x2a, 0x0e, 0x0e, 0x73, 0xf7, 0xaa, 0x18, 0x47, 0x42, + 0x45, 0x67, 0x32, 0x14, 0xf2, 0xa2, 0x3e, 0x03, 0xbc, 0x7a, 0x72, 0x2d, 0x8f, 0x74, 0xa0, 0xfe, + 0xf1, 0xe6, 0x2e, 0x9a, 0x6e, 0x77, 0x48, 0x3d, 0x1b, 0x08, 0xfc, 0x45, 0xc2, 0x5a, 0x97, 0xbc, + 0xca, 0x06, 0x32, 0xd6, 0x75, 0x9a, 0xb8, 0xfa, 0xcb, 0x40, 0x2e, 0x79, 0xfd, 0xdb, 0x44, 0xe0, + 0x57, 0xec, 0x44, 0xae, 0x57, 0xc4, 0xfa, 0xd8, 0xeb, 0x9f, 0xe8, 0x5a, 0xd6, 0x3f, 0x2d, 0xe1, + 0xca, 0x41, 0xac, 0x22, 0x39, 0xce, 0xa6, 0xd2, 0x7f, 0x75, 0x1c, 0x4d, 0x86, 0xe1, 0x60, 0xfa, + 0xdc, 0x06, 0xf2, 0x17, 0x09, 0xc7, 0xc7, 0x38, 0x7f, 0x55, 0x9f, 0xf0, 0xbc, 0x13, 0x6f, 0xfb, + 0xdb, 0x7c, 0xf3, 0xed, 0x1f, 0x6f, 0x90, 0xfe, 0x76, 0xcd, 0xf3, 0x6c, 0x4d, 0xe3, 0x74, 0x18, + 0x46, 0x2d, 0x77, 0x4f, 0x7f, 0x60, 0x5b, 0xc5, 0x39, 0xc5, 0xe5, 0x83, 0xbe, 0x8a, 0xb2, 0x8a, + 0xba, 0xf5, 0x65, 0x6f, 0xf7, 0xc7, 0x7c, 0xb3, 0xfd, 0x97, 0x8a, 0x7d, 0x15, 0x45, 0xd3, 0x2b, + 0xd1, 0x38, 0x9c, 0xea, 0xaa, 0x3b, 0x1d, 0xbd, 0xbc, 0x87, 0x7c, 0x53, 0xca, 0x71, 0x17, 0xad, + 0x7e, 0xe8, 0x8f, 0x05, 0x79, 0xa3, 0xaf, 0x8b, 0x57, 0x4b, 0xe7, 0x9b, 0xd5, 0xc3, 0xa9, 0xcd, + 0xdb, 0x56, 0x74, 0xe4, 0x95, 0x71, 0x29, 0x6f, 0xd5, 0xeb, 0xdd, 0x25, 0x14, 0xcd, 0x12, 0x8a, + 0xbe, 0x26, 0x14, 0xdd, 0x27, 0x14, 0x1e, 0x13, 0x0a, 0x4f, 0x09, 0x85, 0x9b, 0x94, 0xc2, 0x6d, + 0x4a, 0xe1, 0x73, 0x4a, 0xe1, 0x4b, 0x4a, 0xe1, 0x2e, 0xa5, 0x68, 0x96, 0x52, 0xb8, 0x4f, 0x29, + 0x7c, 0x4f, 0x29, 0x7a, 0x4c, 0x29, 0x3c, 0xa5, 0x14, 0xdd, 0x3c, 0x50, 0x74, 0xfb, 0x40, 0xe1, + 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf7, 0xcb, 0x68, 0xec, 0x80, 0x04, 0x00, 0x00, +} + +func (this *Subby) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Subby) + if !ok { + that2, ok := that.(Subby) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Sub != nil && that1.Sub != nil { + if *this.Sub != *that1.Sub { + if *this.Sub < *that1.Sub { + return -1 + } + return 1 + } + } else if this.Sub != nil { + return 1 + } else if that1.Sub != nil { + return -1 + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf) + if !ok { + that2, ok := that.(AllTypesOneOf) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.TestOneof == nil { + if this.TestOneof != nil { + return 1 + } + } else if this.TestOneof == nil { + return -1 + } else { + thisType := -1 + switch this.TestOneof.(type) { + case *AllTypesOneOf_Field1: + thisType = 0 + case *AllTypesOneOf_Field2: + thisType = 1 + case *AllTypesOneOf_Field3: + thisType = 2 + case *AllTypesOneOf_Field4: + thisType = 3 + case *AllTypesOneOf_Field5: + thisType = 4 + case *AllTypesOneOf_Field6: + thisType = 5 + case *AllTypesOneOf_Field7: + thisType = 6 + case *AllTypesOneOf_Field8: + thisType = 7 + case *AllTypesOneOf_Field9: + thisType = 8 + case *AllTypesOneOf_Field10: + thisType = 9 + case *AllTypesOneOf_Field11: + thisType = 10 + case *AllTypesOneOf_Field12: + thisType = 11 + case *AllTypesOneOf_Field13: + thisType = 12 + case *AllTypesOneOf_Field14: + thisType = 13 + case *AllTypesOneOf_Field15: + thisType = 14 + case *AllTypesOneOf_SubMessage: + thisType = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.TestOneof)) + } + that1Type := -1 + switch that1.TestOneof.(type) { + case *AllTypesOneOf_Field1: + that1Type = 0 + case *AllTypesOneOf_Field2: + that1Type = 1 + case *AllTypesOneOf_Field3: + that1Type = 2 + case *AllTypesOneOf_Field4: + that1Type = 3 + case *AllTypesOneOf_Field5: + that1Type = 4 + case *AllTypesOneOf_Field6: + that1Type = 5 + case *AllTypesOneOf_Field7: + that1Type = 6 + case *AllTypesOneOf_Field8: + that1Type = 7 + case *AllTypesOneOf_Field9: + that1Type = 8 + case *AllTypesOneOf_Field10: + that1Type = 9 + case *AllTypesOneOf_Field11: + that1Type = 10 + case *AllTypesOneOf_Field12: + that1Type = 11 + case *AllTypesOneOf_Field13: + that1Type = 12 + case *AllTypesOneOf_Field14: + that1Type = 13 + case *AllTypesOneOf_Field15: + that1Type = 14 + case *AllTypesOneOf_SubMessage: + that1Type = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.TestOneof)) + } + if thisType == that1Type { + if c := this.TestOneof.Compare(that1.TestOneof); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field1) + if !ok { + that2, ok := that.(AllTypesOneOf_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field2) + if !ok { + that2, ok := that.(AllTypesOneOf_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field3) + if !ok { + that2, ok := that.(AllTypesOneOf_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field4) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field4) + if !ok { + that2, ok := that.(AllTypesOneOf_Field4) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field4 != that1.Field4 { + if this.Field4 < that1.Field4 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field5) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field5) + if !ok { + that2, ok := that.(AllTypesOneOf_Field5) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field5 != that1.Field5 { + if this.Field5 < that1.Field5 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field6) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field6) + if !ok { + that2, ok := that.(AllTypesOneOf_Field6) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field6 != that1.Field6 { + if this.Field6 < that1.Field6 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field7) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field7) + if !ok { + that2, ok := that.(AllTypesOneOf_Field7) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field7 != that1.Field7 { + if this.Field7 < that1.Field7 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field8) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field8) + if !ok { + that2, ok := that.(AllTypesOneOf_Field8) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field8 != that1.Field8 { + if this.Field8 < that1.Field8 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field9) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field9) + if !ok { + that2, ok := that.(AllTypesOneOf_Field9) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field9 != that1.Field9 { + if this.Field9 < that1.Field9 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field10) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field10) + if !ok { + that2, ok := that.(AllTypesOneOf_Field10) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field10 != that1.Field10 { + if this.Field10 < that1.Field10 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field11) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field11) + if !ok { + that2, ok := that.(AllTypesOneOf_Field11) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field11 != that1.Field11 { + if this.Field11 < that1.Field11 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field12) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field12) + if !ok { + that2, ok := that.(AllTypesOneOf_Field12) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field12 != that1.Field12 { + if this.Field12 < that1.Field12 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field13) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field13) + if !ok { + that2, ok := that.(AllTypesOneOf_Field13) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field13 != that1.Field13 { + if !this.Field13 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field14) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field14) + if !ok { + that2, ok := that.(AllTypesOneOf_Field14) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field14 != that1.Field14 { + if this.Field14 < that1.Field14 { + return -1 + } + return 1 + } + return 0 +} +func (this *AllTypesOneOf_Field15) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_Field15) + if !ok { + that2, ok := that.(AllTypesOneOf_Field15) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field15, that1.Field15); c != 0 { + return c + } + return 0 +} +func (this *AllTypesOneOf_SubMessage) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*AllTypesOneOf_SubMessage) + if !ok { + that2, ok := that.(AllTypesOneOf_SubMessage) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage.Compare(that1.SubMessage); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs) + if !ok { + that2, ok := that.(TwoOneofs) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.One == nil { + if this.One != nil { + return 1 + } + } else if this.One == nil { + return -1 + } else { + thisType := -1 + switch this.One.(type) { + case *TwoOneofs_Field1: + thisType = 0 + case *TwoOneofs_Field2: + thisType = 1 + case *TwoOneofs_Field3: + thisType = 2 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.One)) + } + that1Type := -1 + switch that1.One.(type) { + case *TwoOneofs_Field1: + that1Type = 0 + case *TwoOneofs_Field2: + that1Type = 1 + case *TwoOneofs_Field3: + that1Type = 2 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.One)) + } + if thisType == that1Type { + if c := this.One.Compare(that1.One); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if that1.Two == nil { + if this.Two != nil { + return 1 + } + } else if this.Two == nil { + return -1 + } else { + thisType := -1 + switch this.Two.(type) { + case *TwoOneofs_Field34: + thisType = 3 + case *TwoOneofs_Field35: + thisType = 4 + case *TwoOneofs_SubMessage2: + thisType = 5 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Two)) + } + that1Type := -1 + switch that1.Two.(type) { + case *TwoOneofs_Field34: + that1Type = 3 + case *TwoOneofs_Field35: + that1Type = 4 + case *TwoOneofs_SubMessage2: + that1Type = 5 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Two)) + } + if thisType == that1Type { + if c := this.Two.Compare(that1.Two); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field1) + if !ok { + that2, ok := that.(TwoOneofs_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field2) + if !ok { + that2, ok := that.(TwoOneofs_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field3) + if !ok { + that2, ok := that.(TwoOneofs_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field34) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field34) + if !ok { + that2, ok := that.(TwoOneofs_Field34) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field34 != that1.Field34 { + if this.Field34 < that1.Field34 { + return -1 + } + return 1 + } + return 0 +} +func (this *TwoOneofs_Field35) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_Field35) + if !ok { + that2, ok := that.(TwoOneofs_Field35) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field35, that1.Field35); c != 0 { + return c + } + return 0 +} +func (this *TwoOneofs_SubMessage2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*TwoOneofs_SubMessage2) + if !ok { + that2, ok := that.(TwoOneofs_SubMessage2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage2.Compare(that1.SubMessage2); c != 0 { + return c } return 0 } - -func (m *TwoOneofs) GetField34() string { - if x, ok := m.GetTwo().(*TwoOneofs_Field34); ok { - return x.Field34 +func (this *CustomOneof) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 } - return "" -} -func (m *TwoOneofs) GetField35() []byte { - if x, ok := m.GetTwo().(*TwoOneofs_Field35); ok { - return x.Field35 + that1, ok := that.(*CustomOneof) + if !ok { + that2, ok := that.(CustomOneof) + if ok { + that1 = &that2 + } else { + return 1 + } } - return nil -} - -func (m *TwoOneofs) GetSubMessage2() *Subby { - if x, ok := m.GetTwo().(*TwoOneofs_SubMessage2); ok { - return x.SubMessage2 + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 } - return nil -} - -// XXX_OneofFuncs is for the internal use of the proto package. -func (*TwoOneofs) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _TwoOneofs_OneofMarshaler, _TwoOneofs_OneofUnmarshaler, _TwoOneofs_OneofSizer, []interface{}{ - (*TwoOneofs_Field1)(nil), - (*TwoOneofs_Field2)(nil), - (*TwoOneofs_Field3)(nil), - (*TwoOneofs_Field34)(nil), - (*TwoOneofs_Field35)(nil), - (*TwoOneofs_SubMessage2)(nil), + if that1.Custom == nil { + if this.Custom != nil { + return 1 + } + } else if this.Custom == nil { + return -1 + } else { + thisType := -1 + switch this.Custom.(type) { + case *CustomOneof_Stringy: + thisType = 0 + case *CustomOneof_CustomType: + thisType = 1 + case *CustomOneof_CastType: + thisType = 2 + case *CustomOneof_MyCustomName: + thisType = 3 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Custom)) + } + that1Type := -1 + switch that1.Custom.(type) { + case *CustomOneof_Stringy: + that1Type = 0 + case *CustomOneof_CustomType: + that1Type = 1 + case *CustomOneof_CastType: + that1Type = 2 + case *CustomOneof_MyCustomName: + that1Type = 3 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Custom)) + } + if thisType == that1Type { + if c := this.Custom.Compare(that1.Custom); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } } -} - -func _TwoOneofs_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*TwoOneofs) - // one - switch x := m.One.(type) { - case *TwoOneofs_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *TwoOneofs_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *TwoOneofs_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case nil: - default: - return fmt.Errorf("TwoOneofs.One has unexpected type %T", x) + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c } - // two - switch x := m.Two.(type) { - case *TwoOneofs_Field34: - _ = b.EncodeVarint(34<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field34) - case *TwoOneofs_Field35: - _ = b.EncodeVarint(35<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field35) - case *TwoOneofs_SubMessage2: - _ = b.EncodeVarint(36<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage2); err != nil { - return err + return 0 +} +func (this *CustomOneof_Stringy) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 } - case nil: - default: - return fmt.Errorf("TwoOneofs.Two has unexpected type %T", x) + return 1 } - return nil -} -func _TwoOneofs_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*TwoOneofs) - switch tag { - case 1: // one.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.One = &TwoOneofs_Field1{math.Float64frombits(x)} - return true, err - case 2: // one.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.One = &TwoOneofs_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // one.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.One = &TwoOneofs_Field3{int32(x)} - return true, err - case 34: // two.Field34 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Two = &TwoOneofs_Field34{x} - return true, err - case 35: // two.Field35 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.Two = &TwoOneofs_Field35{x} - return true, err - case 36: // two.sub_message2 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.Two = &TwoOneofs_SubMessage2{msg} - return true, err - default: - return false, nil + that1, ok := that.(*CustomOneof_Stringy) + if !ok { + that2, ok := that.(CustomOneof_Stringy) + if ok { + that1 = &that2 + } else { + return 1 + } } -} - -func _TwoOneofs_OneofSizer(msg proto.Message) (n int) { - m := msg.(*TwoOneofs) - // one - switch x := m.One.(type) { - case *TwoOneofs_Field1: - n += 1 // tag and wire - n += 8 - case *TwoOneofs_Field2: - n += 1 // tag and wire - n += 4 - case *TwoOneofs_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 } - // two - switch x := m.Two.(type) { - case *TwoOneofs_Field34: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field34))) - n += len(x.Field34) - case *TwoOneofs_Field35: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field35))) - n += len(x.Field35) - case *TwoOneofs_SubMessage2: - s := proto.Size(x.SubMessage2) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + if this.Stringy != that1.Stringy { + if this.Stringy < that1.Stringy { + return -1 + } + return 1 } - return n -} - -type CustomOneof struct { - // Types that are valid to be assigned to Custom: - // *CustomOneof_Stringy - // *CustomOneof_CustomType - // *CustomOneof_CastType - // *CustomOneof_MyCustomName - Custom isCustomOneof_Custom `protobuf_oneof:"custom"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *CustomOneof) Reset() { *m = CustomOneof{} } -func (*CustomOneof) ProtoMessage() {} -func (*CustomOneof) Descriptor() ([]byte, []int) { - return fileDescriptor_9eef12518f7c4f58, []int{3} -} -func (m *CustomOneof) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *CustomOneof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CustomOneof.Marshal(b, m, deterministic) -} -func (m *CustomOneof) XXX_Merge(src proto.Message) { - xxx_messageInfo_CustomOneof.Merge(m, src) -} -func (m *CustomOneof) XXX_Size() int { - return xxx_messageInfo_CustomOneof.Size(m) -} -func (m *CustomOneof) XXX_DiscardUnknown() { - xxx_messageInfo_CustomOneof.DiscardUnknown(m) -} - -var xxx_messageInfo_CustomOneof proto.InternalMessageInfo - -type isCustomOneof_Custom interface { - isCustomOneof_Custom() - Equal(interface{}) bool - VerboseEqual(interface{}) error - Size() int -} - -type CustomOneof_Stringy struct { - Stringy string `protobuf:"bytes,34,opt,name=Stringy,oneof"` -} -type CustomOneof_CustomType struct { - CustomType github_com_gogo_protobuf_test_custom.Uint128 `protobuf:"bytes,35,opt,name=CustomType,oneof,customtype=github.com/gogo/protobuf/test/custom.Uint128"` -} -type CustomOneof_CastType struct { - CastType github_com_gogo_protobuf_test_casttype.MyUint64Type `protobuf:"varint,36,opt,name=CastType,oneof,casttype=github.com/gogo/protobuf/test/casttype.MyUint64Type"` -} -type CustomOneof_MyCustomName struct { - MyCustomName int64 `protobuf:"varint,37,opt,name=CustomName,oneof"` + return 0 } - -func (*CustomOneof_Stringy) isCustomOneof_Custom() {} -func (*CustomOneof_CustomType) isCustomOneof_Custom() {} -func (*CustomOneof_CastType) isCustomOneof_Custom() {} -func (*CustomOneof_MyCustomName) isCustomOneof_Custom() {} - -func (m *CustomOneof) GetCustom() isCustomOneof_Custom { - if m != nil { - return m.Custom +func (this *CustomOneof_CustomType) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 } - return nil -} -func (m *CustomOneof) GetStringy() string { - if x, ok := m.GetCustom().(*CustomOneof_Stringy); ok { - return x.Stringy + that1, ok := that.(*CustomOneof_CustomType) + if !ok { + that2, ok := that.(CustomOneof_CustomType) + if ok { + that1 = &that2 + } else { + return 1 + } } - return "" -} - -func (m *CustomOneof) GetCastType() github_com_gogo_protobuf_test_casttype.MyUint64Type { - if x, ok := m.GetCustom().(*CustomOneof_CastType); ok { - return x.CastType + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.CustomType.Compare(that1.CustomType); c != 0 { + return c } return 0 } +func (this *CustomOneof_CastType) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func (m *CustomOneof) GetMyCustomName() int64 { - if x, ok := m.GetCustom().(*CustomOneof_MyCustomName); ok { - return x.MyCustomName + that1, ok := that.(*CustomOneof_CastType) + if !ok { + that2, ok := that.(CustomOneof_CastType) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.CastType != that1.CastType { + if this.CastType < that1.CastType { + return -1 + } + return 1 } return 0 } - -// XXX_OneofFuncs is for the internal use of the proto package. -func (*CustomOneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _CustomOneof_OneofMarshaler, _CustomOneof_OneofUnmarshaler, _CustomOneof_OneofSizer, []interface{}{ - (*CustomOneof_Stringy)(nil), - (*CustomOneof_CustomType)(nil), - (*CustomOneof_CastType)(nil), - (*CustomOneof_MyCustomName)(nil), +func (this *CustomOneof_MyCustomName) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 } -} -func _CustomOneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*CustomOneof) - // custom - switch x := m.Custom.(type) { - case *CustomOneof_Stringy: - _ = b.EncodeVarint(34<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Stringy) - case *CustomOneof_CustomType: - _ = b.EncodeVarint(35<<3 | proto.WireBytes) - dAtA, err := x.CustomType.Marshal() - if err != nil { - return err - } - _ = b.EncodeRawBytes(dAtA) - case *CustomOneof_CastType: - _ = b.EncodeVarint(36<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.CastType)) - case *CustomOneof_MyCustomName: - _ = b.EncodeVarint(37<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.MyCustomName)) - case nil: - default: - return fmt.Errorf("CustomOneof.Custom has unexpected type %T", x) + that1, ok := that.(*CustomOneof_MyCustomName) + if !ok { + that2, ok := that.(CustomOneof_MyCustomName) + if ok { + that1 = &that2 + } else { + return 1 + } } - return nil -} - -func _CustomOneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*CustomOneof) - switch tag { - case 34: // custom.Stringy - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Custom = &CustomOneof_Stringy{x} - return true, err - case 35: // custom.CustomType - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - var cc github_com_gogo_protobuf_test_custom.Uint128 - c := &cc - err = c.Unmarshal(x) - m.Custom = &CustomOneof_CustomType{*c} - return true, err - case 36: // custom.CastType - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Custom = &CustomOneof_CastType{github_com_gogo_protobuf_test_casttype.MyUint64Type(x)} - return true, err - case 37: // custom.CustomName - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Custom = &CustomOneof_MyCustomName{int64(x)} - return true, err - default: - return false, nil + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 } -} - -func _CustomOneof_OneofSizer(msg proto.Message) (n int) { - m := msg.(*CustomOneof) - // custom - switch x := m.Custom.(type) { - case *CustomOneof_Stringy: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(len(x.Stringy))) - n += len(x.Stringy) - case *CustomOneof_CustomType: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.CustomType.Size())) - n += x.CustomType.Size() - case *CustomOneof_CastType: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.CastType)) - case *CustomOneof_MyCustomName: - n += 2 // tag and wire - n += proto.SizeVarint(uint64(x.MyCustomName)) - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + if this.MyCustomName != that1.MyCustomName { + if this.MyCustomName < that1.MyCustomName { + return -1 + } + return 1 } - return n -} - -func init() { - proto.RegisterType((*Subby)(nil), "one.Subby") - proto.RegisterType((*AllTypesOneOf)(nil), "one.AllTypesOneOf") - proto.RegisterType((*TwoOneofs)(nil), "one.TwoOneofs") - proto.RegisterType((*CustomOneof)(nil), "one.CustomOneof") -} - -func init() { proto.RegisterFile("combos/unmarshaler/one.proto", fileDescriptor_9eef12518f7c4f58) } - -var fileDescriptor_9eef12518f7c4f58 = []byte{ - // 602 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0xd3, 0x3f, 0x4f, 0x1b, 0x31, - 0x14, 0x00, 0x70, 0x3f, 0x42, 0x42, 0x70, 0x42, 0x49, 0x6f, 0x72, 0x51, 0x65, 0xac, 0xb4, 0x95, - 0x3c, 0x94, 0x84, 0x5c, 0x12, 0xfe, 0x8c, 0x3d, 0xaa, 0x2a, 0x0b, 0x45, 0x3a, 0x60, 0x46, 0x39, - 0x6a, 0x42, 0xa4, 0xe4, 0x8c, 0xe2, 0x3b, 0xa1, 0x6c, 0x7c, 0x86, 0x7e, 0x8a, 0x8e, 0x1d, 0xfb, - 0x11, 0x18, 0x33, 0x56, 0x1d, 0x22, 0xee, 0xba, 0x74, 0x64, 0x44, 0x9d, 0x2a, 0xdf, 0x11, 0xbb, - 0x52, 0x55, 0x75, 0xe9, 0x94, 0x7b, 0xef, 0x77, 0x7e, 0x79, 0xef, 0x6c, 0xe3, 0xe7, 0xe7, 0x72, - 0x1c, 0x48, 0xd5, 0x8c, 0xc3, 0x71, 0x7f, 0xa2, 0x2e, 0xfb, 0x23, 0x31, 0x69, 0xca, 0x50, 0x34, - 0xae, 0x26, 0x32, 0x92, 0x4e, 0x41, 0x86, 0x62, 0x63, 0x6b, 0x30, 0x8c, 0x2e, 0xe3, 0xa0, 0x71, - 0x2e, 0xc7, 0xcd, 0x81, 0x1c, 0xc8, 0x66, 0x66, 0x41, 0x7c, 0x91, 0x45, 0x59, 0x90, 0x3d, 0xe5, - 0x6b, 0xea, 0xcf, 0x70, 0xf1, 0x38, 0x0e, 0x82, 0xa9, 0x53, 0xc3, 0x05, 0x15, 0x07, 0x04, 0x18, - 0xf0, 0x55, 0x5f, 0x3f, 0xd6, 0xe7, 0x05, 0xbc, 0xf6, 0x66, 0x34, 0x3a, 0x99, 0x5e, 0x09, 0x75, - 0x14, 0x8a, 0xa3, 0x0b, 0x87, 0xe0, 0xd2, 0xbb, 0xa1, 0x18, 0x7d, 0x68, 0x65, 0xaf, 0x41, 0x0f, - 0xf9, 0x8f, 0xb1, 0x11, 0x97, 0x2c, 0x31, 0xe0, 0x4b, 0x46, 0x5c, 0x23, 0x6d, 0x52, 0x60, 0xc0, - 0x8b, 0x46, 0xda, 0x46, 0x3a, 0x64, 0x99, 0x01, 0x2f, 0x18, 0xe9, 0x18, 0xe9, 0x92, 0x22, 0x03, - 0xbe, 0x66, 0xa4, 0x6b, 0x64, 0x87, 0x94, 0x18, 0xf0, 0x65, 0x23, 0x3b, 0x46, 0x76, 0xc9, 0x0a, - 0x03, 0xfe, 0xd4, 0xc8, 0xae, 0x91, 0x3d, 0x52, 0x66, 0xc0, 0x1d, 0x23, 0x7b, 0x46, 0xf6, 0xc9, - 0x2a, 0x03, 0xbe, 0x62, 0x64, 0xdf, 0xd9, 0xc0, 0x2b, 0xf9, 0x64, 0xdb, 0x04, 0x33, 0xe0, 0xeb, - 0x3d, 0xe4, 0x2f, 0x12, 0xd6, 0x5a, 0xa4, 0xc2, 0x80, 0x97, 0xac, 0xb5, 0xac, 0xb9, 0xa4, 0xca, - 0x80, 0xd7, 0xac, 0xb9, 0xd6, 0xda, 0x64, 0x8d, 0x01, 0x2f, 0x5b, 0x6b, 0x5b, 0xeb, 0x90, 0x27, - 0x7a, 0x07, 0xac, 0x75, 0xac, 0x75, 0xc9, 0x3a, 0x03, 0x5e, 0xb5, 0xd6, 0x75, 0xb6, 0x70, 0x45, - 0xc5, 0xc1, 0xd9, 0x58, 0x28, 0xd5, 0x1f, 0x08, 0x52, 0x63, 0xc0, 0x2b, 0x2e, 0x6e, 0xe8, 0x33, - 0x91, 0x6d, 0x6b, 0x0f, 0xf9, 0x58, 0xc5, 0xc1, 0x61, 0xee, 0x5e, 0x15, 0xe3, 0x48, 0xa8, 0xe8, - 0x4c, 0x86, 0x42, 0x5e, 0xd4, 0x67, 0x80, 0x57, 0x4f, 0xae, 0xe5, 0x91, 0x0e, 0xd4, 0x7f, 0xde, - 0xdc, 0x45, 0xd3, 0xed, 0x0e, 0xa9, 0x67, 0x03, 0x81, 0xbf, 0x48, 0x58, 0xeb, 0x92, 0x17, 0xd9, - 0x40, 0xc6, 0xba, 0x4e, 0x13, 0x57, 0x7f, 0x1b, 0xc8, 0x25, 0x2f, 0xff, 0x98, 0x08, 0xfc, 0x8a, - 0x9d, 0xc8, 0xf5, 0x8a, 0x58, 0x1f, 0x7b, 0xfd, 0x13, 0x5d, 0xcb, 0xfa, 0xc7, 0x25, 0x5c, 0x39, - 0x88, 0x55, 0x24, 0xc7, 0xd9, 0x54, 0xfa, 0xaf, 0x8e, 0xa3, 0xc9, 0x30, 0x1c, 0x4c, 0x1f, 0xdb, - 0x40, 0xfe, 0x22, 0xe1, 0xf8, 0x18, 0xe7, 0xaf, 0xea, 0x13, 0x9e, 0x77, 0xe2, 0x6d, 0x7f, 0x9b, - 0x6f, 0xbe, 0xfe, 0xeb, 0x0d, 0xd2, 0xdf, 0xae, 0x79, 0x9e, 0xad, 0x69, 0x9c, 0x0e, 0xc3, 0xa8, - 0xe5, 0xee, 0xe9, 0x0f, 0x6c, 0xab, 0x38, 0xa7, 0xb8, 0x7c, 0xd0, 0x57, 0x51, 0x56, 0x51, 0xb7, - 0xbe, 0xec, 0xed, 0xfe, 0x9c, 0x6f, 0xb6, 0xff, 0x51, 0xb1, 0xaf, 0xa2, 0x68, 0x7a, 0x25, 0x1a, - 0x87, 0x53, 0x5d, 0x75, 0xa7, 0xa3, 0x97, 0xf7, 0x90, 0x6f, 0x4a, 0x39, 0xee, 0xa2, 0xd5, 0xf7, - 0xfd, 0xb1, 0x20, 0xaf, 0xf4, 0x75, 0xf1, 0x6a, 0xe9, 0x7c, 0xb3, 0x7a, 0x38, 0xb5, 0x79, 0xdb, - 0x8a, 0x8e, 0xbc, 0x32, 0x2e, 0xe5, 0xad, 0x7a, 0x6f, 0x6f, 0x13, 0x8a, 0x66, 0x09, 0x45, 0x5f, - 0x13, 0x8a, 0xee, 0x12, 0x0a, 0xf7, 0x09, 0x85, 0x87, 0x84, 0xc2, 0x4d, 0x4a, 0xe1, 0x53, 0x4a, - 0xe1, 0x73, 0x4a, 0xe1, 0x4b, 0x4a, 0xe1, 0x36, 0xa5, 0x68, 0x96, 0x52, 0xb8, 0x4b, 0x29, 0xfc, - 0x48, 0x29, 0xba, 0x4f, 0x29, 0x3c, 0xa4, 0x14, 0xdd, 0x7c, 0xa7, 0xe8, 0x57, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xdd, 0x1c, 0x58, 0x6c, 0x7c, 0x04, 0x00, 0x00, + return 0 } - func (this *Subby) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { return OneDescription() } @@ -1103,276 +1824,276 @@ func OneDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 4295 bytes of a gzipped FileDescriptorSet + // 4299 bytes of a gzipped FileDescriptorSet 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0x1b, 0xe7, - 0x75, 0xe6, 0xe2, 0x42, 0x02, 0x07, 0x20, 0xb8, 0x5c, 0xd2, 0x32, 0x44, 0xdb, 0x90, 0x04, 0xdb, - 0x31, 0x7d, 0x23, 0x6d, 0x8a, 0xd4, 0x05, 0x6a, 0xe2, 0x82, 0x24, 0x44, 0xd1, 0x25, 0x09, 0x66, - 0x41, 0xc6, 0x97, 0x4c, 0x67, 0x67, 0xb9, 0xf8, 0x09, 0xae, 0xb4, 0xd8, 0xdd, 0xec, 0x2e, 0x24, - 0x43, 0xd3, 0x07, 0x75, 0xdc, 0xcb, 0x64, 0x7a, 0x4f, 0x3b, 0xd3, 0xc4, 0x75, 0xdc, 0x26, 0x9d, - 0xc6, 0x69, 0x7a, 0x4b, 0x7a, 0x49, 0x93, 0xf4, 0xa5, 0x2f, 0x69, 0xfd, 0xd4, 0x71, 0xde, 0x3a, - 0x9d, 0x8e, 0xc7, 0x62, 0x3c, 0xd3, 0xb4, 0x75, 0x5b, 0xb7, 0xd5, 0x83, 0xa7, 0xee, 0x43, 0xe7, - 0xbf, 0xed, 0x05, 0x00, 0xb5, 0x60, 0xa6, 0x76, 0x9e, 0xc4, 0x3d, 0xe7, 0x7c, 0xdf, 0x9e, 0xff, - 0xfc, 0xe7, 0x3f, 0xff, 0xf9, 0xff, 0x85, 0xe0, 0x8d, 0x0a, 0x9c, 0x6e, 0x59, 0x56, 0xcb, 0x40, - 0xf3, 0xb6, 0x63, 0x79, 0xd6, 0x5e, 0x67, 0x7f, 0xbe, 0x89, 0x5c, 0xcd, 0xd1, 0x6d, 0xcf, 0x72, - 0xe6, 0x88, 0x4c, 0x9a, 0xa0, 0x16, 0x73, 0xdc, 0xa2, 0xbc, 0x09, 0x93, 0x97, 0x75, 0x03, 0xad, - 0xfa, 0x86, 0x0d, 0xe4, 0x49, 0x17, 0x20, 0xb5, 0xaf, 0x1b, 0xa8, 0x28, 0x9c, 0x4e, 0xce, 0xe6, - 0x16, 0x1e, 0x9a, 0xeb, 0x01, 0xcd, 0x45, 0x11, 0xdb, 0x58, 0x2c, 0x13, 0x44, 0xf9, 0x9d, 0x14, - 0x4c, 0x0d, 0xd0, 0x4a, 0x12, 0xa4, 0x4c, 0xb5, 0x8d, 0x19, 0x85, 0xd9, 0xac, 0x4c, 0xfe, 0x96, - 0x8a, 0x30, 0x66, 0xab, 0xda, 0x35, 0xb5, 0x85, 0x8a, 0x09, 0x22, 0xe6, 0x8f, 0x52, 0x09, 0xa0, - 0x89, 0x6c, 0x64, 0x36, 0x91, 0xa9, 0x75, 0x8b, 0xc9, 0xd3, 0xc9, 0xd9, 0xac, 0x1c, 0x92, 0x48, - 0x8f, 0xc3, 0xa4, 0xdd, 0xd9, 0x33, 0x74, 0x4d, 0x09, 0x99, 0xc1, 0xe9, 0xe4, 0x6c, 0x5a, 0x16, - 0xa9, 0x62, 0x35, 0x30, 0x7e, 0x04, 0x26, 0x6e, 0x20, 0xf5, 0x5a, 0xd8, 0x34, 0x47, 0x4c, 0x0b, - 0x58, 0x1c, 0x32, 0x5c, 0x81, 0x7c, 0x1b, 0xb9, 0xae, 0xda, 0x42, 0x8a, 0xd7, 0xb5, 0x51, 0x31, - 0x45, 0x46, 0x7f, 0xba, 0x6f, 0xf4, 0xbd, 0x23, 0xcf, 0x31, 0xd4, 0x4e, 0xd7, 0x46, 0x52, 0x15, - 0xb2, 0xc8, 0xec, 0xb4, 0x29, 0x43, 0xfa, 0x88, 0xf8, 0xd5, 0xcc, 0x4e, 0xbb, 0x97, 0x25, 0x83, - 0x61, 0x8c, 0x62, 0xcc, 0x45, 0xce, 0x75, 0x5d, 0x43, 0xc5, 0x51, 0x42, 0xf0, 0x48, 0x1f, 0x41, - 0x83, 0xea, 0x7b, 0x39, 0x38, 0x4e, 0x5a, 0x81, 0x2c, 0x7a, 0xc9, 0x43, 0xa6, 0xab, 0x5b, 0x66, - 0x71, 0x8c, 0x90, 0x3c, 0x3c, 0x60, 0x16, 0x91, 0xd1, 0xec, 0xa5, 0x08, 0x70, 0xd2, 0x39, 0x18, - 0xb3, 0x6c, 0x4f, 0xb7, 0x4c, 0xb7, 0x98, 0x39, 0x2d, 0xcc, 0xe6, 0x16, 0xee, 0x1f, 0x98, 0x08, - 0x75, 0x6a, 0x23, 0x73, 0x63, 0x69, 0x1d, 0x44, 0xd7, 0xea, 0x38, 0x1a, 0x52, 0x34, 0xab, 0x89, - 0x14, 0xdd, 0xdc, 0xb7, 0x8a, 0x59, 0x42, 0x70, 0xaa, 0x7f, 0x20, 0xc4, 0x70, 0xc5, 0x6a, 0xa2, - 0x75, 0x73, 0xdf, 0x92, 0x0b, 0x6e, 0xe4, 0x59, 0x3a, 0x01, 0xa3, 0x6e, 0xd7, 0xf4, 0xd4, 0x97, - 0x8a, 0x79, 0x92, 0x21, 0xec, 0xa9, 0xfc, 0xed, 0x51, 0x98, 0x18, 0x26, 0xc5, 0x2e, 0x41, 0x7a, - 0x1f, 0x8f, 0xb2, 0x98, 0x38, 0x4e, 0x0c, 0x28, 0x26, 0x1a, 0xc4, 0xd1, 0x1f, 0x32, 0x88, 0x55, - 0xc8, 0x99, 0xc8, 0xf5, 0x50, 0x93, 0x66, 0x44, 0x72, 0xc8, 0x9c, 0x02, 0x0a, 0xea, 0x4f, 0xa9, - 0xd4, 0x0f, 0x95, 0x52, 0xcf, 0xc3, 0x84, 0xef, 0x92, 0xe2, 0xa8, 0x66, 0x8b, 0xe7, 0xe6, 0x7c, - 0x9c, 0x27, 0x73, 0x35, 0x8e, 0x93, 0x31, 0x4c, 0x2e, 0xa0, 0xc8, 0xb3, 0xb4, 0x0a, 0x60, 0x99, - 0xc8, 0xda, 0x57, 0x9a, 0x48, 0x33, 0x8a, 0x99, 0x23, 0xa2, 0x54, 0xc7, 0x26, 0x7d, 0x51, 0xb2, - 0xa8, 0x54, 0x33, 0xa4, 0x8b, 0x41, 0xaa, 0x8d, 0x1d, 0x91, 0x29, 0x9b, 0x74, 0x91, 0xf5, 0x65, - 0xdb, 0x2e, 0x14, 0x1c, 0x84, 0xf3, 0x1e, 0x35, 0xd9, 0xc8, 0xb2, 0xc4, 0x89, 0xb9, 0xd8, 0x91, - 0xc9, 0x0c, 0x46, 0x07, 0x36, 0xee, 0x84, 0x1f, 0xa5, 0x07, 0xc1, 0x17, 0x28, 0x24, 0xad, 0x80, - 0x54, 0xa1, 0x3c, 0x17, 0x6e, 0xa9, 0x6d, 0x34, 0x73, 0x13, 0x0a, 0xd1, 0xf0, 0x48, 0xd3, 0x90, - 0x76, 0x3d, 0xd5, 0xf1, 0x48, 0x16, 0xa6, 0x65, 0xfa, 0x20, 0x89, 0x90, 0x44, 0x66, 0x93, 0x54, - 0xb9, 0xb4, 0x8c, 0xff, 0x94, 0x7e, 0x3c, 0x18, 0x70, 0x92, 0x0c, 0xf8, 0x63, 0xfd, 0x33, 0x1a, - 0x61, 0xee, 0x1d, 0xf7, 0xcc, 0x79, 0x18, 0x8f, 0x0c, 0x60, 0xd8, 0x57, 0x97, 0x7f, 0x0a, 0xee, - 0x19, 0x48, 0x2d, 0x3d, 0x0f, 0xd3, 0x1d, 0x53, 0x37, 0x3d, 0xe4, 0xd8, 0x0e, 0xc2, 0x19, 0x4b, - 0x5f, 0x55, 0xfc, 0xa7, 0xb1, 0x23, 0x72, 0x6e, 0x37, 0x6c, 0x4d, 0x59, 0xe4, 0xa9, 0x4e, 0xbf, - 0xf0, 0xb1, 0x6c, 0xe6, 0x07, 0x63, 0xe2, 0xad, 0x5b, 0xb7, 0x6e, 0x25, 0xca, 0x9f, 0x1f, 0x85, - 0xe9, 0x41, 0x6b, 0x66, 0xe0, 0xf2, 0x3d, 0x01, 0xa3, 0x66, 0xa7, 0xbd, 0x87, 0x1c, 0x12, 0xa4, - 0xb4, 0xcc, 0x9e, 0xa4, 0x2a, 0xa4, 0x0d, 0x75, 0x0f, 0x19, 0xc5, 0xd4, 0x69, 0x61, 0xb6, 0xb0, - 0xf0, 0xf8, 0x50, 0xab, 0x72, 0x6e, 0x03, 0x43, 0x64, 0x8a, 0x94, 0x3e, 0x01, 0x29, 0x56, 0xa2, - 0x31, 0xc3, 0x63, 0xc3, 0x31, 0xe0, 0xb5, 0x24, 0x13, 0x9c, 0x74, 0x1f, 0x64, 0xf1, 0xbf, 0x34, - 0x37, 0x46, 0x89, 0xcf, 0x19, 0x2c, 0xc0, 0x79, 0x21, 0xcd, 0x40, 0x86, 0x2c, 0x93, 0x26, 0xe2, - 0x5b, 0x9b, 0xff, 0x8c, 0x13, 0xab, 0x89, 0xf6, 0xd5, 0x8e, 0xe1, 0x29, 0xd7, 0x55, 0xa3, 0x83, - 0x48, 0xc2, 0x67, 0xe5, 0x3c, 0x13, 0x7e, 0x0a, 0xcb, 0xa4, 0x53, 0x90, 0xa3, 0xab, 0x4a, 0x37, - 0x9b, 0xe8, 0x25, 0x52, 0x3d, 0xd3, 0x32, 0x5d, 0x68, 0xeb, 0x58, 0x82, 0x5f, 0x7f, 0xd5, 0xb5, - 0x4c, 0x9e, 0x9a, 0xe4, 0x15, 0x58, 0x40, 0x5e, 0x7f, 0xbe, 0xb7, 0x70, 0x3f, 0x30, 0x78, 0x78, - 0xbd, 0x39, 0x55, 0xfe, 0x66, 0x02, 0x52, 0xa4, 0x5e, 0x4c, 0x40, 0x6e, 0xe7, 0x85, 0xed, 0x9a, - 0xb2, 0x5a, 0xdf, 0x5d, 0xde, 0xa8, 0x89, 0x82, 0x54, 0x00, 0x20, 0x82, 0xcb, 0x1b, 0xf5, 0xea, - 0x8e, 0x98, 0xf0, 0x9f, 0xd7, 0xb7, 0x76, 0xce, 0x2d, 0x8a, 0x49, 0x1f, 0xb0, 0x4b, 0x05, 0xa9, - 0xb0, 0xc1, 0xd9, 0x05, 0x31, 0x2d, 0x89, 0x90, 0xa7, 0x04, 0xeb, 0xcf, 0xd7, 0x56, 0xcf, 0x2d, - 0x8a, 0xa3, 0x51, 0xc9, 0xd9, 0x05, 0x71, 0x4c, 0x1a, 0x87, 0x2c, 0x91, 0x2c, 0xd7, 0xeb, 0x1b, - 0x62, 0xc6, 0xe7, 0x6c, 0xec, 0xc8, 0xeb, 0x5b, 0x6b, 0x62, 0xd6, 0xe7, 0x5c, 0x93, 0xeb, 0xbb, - 0xdb, 0x22, 0xf8, 0x0c, 0x9b, 0xb5, 0x46, 0xa3, 0xba, 0x56, 0x13, 0x73, 0xbe, 0xc5, 0xf2, 0x0b, - 0x3b, 0xb5, 0x86, 0x98, 0x8f, 0xb8, 0x75, 0x76, 0x41, 0x1c, 0xf7, 0x5f, 0x51, 0xdb, 0xda, 0xdd, - 0x14, 0x0b, 0xd2, 0x24, 0x8c, 0xd3, 0x57, 0x70, 0x27, 0x26, 0x7a, 0x44, 0xe7, 0x16, 0x45, 0x31, - 0x70, 0x84, 0xb2, 0x4c, 0x46, 0x04, 0xe7, 0x16, 0x45, 0xa9, 0xbc, 0x02, 0x69, 0x92, 0x5d, 0x92, - 0x04, 0x85, 0x8d, 0xea, 0x72, 0x6d, 0x43, 0xa9, 0x6f, 0xef, 0xac, 0xd7, 0xb7, 0xaa, 0x1b, 0xa2, - 0x10, 0xc8, 0xe4, 0xda, 0x27, 0x77, 0xd7, 0xe5, 0xda, 0xaa, 0x98, 0x08, 0xcb, 0xb6, 0x6b, 0xd5, - 0x9d, 0xda, 0xaa, 0x98, 0x2c, 0x6b, 0x30, 0x3d, 0xa8, 0x4e, 0x0e, 0x5c, 0x19, 0xa1, 0x29, 0x4e, - 0x1c, 0x31, 0xc5, 0x84, 0xab, 0x6f, 0x8a, 0xbf, 0x9f, 0x80, 0xa9, 0x01, 0x7b, 0xc5, 0xc0, 0x97, - 0x3c, 0x03, 0x69, 0x9a, 0xa2, 0x74, 0xf7, 0x7c, 0x74, 0xe0, 0xa6, 0x43, 0x12, 0xb6, 0x6f, 0x07, - 0x25, 0xb8, 0x70, 0x07, 0x91, 0x3c, 0xa2, 0x83, 0xc0, 0x14, 0x7d, 0x35, 0xfd, 0x27, 0xfb, 0x6a, - 0x3a, 0xdd, 0xf6, 0xce, 0x0d, 0xb3, 0xed, 0x11, 0xd9, 0xf1, 0x6a, 0x7b, 0x7a, 0x40, 0x6d, 0xbf, - 0x04, 0x93, 0x7d, 0x44, 0x43, 0xd7, 0xd8, 0x97, 0x05, 0x28, 0x1e, 0x15, 0x9c, 0x98, 0x4a, 0x97, - 0x88, 0x54, 0xba, 0x4b, 0xbd, 0x11, 0x3c, 0x73, 0xf4, 0x24, 0xf4, 0xcd, 0xf5, 0xeb, 0x02, 0x9c, - 0x18, 0xdc, 0x29, 0x0e, 0xf4, 0xe1, 0x13, 0x30, 0xda, 0x46, 0xde, 0x81, 0xc5, 0xbb, 0xa5, 0x8f, - 0x0d, 0xd8, 0x83, 0xb1, 0xba, 0x77, 0xb2, 0x19, 0x2a, 0xbc, 0x89, 0x27, 0x8f, 0x6a, 0xf7, 0xa8, - 0x37, 0x7d, 0x9e, 0x7e, 0x36, 0x01, 0xf7, 0x0c, 0x24, 0x1f, 0xe8, 0xe8, 0x03, 0x00, 0xba, 0x69, - 0x77, 0x3c, 0xda, 0x11, 0xd1, 0x02, 0x9b, 0x25, 0x12, 0x52, 0xbc, 0x70, 0xf1, 0xec, 0x78, 0xbe, - 0x3e, 0x49, 0xf4, 0x40, 0x45, 0xc4, 0xe0, 0x42, 0xe0, 0x68, 0x8a, 0x38, 0x5a, 0x3a, 0x62, 0xa4, - 0x7d, 0x89, 0xf9, 0x14, 0x88, 0x9a, 0xa1, 0x23, 0xd3, 0x53, 0x5c, 0xcf, 0x41, 0x6a, 0x5b, 0x37, - 0x5b, 0x64, 0x07, 0xc9, 0x54, 0xd2, 0xfb, 0xaa, 0xe1, 0x22, 0x79, 0x82, 0xaa, 0x1b, 0x5c, 0x8b, - 0x11, 0x24, 0x81, 0x9c, 0x10, 0x62, 0x34, 0x82, 0xa0, 0x6a, 0x1f, 0x51, 0xfe, 0xc5, 0x2c, 0xe4, - 0x42, 0x7d, 0xb5, 0x74, 0x06, 0xf2, 0x57, 0xd5, 0xeb, 0xaa, 0xc2, 0xcf, 0x4a, 0x34, 0x12, 0x39, - 0x2c, 0xdb, 0x66, 0xe7, 0xa5, 0xa7, 0x60, 0x9a, 0x98, 0x58, 0x1d, 0x0f, 0x39, 0x8a, 0x66, 0xa8, - 0xae, 0x4b, 0x82, 0x96, 0x21, 0xa6, 0x12, 0xd6, 0xd5, 0xb1, 0x6a, 0x85, 0x6b, 0xa4, 0x25, 0x98, - 0x22, 0x88, 0x76, 0xc7, 0xf0, 0x74, 0xdb, 0x40, 0x0a, 0x3e, 0xbd, 0xb9, 0x64, 0x27, 0xf1, 0x3d, - 0x9b, 0xc4, 0x16, 0x9b, 0xcc, 0x00, 0x7b, 0xe4, 0x4a, 0xab, 0xf0, 0x00, 0x81, 0xb5, 0x90, 0x89, - 0x1c, 0xd5, 0x43, 0x0a, 0xfa, 0x4c, 0x47, 0x35, 0x5c, 0x45, 0x35, 0x9b, 0xca, 0x81, 0xea, 0x1e, - 0x14, 0xa7, 0x31, 0xc1, 0x72, 0xa2, 0x28, 0xc8, 0x27, 0xb1, 0xe1, 0x1a, 0xb3, 0xab, 0x11, 0xb3, - 0xaa, 0xd9, 0xbc, 0xa2, 0xba, 0x07, 0x52, 0x05, 0x4e, 0x10, 0x16, 0xd7, 0x73, 0x74, 0xb3, 0xa5, - 0x68, 0x07, 0x48, 0xbb, 0xa6, 0x74, 0xbc, 0xfd, 0x0b, 0xc5, 0xfb, 0xc2, 0xef, 0x27, 0x1e, 0x36, - 0x88, 0xcd, 0x0a, 0x36, 0xd9, 0xf5, 0xf6, 0x2f, 0x48, 0x0d, 0xc8, 0xe3, 0xc9, 0x68, 0xeb, 0x37, - 0x91, 0xb2, 0x6f, 0x39, 0x64, 0x6b, 0x2c, 0x0c, 0x28, 0x4d, 0xa1, 0x08, 0xce, 0xd5, 0x19, 0x60, - 0xd3, 0x6a, 0xa2, 0x4a, 0xba, 0xb1, 0x5d, 0xab, 0xad, 0xca, 0x39, 0xce, 0x72, 0xd9, 0x72, 0x70, - 0x42, 0xb5, 0x2c, 0x3f, 0xc0, 0x39, 0x9a, 0x50, 0x2d, 0x8b, 0x87, 0x77, 0x09, 0xa6, 0x34, 0x8d, - 0x8e, 0x59, 0xd7, 0x14, 0x76, 0xc6, 0x72, 0x8b, 0x62, 0x24, 0x58, 0x9a, 0xb6, 0x46, 0x0d, 0x58, - 0x8e, 0xbb, 0xd2, 0x45, 0xb8, 0x27, 0x08, 0x56, 0x18, 0x38, 0xd9, 0x37, 0xca, 0x5e, 0xe8, 0x12, - 0x4c, 0xd9, 0xdd, 0x7e, 0xa0, 0x14, 0x79, 0xa3, 0xdd, 0xed, 0x85, 0x9d, 0x87, 0x69, 0xfb, 0xc0, - 0xee, 0xc7, 0x3d, 0x16, 0xc6, 0x49, 0xf6, 0x81, 0xdd, 0x0b, 0x7c, 0x98, 0x1c, 0xb8, 0x1d, 0xa4, - 0xa9, 0x1e, 0x6a, 0x16, 0xef, 0x0d, 0x9b, 0x87, 0x14, 0xd2, 0x3c, 0x88, 0x9a, 0xa6, 0x20, 0x53, - 0xdd, 0x33, 0x90, 0xa2, 0x3a, 0xc8, 0x54, 0xdd, 0xe2, 0xa9, 0xb0, 0x71, 0x41, 0xd3, 0x6a, 0x44, - 0x5b, 0x25, 0x4a, 0xe9, 0x31, 0x98, 0xb4, 0xf6, 0xae, 0x6a, 0x34, 0x25, 0x15, 0xdb, 0x41, 0xfb, - 0xfa, 0x4b, 0xc5, 0x87, 0x48, 0x7c, 0x27, 0xb0, 0x82, 0x24, 0xe4, 0x36, 0x11, 0x4b, 0x8f, 0x82, - 0xa8, 0xb9, 0x07, 0xaa, 0x63, 0x93, 0x9a, 0xec, 0xda, 0xaa, 0x86, 0x8a, 0x0f, 0x53, 0x53, 0x2a, - 0xdf, 0xe2, 0x62, 0xbc, 0x24, 0xdc, 0x1b, 0xfa, 0xbe, 0xc7, 0x19, 0x1f, 0xa1, 0x4b, 0x82, 0xc8, - 0x18, 0xdb, 0x2c, 0x88, 0x38, 0x14, 0x91, 0x17, 0xcf, 0x12, 0xb3, 0x82, 0x7d, 0x60, 0x87, 0xdf, - 0xfb, 0x20, 0x8c, 0x63, 0xcb, 0xe0, 0xa5, 0x8f, 0xd2, 0x86, 0xcc, 0x3e, 0x08, 0xbd, 0x71, 0x11, - 0x4e, 0x60, 0xa3, 0x36, 0xf2, 0xd4, 0xa6, 0xea, 0xa9, 0x21, 0xeb, 0x27, 0x88, 0x35, 0x8e, 0xfb, - 0x26, 0x53, 0x46, 0xfc, 0x74, 0x3a, 0x7b, 0x5d, 0x3f, 0xb3, 0x9e, 0xa4, 0x7e, 0x62, 0x19, 0xcf, - 0xad, 0x0f, 0xad, 0xe9, 0x2e, 0x57, 0x20, 0x1f, 0x4e, 0x7c, 0x29, 0x0b, 0x34, 0xf5, 0x45, 0x01, - 0x77, 0x41, 0x2b, 0xf5, 0x55, 0xdc, 0xbf, 0xbc, 0x58, 0x13, 0x13, 0xb8, 0x8f, 0xda, 0x58, 0xdf, - 0xa9, 0x29, 0xf2, 0xee, 0xd6, 0xce, 0xfa, 0x66, 0x4d, 0x4c, 0x86, 0x1b, 0xf6, 0xef, 0x26, 0xa0, - 0x10, 0x3d, 0x7b, 0x49, 0x3f, 0x06, 0xf7, 0xf2, 0x8b, 0x12, 0x17, 0x79, 0xca, 0x0d, 0xdd, 0x21, - 0x6b, 0xb1, 0xad, 0xd2, 0x7d, 0xd1, 0xcf, 0x86, 0x69, 0x66, 0xd5, 0x40, 0xde, 0x73, 0xba, 0x83, - 0x57, 0x5a, 0x5b, 0xf5, 0xa4, 0x0d, 0x38, 0x65, 0x5a, 0x8a, 0xeb, 0xa9, 0x66, 0x53, 0x75, 0x9a, - 0x4a, 0x70, 0x45, 0xa5, 0xa8, 0x9a, 0x86, 0x5c, 0xd7, 0xa2, 0x7b, 0xa0, 0xcf, 0x72, 0xbf, 0x69, - 0x35, 0x98, 0x71, 0xb0, 0x39, 0x54, 0x99, 0x69, 0x4f, 0xe6, 0x26, 0x8f, 0xca, 0xdc, 0xfb, 0x20, - 0xdb, 0x56, 0x6d, 0x05, 0x99, 0x9e, 0xd3, 0x25, 0x1d, 0x77, 0x46, 0xce, 0xb4, 0x55, 0xbb, 0x86, - 0x9f, 0x3f, 0x9a, 0x83, 0xcf, 0x3f, 0x26, 0x21, 0x1f, 0xee, 0xba, 0xf1, 0x21, 0x46, 0x23, 0x1b, - 0x94, 0x40, 0x4a, 0xd8, 0x83, 0x77, 0xed, 0xd1, 0xe7, 0x56, 0xf0, 0xce, 0x55, 0x19, 0xa5, 0xbd, - 0xb0, 0x4c, 0x91, 0xb8, 0x6b, 0xc0, 0xa9, 0x85, 0x68, 0xef, 0x91, 0x91, 0xd9, 0x93, 0xb4, 0x06, - 0xa3, 0x57, 0x5d, 0xc2, 0x3d, 0x4a, 0xb8, 0x1f, 0xba, 0x3b, 0xf7, 0xb3, 0x0d, 0x42, 0x9e, 0x7d, - 0xb6, 0xa1, 0x6c, 0xd5, 0xe5, 0xcd, 0xea, 0x86, 0xcc, 0xe0, 0xd2, 0x49, 0x48, 0x19, 0xea, 0xcd, - 0x6e, 0x74, 0x8f, 0x23, 0xa2, 0x61, 0x03, 0x7f, 0x12, 0x52, 0x37, 0x90, 0x7a, 0x2d, 0xba, 0xb3, - 0x10, 0xd1, 0x87, 0x98, 0xfa, 0xf3, 0x90, 0x26, 0xf1, 0x92, 0x00, 0x58, 0xc4, 0xc4, 0x11, 0x29, - 0x03, 0xa9, 0x95, 0xba, 0x8c, 0xd3, 0x5f, 0x84, 0x3c, 0x95, 0x2a, 0xdb, 0xeb, 0xb5, 0x95, 0x9a, - 0x98, 0x28, 0x2f, 0xc1, 0x28, 0x0d, 0x02, 0x5e, 0x1a, 0x7e, 0x18, 0xc4, 0x11, 0xf6, 0xc8, 0x38, - 0x04, 0xae, 0xdd, 0xdd, 0x5c, 0xae, 0xc9, 0x62, 0x22, 0x3c, 0xbd, 0x2e, 0xe4, 0xc3, 0x0d, 0xf7, - 0x47, 0x93, 0x53, 0xdf, 0x11, 0x20, 0x17, 0x6a, 0xa0, 0x71, 0xe7, 0xa3, 0x1a, 0x86, 0x75, 0x43, - 0x51, 0x0d, 0x5d, 0x75, 0x59, 0x52, 0x00, 0x11, 0x55, 0xb1, 0x64, 0xd8, 0x49, 0xfb, 0x48, 0x9c, - 0x7f, 0x4d, 0x00, 0xb1, 0xb7, 0x77, 0xed, 0x71, 0x50, 0xf8, 0x91, 0x3a, 0xf8, 0xaa, 0x00, 0x85, - 0x68, 0xc3, 0xda, 0xe3, 0xde, 0x99, 0x1f, 0xa9, 0x7b, 0x6f, 0x27, 0x60, 0x3c, 0xd2, 0xa6, 0x0e, - 0xeb, 0xdd, 0x67, 0x60, 0x52, 0x6f, 0xa2, 0xb6, 0x6d, 0x79, 0xc8, 0xd4, 0xba, 0x8a, 0x81, 0xae, - 0x23, 0xa3, 0x58, 0x26, 0x85, 0x62, 0xfe, 0xee, 0x8d, 0xf0, 0xdc, 0x7a, 0x80, 0xdb, 0xc0, 0xb0, - 0xca, 0xd4, 0xfa, 0x6a, 0x6d, 0x73, 0xbb, 0xbe, 0x53, 0xdb, 0x5a, 0x79, 0x41, 0xd9, 0xdd, 0xfa, - 0x89, 0xad, 0xfa, 0x73, 0x5b, 0xb2, 0xa8, 0xf7, 0x98, 0x7d, 0x88, 0x4b, 0x7d, 0x1b, 0xc4, 0x5e, - 0xa7, 0xa4, 0x7b, 0x61, 0x90, 0x5b, 0xe2, 0x88, 0x34, 0x05, 0x13, 0x5b, 0x75, 0xa5, 0xb1, 0xbe, - 0x5a, 0x53, 0x6a, 0x97, 0x2f, 0xd7, 0x56, 0x76, 0x1a, 0xf4, 0x6a, 0xc3, 0xb7, 0xde, 0x89, 0x2e, - 0xea, 0x57, 0x92, 0x30, 0x35, 0xc0, 0x13, 0xa9, 0xca, 0x0e, 0x25, 0xf4, 0x9c, 0xf4, 0xe4, 0x30, - 0xde, 0xcf, 0xe1, 0xae, 0x60, 0x5b, 0x75, 0x3c, 0x76, 0x86, 0x79, 0x14, 0x70, 0x94, 0x4c, 0x4f, - 0xdf, 0xd7, 0x91, 0xc3, 0x6e, 0x82, 0xe8, 0x49, 0x65, 0x22, 0x90, 0xd3, 0xcb, 0xa0, 0x27, 0x40, - 0xb2, 0x2d, 0x57, 0xf7, 0xf4, 0xeb, 0x48, 0xd1, 0x4d, 0x7e, 0x6d, 0x84, 0x4f, 0x2e, 0x29, 0x59, - 0xe4, 0x9a, 0x75, 0xd3, 0xf3, 0xad, 0x4d, 0xd4, 0x52, 0x7b, 0xac, 0x71, 0x01, 0x4f, 0xca, 0x22, - 0xd7, 0xf8, 0xd6, 0x67, 0x20, 0xdf, 0xb4, 0x3a, 0xb8, 0x9d, 0xa3, 0x76, 0x78, 0xbf, 0x10, 0xe4, - 0x1c, 0x95, 0xf9, 0x26, 0xac, 0x51, 0x0f, 0xee, 0xab, 0xf2, 0x72, 0x8e, 0xca, 0xa8, 0xc9, 0x23, - 0x30, 0xa1, 0xb6, 0x5a, 0x0e, 0x26, 0xe7, 0x44, 0xf4, 0xe8, 0x51, 0xf0, 0xc5, 0xc4, 0x70, 0xe6, - 0x59, 0xc8, 0xf0, 0x38, 0xe0, 0x2d, 0x19, 0x47, 0x42, 0xb1, 0xe9, 0x79, 0x3a, 0x31, 0x9b, 0x95, - 0x33, 0x26, 0x57, 0x9e, 0x81, 0xbc, 0xee, 0x2a, 0xc1, 0xf5, 0x7b, 0xe2, 0x74, 0x62, 0x36, 0x23, - 0xe7, 0x74, 0xd7, 0xbf, 0xba, 0x2c, 0xbf, 0x9e, 0x80, 0x42, 0xf4, 0xf3, 0x81, 0xb4, 0x0a, 0x19, - 0xc3, 0xd2, 0x54, 0x92, 0x5a, 0xf4, 0xdb, 0xd5, 0x6c, 0xcc, 0x17, 0x87, 0xb9, 0x0d, 0x66, 0x2f, - 0xfb, 0xc8, 0x99, 0xbf, 0x13, 0x20, 0xc3, 0xc5, 0xd2, 0x09, 0x48, 0xd9, 0xaa, 0x77, 0x40, 0xe8, - 0xd2, 0xcb, 0x09, 0x51, 0x90, 0xc9, 0x33, 0x96, 0xbb, 0xb6, 0x6a, 0x92, 0x14, 0x60, 0x72, 0xfc, - 0x8c, 0xe7, 0xd5, 0x40, 0x6a, 0x93, 0x9c, 0x6b, 0xac, 0x76, 0x1b, 0x99, 0x9e, 0xcb, 0xe7, 0x95, - 0xc9, 0x57, 0x98, 0x58, 0x7a, 0x1c, 0x26, 0x3d, 0x47, 0xd5, 0x8d, 0x88, 0x6d, 0x8a, 0xd8, 0x8a, - 0x5c, 0xe1, 0x1b, 0x57, 0xe0, 0x24, 0xe7, 0x6d, 0x22, 0x4f, 0xd5, 0x0e, 0x50, 0x33, 0x00, 0x8d, - 0x92, 0xfb, 0x8b, 0x7b, 0x99, 0xc1, 0x2a, 0xd3, 0x73, 0x6c, 0xf9, 0x7b, 0x02, 0x4c, 0xf2, 0x93, - 0x58, 0xd3, 0x0f, 0xd6, 0x26, 0x80, 0x6a, 0x9a, 0x96, 0x17, 0x0e, 0x57, 0x7f, 0x2a, 0xf7, 0xe1, - 0xe6, 0xaa, 0x3e, 0x48, 0x0e, 0x11, 0xcc, 0xb4, 0x01, 0x02, 0xcd, 0x91, 0x61, 0x3b, 0x05, 0x39, - 0xf6, 0x6d, 0x88, 0x7c, 0x60, 0xa4, 0x67, 0x77, 0xa0, 0x22, 0x7c, 0x64, 0x93, 0xa6, 0x21, 0xbd, - 0x87, 0x5a, 0xba, 0xc9, 0x6e, 0x7c, 0xe9, 0x03, 0xbf, 0x61, 0x49, 0xf9, 0x37, 0x2c, 0xcb, 0x9f, - 0x86, 0x29, 0xcd, 0x6a, 0xf7, 0xba, 0xbb, 0x2c, 0xf6, 0xdc, 0x1f, 0xb8, 0x57, 0x84, 0x17, 0x21, - 0x68, 0x31, 0xdf, 0x17, 0x84, 0x2f, 0x27, 0x92, 0x6b, 0xdb, 0xcb, 0x5f, 0x4b, 0xcc, 0xac, 0x51, - 0xe8, 0x36, 0x1f, 0xa9, 0x8c, 0xf6, 0x0d, 0xa4, 0x61, 0xef, 0xe1, 0x2b, 0x8f, 0xc3, 0x93, 0x2d, - 0xdd, 0x3b, 0xe8, 0xec, 0xcd, 0x69, 0x56, 0x7b, 0xbe, 0x65, 0xb5, 0xac, 0xe0, 0x9b, 0x2a, 0x7e, - 0x22, 0x0f, 0xe4, 0x2f, 0xf6, 0x5d, 0x35, 0xeb, 0x4b, 0x67, 0x62, 0x3f, 0xc2, 0x56, 0xb6, 0x60, - 0x8a, 0x19, 0x2b, 0xe4, 0xc3, 0x0e, 0x3d, 0x9e, 0x48, 0x77, 0xbd, 0x1c, 0x2b, 0x7e, 0xe3, 0x1d, - 0xb2, 0x5d, 0xcb, 0x93, 0x0c, 0x8a, 0x75, 0xf4, 0x04, 0x53, 0x91, 0xe1, 0x9e, 0x08, 0x1f, 0x5d, - 0x9a, 0xc8, 0x89, 0x61, 0xfc, 0x2e, 0x63, 0x9c, 0x0a, 0x31, 0x36, 0x18, 0xb4, 0xb2, 0x02, 0xe3, - 0xc7, 0xe1, 0xfa, 0x1b, 0xc6, 0x95, 0x47, 0x61, 0x92, 0x35, 0x98, 0x20, 0x24, 0x5a, 0xc7, 0xf5, - 0xac, 0x36, 0xa9, 0x7b, 0x77, 0xa7, 0xf9, 0xdb, 0x77, 0xe8, 0x5a, 0x29, 0x60, 0xd8, 0x8a, 0x8f, - 0xaa, 0x54, 0x80, 0x7c, 0xcb, 0x6a, 0x22, 0xcd, 0x88, 0x61, 0x78, 0x83, 0x39, 0xe2, 0xdb, 0x57, - 0x3e, 0x05, 0xd3, 0xf8, 0x6f, 0x52, 0x96, 0xc2, 0x9e, 0xc4, 0xdf, 0xa4, 0x15, 0xbf, 0xf7, 0x32, - 0x5d, 0x8e, 0x53, 0x3e, 0x41, 0xc8, 0xa7, 0xd0, 0x2c, 0xb6, 0x90, 0xe7, 0x21, 0xc7, 0x55, 0x54, - 0x63, 0x90, 0x7b, 0xa1, 0xab, 0x88, 0xe2, 0x17, 0xde, 0x8d, 0xce, 0xe2, 0x1a, 0x45, 0x56, 0x0d, - 0xa3, 0xb2, 0x0b, 0xf7, 0x0e, 0xc8, 0x8a, 0x21, 0x38, 0x5f, 0x61, 0x9c, 0xd3, 0x7d, 0x99, 0x81, - 0x69, 0xb7, 0x81, 0xcb, 0xfd, 0xb9, 0x1c, 0x82, 0xf3, 0xb7, 0x18, 0xa7, 0xc4, 0xb0, 0x7c, 0x4a, - 0x31, 0xe3, 0xb3, 0x30, 0x79, 0x1d, 0x39, 0x7b, 0x96, 0xcb, 0xae, 0x7f, 0x86, 0xa0, 0x7b, 0x95, - 0xd1, 0x4d, 0x30, 0x20, 0xb9, 0x0f, 0xc2, 0x5c, 0x17, 0x21, 0xb3, 0xaf, 0x6a, 0x68, 0x08, 0x8a, - 0x2f, 0x32, 0x8a, 0x31, 0x6c, 0x8f, 0xa1, 0x55, 0xc8, 0xb7, 0x2c, 0xb6, 0x33, 0xc5, 0xc3, 0x5f, - 0x63, 0xf0, 0x1c, 0xc7, 0x30, 0x0a, 0xdb, 0xb2, 0x3b, 0x06, 0xde, 0xb6, 0xe2, 0x29, 0x7e, 0x9b, - 0x53, 0x70, 0x0c, 0xa3, 0x38, 0x46, 0x58, 0x7f, 0x87, 0x53, 0xb8, 0xa1, 0x78, 0x3e, 0x03, 0x39, - 0xcb, 0x34, 0xba, 0x96, 0x39, 0x8c, 0x13, 0x5f, 0x62, 0x0c, 0xc0, 0x20, 0x98, 0xe0, 0x12, 0x64, - 0x87, 0x9d, 0x88, 0xdf, 0x7b, 0x97, 0x2f, 0x0f, 0x3e, 0x03, 0x6b, 0x30, 0xc1, 0x0b, 0x94, 0x6e, - 0x99, 0x43, 0x50, 0x7c, 0x85, 0x51, 0x14, 0x42, 0x30, 0x36, 0x0c, 0x0f, 0xb9, 0x5e, 0x0b, 0x0d, - 0x43, 0xf2, 0x3a, 0x1f, 0x06, 0x83, 0xb0, 0x50, 0xee, 0x21, 0x53, 0x3b, 0x18, 0x8e, 0xe1, 0xab, - 0x3c, 0x94, 0x1c, 0x83, 0x29, 0x56, 0x60, 0xbc, 0xad, 0x3a, 0xee, 0x81, 0x6a, 0x0c, 0x35, 0x1d, - 0xbf, 0xcf, 0x38, 0xf2, 0x3e, 0x88, 0x45, 0xa4, 0x63, 0x1e, 0x87, 0xe6, 0x6b, 0x3c, 0x22, 0x21, - 0x18, 0x5b, 0x7a, 0xae, 0x47, 0xee, 0xca, 0x8e, 0xc3, 0xf6, 0x07, 0x7c, 0xe9, 0x51, 0xec, 0x66, - 0x98, 0xf1, 0x12, 0x64, 0x5d, 0xfd, 0xe6, 0x50, 0x34, 0x7f, 0xc8, 0x67, 0x9a, 0x00, 0x30, 0xf8, - 0x05, 0x38, 0x39, 0x70, 0x9b, 0x18, 0x82, 0xec, 0x8f, 0x18, 0xd9, 0x89, 0x01, 0x5b, 0x05, 0x2b, - 0x09, 0xc7, 0xa5, 0xfc, 0x63, 0x5e, 0x12, 0x50, 0x0f, 0xd7, 0x36, 0x3e, 0x2b, 0xb8, 0xea, 0xfe, - 0xf1, 0xa2, 0xf6, 0x27, 0x3c, 0x6a, 0x14, 0x1b, 0x89, 0xda, 0x0e, 0x9c, 0x60, 0x8c, 0xc7, 0x9b, - 0xd7, 0xaf, 0xf3, 0xc2, 0x4a, 0xd1, 0xbb, 0xd1, 0xd9, 0xfd, 0x34, 0xcc, 0xf8, 0xe1, 0xe4, 0x4d, - 0xa9, 0xab, 0xb4, 0x55, 0x7b, 0x08, 0xe6, 0x6f, 0x30, 0x66, 0x5e, 0xf1, 0xfd, 0xae, 0xd6, 0xdd, - 0x54, 0x6d, 0x4c, 0xfe, 0x3c, 0x14, 0x39, 0x79, 0xc7, 0x74, 0x90, 0x66, 0xb5, 0x4c, 0xfd, 0x26, - 0x6a, 0x0e, 0x41, 0xfd, 0xa7, 0x3d, 0x53, 0xb5, 0x1b, 0x82, 0x63, 0xe6, 0x75, 0x10, 0xfd, 0x5e, - 0x45, 0xd1, 0xdb, 0xb6, 0xe5, 0x78, 0x31, 0x8c, 0x7f, 0xc6, 0x67, 0xca, 0xc7, 0xad, 0x13, 0x58, - 0xa5, 0x06, 0x05, 0xf2, 0x38, 0x6c, 0x4a, 0xfe, 0x39, 0x23, 0x1a, 0x0f, 0x50, 0xac, 0x70, 0x68, - 0x56, 0xdb, 0x56, 0x9d, 0x61, 0xea, 0xdf, 0x5f, 0xf0, 0xc2, 0xc1, 0x20, 0xac, 0x70, 0x78, 0x5d, - 0x1b, 0xe1, 0xdd, 0x7e, 0x08, 0x86, 0x6f, 0xf2, 0xc2, 0xc1, 0x31, 0x8c, 0x82, 0x37, 0x0c, 0x43, - 0x50, 0xfc, 0x25, 0xa7, 0xe0, 0x18, 0x4c, 0xf1, 0xc9, 0x60, 0xa3, 0x75, 0x50, 0x4b, 0x77, 0x3d, - 0x87, 0xb6, 0xc2, 0x77, 0xa7, 0xfa, 0xd6, 0xbb, 0xd1, 0x26, 0x4c, 0x0e, 0x41, 0x71, 0x25, 0x62, - 0x57, 0xa8, 0xe4, 0xa4, 0x14, 0xef, 0xd8, 0xb7, 0x79, 0x25, 0x0a, 0xc1, 0xb0, 0x6f, 0xa1, 0x0e, - 0x11, 0x87, 0x5d, 0xc3, 0xe7, 0x83, 0x21, 0xe8, 0xbe, 0xd3, 0xe3, 0x5c, 0x83, 0x63, 0x31, 0x67, - 0xa8, 0xff, 0xe9, 0x98, 0xd7, 0x50, 0x77, 0xa8, 0xec, 0xfc, 0xab, 0x9e, 0xfe, 0x67, 0x97, 0x22, - 0x69, 0x0d, 0x99, 0xe8, 0xe9, 0xa7, 0xa4, 0xb8, 0x5f, 0x01, 0x15, 0x7f, 0xfa, 0x0e, 0x1b, 0x6f, - 0xb4, 0x9d, 0xaa, 0x6c, 0xe0, 0x24, 0x8f, 0x36, 0x3d, 0xf1, 0x64, 0x2f, 0xdf, 0xf1, 0xf3, 0x3c, - 0xd2, 0xf3, 0x54, 0x2e, 0xc3, 0x78, 0xa4, 0xe1, 0x89, 0xa7, 0xfa, 0x19, 0x46, 0x95, 0x0f, 0xf7, - 0x3b, 0x95, 0x25, 0x48, 0xe1, 0xe6, 0x25, 0x1e, 0xfe, 0xb3, 0x0c, 0x4e, 0xcc, 0x2b, 0x1f, 0x87, - 0x0c, 0x6f, 0x5a, 0xe2, 0xa1, 0x3f, 0xc7, 0xa0, 0x3e, 0x04, 0xc3, 0x79, 0xc3, 0x12, 0x0f, 0xff, - 0x79, 0x0e, 0xe7, 0x10, 0x0c, 0x1f, 0x3e, 0x84, 0x7f, 0xfd, 0x0b, 0x29, 0xb6, 0xe9, 0xf0, 0xd8, - 0x5d, 0x82, 0x31, 0xd6, 0xa9, 0xc4, 0xa3, 0x3f, 0xcb, 0x5e, 0xce, 0x11, 0x95, 0xf3, 0x90, 0x1e, - 0x32, 0xe0, 0xbf, 0xc4, 0xa0, 0xd4, 0xbe, 0xb2, 0x02, 0xb9, 0x50, 0x77, 0x12, 0x0f, 0xff, 0x65, - 0x06, 0x0f, 0xa3, 0xb0, 0xeb, 0xac, 0x3b, 0x89, 0x27, 0xf8, 0x15, 0xee, 0x3a, 0x43, 0xe0, 0xb0, - 0xf1, 0xc6, 0x24, 0x1e, 0xfd, 0xab, 0x3c, 0xea, 0x1c, 0x52, 0x79, 0x06, 0xb2, 0xfe, 0x66, 0x13, - 0x8f, 0xff, 0x35, 0x86, 0x0f, 0x30, 0x38, 0x02, 0xa1, 0xcd, 0x2e, 0x9e, 0xe2, 0x73, 0x3c, 0x02, - 0x21, 0x14, 0x5e, 0x46, 0xbd, 0x0d, 0x4c, 0x3c, 0xd3, 0xaf, 0xf3, 0x65, 0xd4, 0xd3, 0xbf, 0xe0, - 0xd9, 0x24, 0x35, 0x3f, 0x9e, 0xe2, 0x37, 0xf8, 0x6c, 0x12, 0x7b, 0xec, 0x46, 0x6f, 0x47, 0x10, - 0xcf, 0xf1, 0x9b, 0xdc, 0x8d, 0x9e, 0x86, 0xa0, 0xb2, 0x0d, 0x52, 0x7f, 0x37, 0x10, 0xcf, 0xf7, - 0x79, 0xc6, 0x37, 0xd9, 0xd7, 0x0c, 0x54, 0x9e, 0x83, 0x13, 0x83, 0x3b, 0x81, 0x78, 0xd6, 0x2f, - 0xdc, 0xe9, 0x39, 0xbb, 0x85, 0x1b, 0x81, 0xca, 0x4e, 0xb0, 0xa5, 0x84, 0xbb, 0x80, 0x78, 0xda, - 0x57, 0xee, 0x44, 0x0b, 0x77, 0xb8, 0x09, 0xa8, 0x54, 0x01, 0x82, 0x0d, 0x38, 0x9e, 0xeb, 0x55, - 0xc6, 0x15, 0x02, 0xe1, 0xa5, 0xc1, 0xf6, 0xdf, 0x78, 0xfc, 0x17, 0xf9, 0xd2, 0x60, 0x08, 0xbc, - 0x34, 0xf8, 0xd6, 0x1b, 0x8f, 0x7e, 0x8d, 0x2f, 0x0d, 0x0e, 0xc1, 0x99, 0x1d, 0xda, 0xdd, 0xe2, - 0x19, 0xbe, 0xc4, 0x33, 0x3b, 0x84, 0xaa, 0x6c, 0xc1, 0x64, 0xdf, 0x86, 0x18, 0x4f, 0xf5, 0x65, - 0x46, 0x25, 0xf6, 0xee, 0x87, 0xe1, 0xcd, 0x8b, 0x6d, 0x86, 0xf1, 0x6c, 0xbf, 0xdb, 0xb3, 0x79, - 0xb1, 0xbd, 0xb0, 0x72, 0x09, 0x32, 0x66, 0xc7, 0x30, 0xf0, 0xe2, 0x91, 0xee, 0xfe, 0xcb, 0xbd, - 0xe2, 0x3f, 0x7f, 0xc0, 0xa2, 0xc3, 0x01, 0x95, 0x25, 0x48, 0xa3, 0xf6, 0x1e, 0x6a, 0xc6, 0x21, - 0xff, 0xe5, 0x03, 0x5e, 0x30, 0xb1, 0x75, 0xe5, 0x19, 0x00, 0x7a, 0x35, 0x42, 0x3e, 0xfb, 0xc5, - 0x60, 0xff, 0xf5, 0x03, 0xf6, 0x9b, 0x9a, 0x00, 0x12, 0x10, 0xd0, 0x5f, 0xe8, 0xdc, 0x9d, 0xe0, - 0xdd, 0x28, 0x01, 0x99, 0x91, 0x8b, 0x30, 0x76, 0xd5, 0xb5, 0x4c, 0x4f, 0x6d, 0xc5, 0xa1, 0xff, - 0x8d, 0xa1, 0xb9, 0x3d, 0x0e, 0x58, 0xdb, 0x72, 0x90, 0xa7, 0xb6, 0xdc, 0x38, 0xec, 0xbf, 0x33, - 0xac, 0x0f, 0xc0, 0x60, 0x4d, 0x75, 0xbd, 0x61, 0xc6, 0xfd, 0x1f, 0x1c, 0xcc, 0x01, 0xd8, 0x69, - 0xfc, 0xf7, 0x35, 0xd4, 0x8d, 0xc3, 0xbe, 0xc7, 0x9d, 0x66, 0xf6, 0x95, 0x8f, 0x43, 0x16, 0xff, - 0x49, 0x7f, 0x28, 0x17, 0x03, 0xfe, 0x4f, 0x06, 0x0e, 0x10, 0xf8, 0xcd, 0xae, 0xd7, 0xf4, 0xf4, - 0xf8, 0x60, 0xff, 0x17, 0x9b, 0x69, 0x6e, 0x5f, 0xa9, 0x42, 0xce, 0xf5, 0x9a, 0xcd, 0x0e, 0xeb, - 0x4f, 0x63, 0xe0, 0xff, 0xfd, 0x81, 0x7f, 0x65, 0xe1, 0x63, 0xf0, 0x6c, 0xdf, 0xb8, 0xe6, 0xd9, - 0x16, 0xf9, 0xcc, 0x11, 0xc7, 0x70, 0x87, 0x31, 0x84, 0x20, 0xcb, 0xb5, 0xc1, 0xd7, 0xb7, 0xb0, - 0x66, 0xad, 0x59, 0xf4, 0xe2, 0xf6, 0xc5, 0x72, 0xfc, 0x0d, 0x2c, 0xfc, 0x6f, 0x06, 0xee, 0xd7, - 0xac, 0xf6, 0x9e, 0xe5, 0xce, 0x87, 0x8a, 0xf9, 0xbc, 0x65, 0x32, 0x4e, 0x29, 0x69, 0x99, 0x68, - 0xe6, 0x78, 0x77, 0xb9, 0xe5, 0x93, 0x90, 0x6e, 0x74, 0xf6, 0xf6, 0xba, 0x92, 0x08, 0x49, 0xb7, - 0xb3, 0xc7, 0x7e, 0x70, 0x85, 0xff, 0x2c, 0xbf, 0x95, 0x84, 0xf1, 0xaa, 0x61, 0xec, 0x74, 0x6d, - 0xe4, 0xd6, 0x4d, 0x54, 0xdf, 0x97, 0x8a, 0x30, 0x4a, 0x06, 0xfb, 0x34, 0x31, 0x13, 0xae, 0x8c, - 0xc8, 0xec, 0xd9, 0xd7, 0x2c, 0x90, 0x5b, 0xee, 0x84, 0xaf, 0x59, 0xf0, 0x35, 0x67, 0xe9, 0x25, - 0xb7, 0xaf, 0x39, 0xeb, 0x6b, 0x16, 0xc9, 0x55, 0x77, 0xd2, 0xd7, 0x2c, 0xfa, 0x9a, 0x25, 0xf2, - 0x29, 0x67, 0xdc, 0xd7, 0x2c, 0xf9, 0x9a, 0x73, 0xe4, 0xe3, 0x4d, 0xca, 0xd7, 0x9c, 0xf3, 0x35, + 0x75, 0xe6, 0xe2, 0x42, 0x02, 0x07, 0x20, 0xb8, 0x5c, 0xd2, 0x12, 0x44, 0xdb, 0x90, 0x04, 0xdb, + 0x31, 0x7d, 0x23, 0x6d, 0x8a, 0xa4, 0x24, 0xa8, 0x89, 0x0b, 0x92, 0x10, 0x45, 0x97, 0x24, 0x98, + 0x05, 0x19, 0x5f, 0x32, 0x9d, 0x9d, 0xe5, 0xe2, 0x07, 0xb8, 0xd2, 0x62, 0x77, 0xb3, 0xbb, 0x90, + 0x0c, 0x4d, 0x1f, 0xd4, 0x71, 0x2f, 0x93, 0xe9, 0x3d, 0xed, 0x4c, 0x13, 0xd7, 0x71, 0x9b, 0x74, + 0x1a, 0xbb, 0xe9, 0x2d, 0xe9, 0x25, 0x4d, 0xd2, 0x97, 0xbe, 0xa4, 0xf5, 0x53, 0xc7, 0x79, 0xeb, + 0x74, 0x3a, 0x1e, 0x8b, 0xf6, 0x4c, 0xd3, 0xd6, 0x6d, 0xdd, 0x56, 0x0f, 0x9e, 0xfa, 0xa5, 0xf3, + 0xdf, 0x76, 0x17, 0x17, 0x6a, 0xc1, 0x4c, 0xec, 0x3c, 0x89, 0x7b, 0xce, 0xf9, 0xbe, 0x3d, 0xff, + 0xf9, 0xcf, 0x7f, 0xfe, 0xf3, 0xff, 0x0b, 0xc1, 0x1b, 0x25, 0x38, 0xd3, 0xb4, 0xac, 0xa6, 0x81, + 0xe6, 0x6d, 0xc7, 0xf2, 0xac, 0xfd, 0x76, 0x63, 0xbe, 0x8e, 0x5c, 0xcd, 0xd1, 0x6d, 0xcf, 0x72, + 0xe6, 0x88, 0x4c, 0x9a, 0xa0, 0x16, 0x73, 0xdc, 0xa2, 0xb8, 0x05, 0x93, 0x97, 0x75, 0x03, 0xad, + 0xf9, 0x86, 0x35, 0xe4, 0x49, 0x17, 0x20, 0xd1, 0xd0, 0x0d, 0x94, 0x17, 0xce, 0xc4, 0x67, 0x33, + 0x0b, 0x0f, 0xce, 0xf5, 0x80, 0xe6, 0xba, 0x11, 0x3b, 0x58, 0x2c, 0x13, 0x44, 0xf1, 0xdd, 0x04, + 0x4c, 0x0d, 0xd0, 0x4a, 0x12, 0x24, 0x4c, 0xb5, 0x85, 0x19, 0x85, 0xd9, 0xb4, 0x4c, 0xfe, 0x96, + 0xf2, 0x30, 0x66, 0xab, 0xda, 0x35, 0xb5, 0x89, 0xf2, 0x31, 0x22, 0xe6, 0x8f, 0x52, 0x01, 0xa0, + 0x8e, 0x6c, 0x64, 0xd6, 0x91, 0xa9, 0x75, 0xf2, 0xf1, 0x33, 0xf1, 0xd9, 0xb4, 0x1c, 0x92, 0x48, + 0x8f, 0xc1, 0xa4, 0xdd, 0xde, 0x37, 0x74, 0x4d, 0x09, 0x99, 0xc1, 0x99, 0xf8, 0x6c, 0x52, 0x16, + 0xa9, 0x62, 0x2d, 0x30, 0x7e, 0x18, 0x26, 0x6e, 0x20, 0xf5, 0x5a, 0xd8, 0x34, 0x43, 0x4c, 0x73, + 0x58, 0x1c, 0x32, 0x5c, 0x85, 0x6c, 0x0b, 0xb9, 0xae, 0xda, 0x44, 0x8a, 0xd7, 0xb1, 0x51, 0x3e, + 0x41, 0x46, 0x7f, 0xa6, 0x6f, 0xf4, 0xbd, 0x23, 0xcf, 0x30, 0xd4, 0x6e, 0xc7, 0x46, 0x52, 0x19, + 0xd2, 0xc8, 0x6c, 0xb7, 0x28, 0x43, 0xf2, 0x88, 0xf8, 0x55, 0xcc, 0x76, 0xab, 0x97, 0x25, 0x85, + 0x61, 0x8c, 0x62, 0xcc, 0x45, 0xce, 0x75, 0x5d, 0x43, 0xf9, 0x51, 0x42, 0xf0, 0x70, 0x1f, 0x41, + 0x8d, 0xea, 0x7b, 0x39, 0x38, 0x4e, 0x5a, 0x85, 0x34, 0x7a, 0xd1, 0x43, 0xa6, 0xab, 0x5b, 0x66, + 0x7e, 0x8c, 0x90, 0x3c, 0x34, 0x60, 0x16, 0x91, 0x51, 0xef, 0xa5, 0x08, 0x70, 0xd2, 0x32, 0x8c, + 0x59, 0xb6, 0xa7, 0x5b, 0xa6, 0x9b, 0x4f, 0x9d, 0x11, 0x66, 0x33, 0x0b, 0xf7, 0x0d, 0x4c, 0x84, + 0x2a, 0xb5, 0x91, 0xb9, 0xb1, 0xb4, 0x01, 0xa2, 0x6b, 0xb5, 0x1d, 0x0d, 0x29, 0x9a, 0x55, 0x47, + 0x8a, 0x6e, 0x36, 0xac, 0x7c, 0x9a, 0x10, 0x9c, 0xee, 0x1f, 0x08, 0x31, 0x5c, 0xb5, 0xea, 0x68, + 0xc3, 0x6c, 0x58, 0x72, 0xce, 0xed, 0x7a, 0x96, 0x4e, 0xc0, 0xa8, 0xdb, 0x31, 0x3d, 0xf5, 0xc5, + 0x7c, 0x96, 0x64, 0x08, 0x7b, 0x2a, 0x7e, 0x67, 0x14, 0x26, 0x86, 0x49, 0xb1, 0x4b, 0x90, 0x6c, + 0xe0, 0x51, 0xe6, 0x63, 0xc7, 0x89, 0x01, 0xc5, 0x74, 0x07, 0x71, 0xf4, 0x87, 0x0c, 0x62, 0x19, + 0x32, 0x26, 0x72, 0x3d, 0x54, 0xa7, 0x19, 0x11, 0x1f, 0x32, 0xa7, 0x80, 0x82, 0xfa, 0x53, 0x2a, + 0xf1, 0x43, 0xa5, 0xd4, 0x73, 0x30, 0xe1, 0xbb, 0xa4, 0x38, 0xaa, 0xd9, 0xe4, 0xb9, 0x39, 0x1f, + 0xe5, 0xc9, 0x5c, 0x85, 0xe3, 0x64, 0x0c, 0x93, 0x73, 0xa8, 0xeb, 0x59, 0x5a, 0x03, 0xb0, 0x4c, + 0x64, 0x35, 0x94, 0x3a, 0xd2, 0x8c, 0x7c, 0xea, 0x88, 0x28, 0x55, 0xb1, 0x49, 0x5f, 0x94, 0x2c, + 0x2a, 0xd5, 0x0c, 0xe9, 0x62, 0x90, 0x6a, 0x63, 0x47, 0x64, 0xca, 0x16, 0x5d, 0x64, 0x7d, 0xd9, + 0xb6, 0x07, 0x39, 0x07, 0xe1, 0xbc, 0x47, 0x75, 0x36, 0xb2, 0x34, 0x71, 0x62, 0x2e, 0x72, 0x64, + 0x32, 0x83, 0xd1, 0x81, 0x8d, 0x3b, 0xe1, 0x47, 0xe9, 0x01, 0xf0, 0x05, 0x0a, 0x49, 0x2b, 0x20, + 0x55, 0x28, 0xcb, 0x85, 0xdb, 0x6a, 0x0b, 0xcd, 0xdc, 0x84, 0x5c, 0x77, 0x78, 0xa4, 0x69, 0x48, + 0xba, 0x9e, 0xea, 0x78, 0x24, 0x0b, 0x93, 0x32, 0x7d, 0x90, 0x44, 0x88, 0x23, 0xb3, 0x4e, 0xaa, + 0x5c, 0x52, 0xc6, 0x7f, 0x4a, 0x3f, 0x19, 0x0c, 0x38, 0x4e, 0x06, 0xfc, 0x89, 0xfe, 0x19, 0xed, + 0x62, 0xee, 0x1d, 0xf7, 0xcc, 0x79, 0x18, 0xef, 0x1a, 0xc0, 0xb0, 0xaf, 0x2e, 0xfe, 0x0c, 0xdc, + 0x33, 0x90, 0x5a, 0x7a, 0x0e, 0xa6, 0xdb, 0xa6, 0x6e, 0x7a, 0xc8, 0xb1, 0x1d, 0x84, 0x33, 0x96, + 0xbe, 0x2a, 0xff, 0x2f, 0x63, 0x47, 0xe4, 0xdc, 0x5e, 0xd8, 0x9a, 0xb2, 0xc8, 0x53, 0xed, 0x7e, + 0xe1, 0xa3, 0xe9, 0xd4, 0x0f, 0xc6, 0xc4, 0x5b, 0xb7, 0x6e, 0xdd, 0x8a, 0x15, 0xbf, 0x38, 0x0a, + 0xd3, 0x83, 0xd6, 0xcc, 0xc0, 0xe5, 0x7b, 0x02, 0x46, 0xcd, 0x76, 0x6b, 0x1f, 0x39, 0x24, 0x48, + 0x49, 0x99, 0x3d, 0x49, 0x65, 0x48, 0x1a, 0xea, 0x3e, 0x32, 0xf2, 0x89, 0x33, 0xc2, 0x6c, 0x6e, + 0xe1, 0xb1, 0xa1, 0x56, 0xe5, 0xdc, 0x26, 0x86, 0xc8, 0x14, 0x29, 0x7d, 0x0a, 0x12, 0xac, 0x44, + 0x63, 0x86, 0x47, 0x87, 0x63, 0xc0, 0x6b, 0x49, 0x26, 0x38, 0xe9, 0x5e, 0x48, 0xe3, 0x7f, 0x69, + 0x6e, 0x8c, 0x12, 0x9f, 0x53, 0x58, 0x80, 0xf3, 0x42, 0x9a, 0x81, 0x14, 0x59, 0x26, 0x75, 0xc4, + 0xb7, 0x36, 0xff, 0x19, 0x27, 0x56, 0x1d, 0x35, 0xd4, 0xb6, 0xe1, 0x29, 0xd7, 0x55, 0xa3, 0x8d, + 0x48, 0xc2, 0xa7, 0xe5, 0x2c, 0x13, 0x7e, 0x06, 0xcb, 0xa4, 0xd3, 0x90, 0xa1, 0xab, 0x4a, 0x37, + 0xeb, 0xe8, 0x45, 0x52, 0x3d, 0x93, 0x32, 0x5d, 0x68, 0x1b, 0x58, 0x82, 0x5f, 0x7f, 0xd5, 0xb5, + 0x4c, 0x9e, 0x9a, 0xe4, 0x15, 0x58, 0x40, 0x5e, 0x7f, 0xbe, 0xb7, 0x70, 0xdf, 0x3f, 0x78, 0x78, + 0xbd, 0x39, 0x55, 0xfc, 0x56, 0x0c, 0x12, 0xa4, 0x5e, 0x4c, 0x40, 0x66, 0xf7, 0xf9, 0x9d, 0x8a, + 0xb2, 0x56, 0xdd, 0x5b, 0xd9, 0xac, 0x88, 0x82, 0x94, 0x03, 0x20, 0x82, 0xcb, 0x9b, 0xd5, 0xf2, + 0xae, 0x18, 0xf3, 0x9f, 0x37, 0xb6, 0x77, 0x97, 0x17, 0xc5, 0xb8, 0x0f, 0xd8, 0xa3, 0x82, 0x44, + 0xd8, 0xe0, 0xdc, 0x82, 0x98, 0x94, 0x44, 0xc8, 0x52, 0x82, 0x8d, 0xe7, 0x2a, 0x6b, 0xcb, 0x8b, + 0xe2, 0x68, 0xb7, 0xe4, 0xdc, 0x82, 0x38, 0x26, 0x8d, 0x43, 0x9a, 0x48, 0x56, 0xaa, 0xd5, 0x4d, + 0x31, 0xe5, 0x73, 0xd6, 0x76, 0xe5, 0x8d, 0xed, 0x75, 0x31, 0xed, 0x73, 0xae, 0xcb, 0xd5, 0xbd, + 0x1d, 0x11, 0x7c, 0x86, 0xad, 0x4a, 0xad, 0x56, 0x5e, 0xaf, 0x88, 0x19, 0xdf, 0x62, 0xe5, 0xf9, + 0xdd, 0x4a, 0x4d, 0xcc, 0x76, 0xb9, 0x75, 0x6e, 0x41, 0x1c, 0xf7, 0x5f, 0x51, 0xd9, 0xde, 0xdb, + 0x12, 0x73, 0xd2, 0x24, 0x8c, 0xd3, 0x57, 0x70, 0x27, 0x26, 0x7a, 0x44, 0xcb, 0x8b, 0xa2, 0x18, + 0x38, 0x42, 0x59, 0x26, 0xbb, 0x04, 0xcb, 0x8b, 0xa2, 0x54, 0x5c, 0x85, 0x24, 0xc9, 0x2e, 0x49, + 0x82, 0xdc, 0x66, 0x79, 0xa5, 0xb2, 0xa9, 0x54, 0x77, 0x76, 0x37, 0xaa, 0xdb, 0xe5, 0x4d, 0x51, + 0x08, 0x64, 0x72, 0xe5, 0xd3, 0x7b, 0x1b, 0x72, 0x65, 0x4d, 0x8c, 0x85, 0x65, 0x3b, 0x95, 0xf2, + 0x6e, 0x65, 0x4d, 0x8c, 0x17, 0x35, 0x98, 0x1e, 0x54, 0x27, 0x07, 0xae, 0x8c, 0xd0, 0x14, 0xc7, + 0x8e, 0x98, 0x62, 0xc2, 0xd5, 0x37, 0xc5, 0xef, 0xc4, 0x60, 0x6a, 0xc0, 0x5e, 0x31, 0xf0, 0x25, + 0x4f, 0x43, 0x92, 0xa6, 0x28, 0xdd, 0x3d, 0x1f, 0x19, 0xb8, 0xe9, 0x90, 0x84, 0xed, 0xdb, 0x41, + 0x09, 0x2e, 0xdc, 0x41, 0xc4, 0x8f, 0xe8, 0x20, 0x30, 0x45, 0x5f, 0x4d, 0xff, 0xe9, 0xbe, 0x9a, + 0x4e, 0xb7, 0xbd, 0xe5, 0x61, 0xb6, 0x3d, 0x22, 0x3b, 0x5e, 0x6d, 0x4f, 0x0e, 0xa8, 0xed, 0x97, + 0x60, 0xb2, 0x8f, 0x68, 0xe8, 0x1a, 0xfb, 0x92, 0x00, 0xf9, 0xa3, 0x82, 0x13, 0x51, 0xe9, 0x62, + 0x5d, 0x95, 0xee, 0x52, 0x6f, 0x04, 0xcf, 0x1e, 0x3d, 0x09, 0x7d, 0x73, 0xfd, 0x9a, 0x00, 0x27, + 0x06, 0x77, 0x8a, 0x03, 0x7d, 0xf8, 0x14, 0x8c, 0xb6, 0x90, 0x77, 0x60, 0xf1, 0x6e, 0xe9, 0x13, + 0x03, 0xf6, 0x60, 0xac, 0xee, 0x9d, 0x6c, 0x86, 0x0a, 0x6f, 0xe2, 0xf1, 0xa3, 0xda, 0x3d, 0xea, + 0x4d, 0x9f, 0xa7, 0x9f, 0x8f, 0xc1, 0x3d, 0x03, 0xc9, 0x07, 0x3a, 0x7a, 0x3f, 0x80, 0x6e, 0xda, + 0x6d, 0x8f, 0x76, 0x44, 0xb4, 0xc0, 0xa6, 0x89, 0x84, 0x14, 0x2f, 0x5c, 0x3c, 0xdb, 0x9e, 0xaf, + 0x8f, 0x13, 0x3d, 0x50, 0x11, 0x31, 0xb8, 0x10, 0x38, 0x9a, 0x20, 0x8e, 0x16, 0x8e, 0x18, 0x69, + 0x5f, 0x62, 0x3e, 0x09, 0xa2, 0x66, 0xe8, 0xc8, 0xf4, 0x14, 0xd7, 0x73, 0x90, 0xda, 0xd2, 0xcd, + 0x26, 0xd9, 0x41, 0x52, 0xa5, 0x64, 0x43, 0x35, 0x5c, 0x24, 0x4f, 0x50, 0x75, 0x8d, 0x6b, 0x31, + 0x82, 0x24, 0x90, 0x13, 0x42, 0x8c, 0x76, 0x21, 0xa8, 0xda, 0x47, 0x14, 0x7f, 0x39, 0x0d, 0x99, + 0x50, 0x5f, 0x2d, 0x9d, 0x85, 0xec, 0x55, 0xf5, 0xba, 0xaa, 0xf0, 0xb3, 0x12, 0x8d, 0x44, 0x06, + 0xcb, 0x76, 0xd8, 0x79, 0xe9, 0x49, 0x98, 0x26, 0x26, 0x56, 0xdb, 0x43, 0x8e, 0xa2, 0x19, 0xaa, + 0xeb, 0x92, 0xa0, 0xa5, 0x88, 0xa9, 0x84, 0x75, 0x55, 0xac, 0x5a, 0xe5, 0x1a, 0x69, 0x09, 0xa6, + 0x08, 0xa2, 0xd5, 0x36, 0x3c, 0xdd, 0x36, 0x90, 0x82, 0x4f, 0x6f, 0x2e, 0xd9, 0x49, 0x7c, 0xcf, + 0x26, 0xb1, 0xc5, 0x16, 0x33, 0xc0, 0x1e, 0xb9, 0xd2, 0x1a, 0xdc, 0x4f, 0x60, 0x4d, 0x64, 0x22, + 0x47, 0xf5, 0x90, 0x82, 0x3e, 0xd7, 0x56, 0x0d, 0x57, 0x51, 0xcd, 0xba, 0x72, 0xa0, 0xba, 0x07, + 0xf9, 0x69, 0x4c, 0xb0, 0x12, 0xcb, 0x0b, 0xf2, 0x29, 0x6c, 0xb8, 0xce, 0xec, 0x2a, 0xc4, 0xac, + 0x6c, 0xd6, 0xaf, 0xa8, 0xee, 0x81, 0x54, 0x82, 0x13, 0x84, 0xc5, 0xf5, 0x1c, 0xdd, 0x6c, 0x2a, + 0xda, 0x01, 0xd2, 0xae, 0x29, 0x6d, 0xaf, 0x71, 0x21, 0x7f, 0x6f, 0xf8, 0xfd, 0xc4, 0xc3, 0x1a, + 0xb1, 0x59, 0xc5, 0x26, 0x7b, 0x5e, 0xe3, 0x82, 0x54, 0x83, 0x2c, 0x9e, 0x8c, 0x96, 0x7e, 0x13, + 0x29, 0x0d, 0xcb, 0x21, 0x5b, 0x63, 0x6e, 0x40, 0x69, 0x0a, 0x45, 0x70, 0xae, 0xca, 0x00, 0x5b, + 0x56, 0x1d, 0x95, 0x92, 0xb5, 0x9d, 0x4a, 0x65, 0x4d, 0xce, 0x70, 0x96, 0xcb, 0x96, 0x83, 0x13, + 0xaa, 0x69, 0xf9, 0x01, 0xce, 0xd0, 0x84, 0x6a, 0x5a, 0x3c, 0xbc, 0x4b, 0x30, 0xa5, 0x69, 0x74, + 0xcc, 0xba, 0xa6, 0xb0, 0x33, 0x96, 0x9b, 0x17, 0xbb, 0x82, 0xa5, 0x69, 0xeb, 0xd4, 0x80, 0xe5, + 0xb8, 0x2b, 0x5d, 0x84, 0x7b, 0x82, 0x60, 0x85, 0x81, 0x93, 0x7d, 0xa3, 0xec, 0x85, 0x2e, 0xc1, + 0x94, 0xdd, 0xe9, 0x07, 0x4a, 0x5d, 0x6f, 0xb4, 0x3b, 0xbd, 0xb0, 0xf3, 0x30, 0x6d, 0x1f, 0xd8, + 0xfd, 0xb8, 0x47, 0xc3, 0x38, 0xc9, 0x3e, 0xb0, 0x7b, 0x81, 0x0f, 0x91, 0x03, 0xb7, 0x83, 0x34, + 0xd5, 0x43, 0xf5, 0xfc, 0xc9, 0xb0, 0x79, 0x48, 0x21, 0xcd, 0x83, 0xa8, 0x69, 0x0a, 0x32, 0xd5, + 0x7d, 0x03, 0x29, 0xaa, 0x83, 0x4c, 0xd5, 0xcd, 0x9f, 0x0e, 0x1b, 0xe7, 0x34, 0xad, 0x42, 0xb4, + 0x65, 0xa2, 0x94, 0x1e, 0x85, 0x49, 0x6b, 0xff, 0xaa, 0x46, 0x53, 0x52, 0xb1, 0x1d, 0xd4, 0xd0, + 0x5f, 0xcc, 0x3f, 0x48, 0xe2, 0x3b, 0x81, 0x15, 0x24, 0x21, 0x77, 0x88, 0x58, 0x7a, 0x04, 0x44, + 0xcd, 0x3d, 0x50, 0x1d, 0x9b, 0xd4, 0x64, 0xd7, 0x56, 0x35, 0x94, 0x7f, 0x88, 0x9a, 0x52, 0xf9, + 0x36, 0x17, 0xe3, 0x25, 0xe1, 0xde, 0xd0, 0x1b, 0x1e, 0x67, 0x7c, 0x98, 0x2e, 0x09, 0x22, 0x63, + 0x6c, 0xb3, 0x20, 0xe2, 0x50, 0x74, 0xbd, 0x78, 0x96, 0x98, 0xe5, 0xec, 0x03, 0x3b, 0xfc, 0xde, + 0x07, 0x60, 0x1c, 0x5b, 0x06, 0x2f, 0x7d, 0x84, 0x36, 0x64, 0xf6, 0x41, 0xe8, 0x8d, 0x8b, 0x70, + 0x02, 0x1b, 0xb5, 0x90, 0xa7, 0xd6, 0x55, 0x4f, 0x0d, 0x59, 0x3f, 0x4e, 0xac, 0x71, 0xdc, 0xb7, + 0x98, 0xb2, 0xcb, 0x4f, 0xa7, 0xbd, 0xdf, 0xf1, 0x33, 0xeb, 0x09, 0xea, 0x27, 0x96, 0xf1, 0xdc, + 0xfa, 0xc8, 0x9a, 0xee, 0x62, 0x09, 0xb2, 0xe1, 0xc4, 0x97, 0xd2, 0x40, 0x53, 0x5f, 0x14, 0x70, + 0x17, 0xb4, 0x5a, 0x5d, 0xc3, 0xfd, 0xcb, 0x0b, 0x15, 0x31, 0x86, 0xfb, 0xa8, 0xcd, 0x8d, 0xdd, + 0x8a, 0x22, 0xef, 0x6d, 0xef, 0x6e, 0x6c, 0x55, 0xc4, 0x78, 0xb8, 0x61, 0xff, 0x5e, 0x0c, 0x72, + 0xdd, 0x67, 0x2f, 0xe9, 0x27, 0xe0, 0x24, 0xbf, 0x28, 0x71, 0x91, 0xa7, 0xdc, 0xd0, 0x1d, 0xb2, + 0x16, 0x5b, 0x2a, 0xdd, 0x17, 0xfd, 0x6c, 0x98, 0x66, 0x56, 0x35, 0xe4, 0x3d, 0xab, 0x3b, 0x78, + 0xa5, 0xb5, 0x54, 0x4f, 0xda, 0x84, 0xd3, 0xa6, 0xa5, 0xb8, 0x9e, 0x6a, 0xd6, 0x55, 0xa7, 0xae, + 0x04, 0x57, 0x54, 0x8a, 0xaa, 0x69, 0xc8, 0x75, 0x2d, 0xba, 0x07, 0xfa, 0x2c, 0xf7, 0x99, 0x56, + 0x8d, 0x19, 0x07, 0x9b, 0x43, 0x99, 0x99, 0xf6, 0x64, 0x6e, 0xfc, 0xa8, 0xcc, 0xbd, 0x17, 0xd2, + 0x2d, 0xd5, 0x56, 0x90, 0xe9, 0x39, 0x1d, 0xd2, 0x71, 0xa7, 0xe4, 0x54, 0x4b, 0xb5, 0x2b, 0xf8, + 0xf9, 0xe3, 0x39, 0xf8, 0xfc, 0x73, 0x1c, 0xb2, 0xe1, 0xae, 0x1b, 0x1f, 0x62, 0x34, 0xb2, 0x41, + 0x09, 0xa4, 0x84, 0x3d, 0x70, 0xd7, 0x1e, 0x7d, 0x6e, 0x15, 0xef, 0x5c, 0xa5, 0x51, 0xda, 0x0b, + 0xcb, 0x14, 0x89, 0xbb, 0x06, 0x9c, 0x5a, 0x88, 0xf6, 0x1e, 0x29, 0x99, 0x3d, 0x49, 0xeb, 0x30, + 0x7a, 0xd5, 0x25, 0xdc, 0xa3, 0x84, 0xfb, 0xc1, 0xbb, 0x73, 0x3f, 0x53, 0x23, 0xe4, 0xe9, 0x67, + 0x6a, 0xca, 0x76, 0x55, 0xde, 0x2a, 0x6f, 0xca, 0x0c, 0x2e, 0x9d, 0x82, 0x84, 0xa1, 0xde, 0xec, + 0x74, 0xef, 0x71, 0x44, 0x34, 0x6c, 0xe0, 0x4f, 0x41, 0xe2, 0x06, 0x52, 0xaf, 0x75, 0xef, 0x2c, + 0x44, 0xf4, 0x11, 0xa6, 0xfe, 0x3c, 0x24, 0x49, 0xbc, 0x24, 0x00, 0x16, 0x31, 0x71, 0x44, 0x4a, + 0x41, 0x62, 0xb5, 0x2a, 0xe3, 0xf4, 0x17, 0x21, 0x4b, 0xa5, 0xca, 0xce, 0x46, 0x65, 0xb5, 0x22, + 0xc6, 0x8a, 0x4b, 0x30, 0x4a, 0x83, 0x80, 0x97, 0x86, 0x1f, 0x06, 0x71, 0x84, 0x3d, 0x32, 0x0e, + 0x81, 0x6b, 0xf7, 0xb6, 0x56, 0x2a, 0xb2, 0x18, 0x0b, 0x4f, 0xaf, 0x0b, 0xd9, 0x70, 0xc3, 0xfd, + 0xf1, 0xe4, 0xd4, 0x77, 0x05, 0xc8, 0x84, 0x1a, 0x68, 0xdc, 0xf9, 0xa8, 0x86, 0x61, 0xdd, 0x50, + 0x54, 0x43, 0x57, 0x5d, 0x96, 0x14, 0x40, 0x44, 0x65, 0x2c, 0x19, 0x76, 0xd2, 0x3e, 0x16, 0xe7, + 0x5f, 0x15, 0x40, 0xec, 0xed, 0x5d, 0x7b, 0x1c, 0x14, 0x7e, 0xac, 0x0e, 0xbe, 0x22, 0x40, 0xae, + 0xbb, 0x61, 0xed, 0x71, 0xef, 0xec, 0x8f, 0xd5, 0xbd, 0xb7, 0x63, 0x30, 0xde, 0xd5, 0xa6, 0x0e, + 0xeb, 0xdd, 0xe7, 0x60, 0x52, 0xaf, 0xa3, 0x96, 0x6d, 0x79, 0xc8, 0xd4, 0x3a, 0x8a, 0x81, 0xae, + 0x23, 0x23, 0x5f, 0x24, 0x85, 0x62, 0xfe, 0xee, 0x8d, 0xf0, 0xdc, 0x46, 0x80, 0xdb, 0xc4, 0xb0, + 0xd2, 0xd4, 0xc6, 0x5a, 0x65, 0x6b, 0xa7, 0xba, 0x5b, 0xd9, 0x5e, 0x7d, 0x5e, 0xd9, 0xdb, 0xfe, + 0xa9, 0xed, 0xea, 0xb3, 0xdb, 0xb2, 0xa8, 0xf7, 0x98, 0x7d, 0x84, 0x4b, 0x7d, 0x07, 0xc4, 0x5e, + 0xa7, 0xa4, 0x93, 0x30, 0xc8, 0x2d, 0x71, 0x44, 0x9a, 0x82, 0x89, 0xed, 0xaa, 0x52, 0xdb, 0x58, + 0xab, 0x28, 0x95, 0xcb, 0x97, 0x2b, 0xab, 0xbb, 0x35, 0x7a, 0xb5, 0xe1, 0x5b, 0xef, 0x76, 0x2f, + 0xea, 0x97, 0xe3, 0x30, 0x35, 0xc0, 0x13, 0xa9, 0xcc, 0x0e, 0x25, 0xf4, 0x9c, 0xf4, 0xc4, 0x30, + 0xde, 0xcf, 0xe1, 0xae, 0x60, 0x47, 0x75, 0x3c, 0x76, 0x86, 0x79, 0x04, 0x70, 0x94, 0x4c, 0x4f, + 0x6f, 0xe8, 0xc8, 0x61, 0x37, 0x41, 0xf4, 0xa4, 0x32, 0x11, 0xc8, 0xe9, 0x65, 0xd0, 0xe3, 0x20, + 0xd9, 0x96, 0xab, 0x7b, 0xfa, 0x75, 0xa4, 0xe8, 0x26, 0xbf, 0x36, 0xc2, 0x27, 0x97, 0x84, 0x2c, + 0x72, 0xcd, 0x86, 0xe9, 0xf9, 0xd6, 0x26, 0x6a, 0xaa, 0x3d, 0xd6, 0xb8, 0x80, 0xc7, 0x65, 0x91, + 0x6b, 0x7c, 0xeb, 0xb3, 0x90, 0xad, 0x5b, 0x6d, 0xdc, 0xce, 0x51, 0x3b, 0xbc, 0x5f, 0x08, 0x72, + 0x86, 0xca, 0x7c, 0x13, 0xd6, 0xa8, 0x07, 0xf7, 0x55, 0x59, 0x39, 0x43, 0x65, 0xd4, 0xe4, 0x61, + 0x98, 0x50, 0x9b, 0x4d, 0x07, 0x93, 0x73, 0x22, 0x7a, 0xf4, 0xc8, 0xf9, 0x62, 0x62, 0x38, 0xf3, + 0x0c, 0xa4, 0x78, 0x1c, 0xf0, 0x96, 0x8c, 0x23, 0xa1, 0xd8, 0xf4, 0x3c, 0x1d, 0x9b, 0x4d, 0xcb, + 0x29, 0x93, 0x2b, 0xcf, 0x42, 0x56, 0x77, 0x95, 0xe0, 0xfa, 0x3d, 0x76, 0x26, 0x36, 0x9b, 0x92, + 0x33, 0xba, 0xeb, 0x5f, 0x5d, 0x16, 0x5f, 0x8b, 0x41, 0xae, 0xfb, 0xf3, 0x81, 0xb4, 0x06, 0x29, + 0xc3, 0xd2, 0x54, 0x92, 0x5a, 0xf4, 0xdb, 0xd5, 0x6c, 0xc4, 0x17, 0x87, 0xb9, 0x4d, 0x66, 0x2f, + 0xfb, 0xc8, 0x99, 0x7f, 0x10, 0x20, 0xc5, 0xc5, 0xd2, 0x09, 0x48, 0xd8, 0xaa, 0x77, 0x40, 0xe8, + 0x92, 0x2b, 0x31, 0x51, 0x90, 0xc9, 0x33, 0x96, 0xbb, 0xb6, 0x6a, 0x92, 0x14, 0x60, 0x72, 0xfc, + 0x8c, 0xe7, 0xd5, 0x40, 0x6a, 0x9d, 0x9c, 0x6b, 0xac, 0x56, 0x0b, 0x99, 0x9e, 0xcb, 0xe7, 0x95, + 0xc9, 0x57, 0x99, 0x58, 0x7a, 0x0c, 0x26, 0x3d, 0x47, 0xd5, 0x8d, 0x2e, 0xdb, 0x04, 0xb1, 0x15, + 0xb9, 0xc2, 0x37, 0x2e, 0xc1, 0x29, 0xce, 0x5b, 0x47, 0x9e, 0xaa, 0x1d, 0xa0, 0x7a, 0x00, 0x1a, + 0x25, 0xf7, 0x17, 0x27, 0x99, 0xc1, 0x1a, 0xd3, 0x73, 0x6c, 0xf1, 0xfb, 0x02, 0x4c, 0xf2, 0x93, + 0x58, 0xdd, 0x0f, 0xd6, 0x16, 0x80, 0x6a, 0x9a, 0x96, 0x17, 0x0e, 0x57, 0x7f, 0x2a, 0xf7, 0xe1, + 0xe6, 0xca, 0x3e, 0x48, 0x0e, 0x11, 0xcc, 0xb4, 0x00, 0x02, 0xcd, 0x91, 0x61, 0x3b, 0x0d, 0x19, + 0xf6, 0x6d, 0x88, 0x7c, 0x60, 0xa4, 0x67, 0x77, 0xa0, 0x22, 0x7c, 0x64, 0x93, 0xa6, 0x21, 0xb9, + 0x8f, 0x9a, 0xba, 0xc9, 0x6e, 0x7c, 0xe9, 0x03, 0xbf, 0x61, 0x49, 0xf8, 0x37, 0x2c, 0x2b, 0x9f, + 0x85, 0x29, 0xcd, 0x6a, 0xf5, 0xba, 0xbb, 0x22, 0xf6, 0xdc, 0x1f, 0xb8, 0x57, 0x84, 0x17, 0x20, + 0x68, 0x31, 0x3f, 0x10, 0x84, 0xaf, 0xc6, 0xe2, 0xeb, 0x3b, 0x2b, 0x5f, 0x8f, 0xcd, 0xac, 0x53, + 0xe8, 0x0e, 0x1f, 0xa9, 0x8c, 0x1a, 0x06, 0xd2, 0xb0, 0xf7, 0xf0, 0xb5, 0xc7, 0xe0, 0x89, 0xa6, + 0xee, 0x1d, 0xb4, 0xf7, 0xe7, 0x34, 0xab, 0x35, 0xdf, 0xb4, 0x9a, 0x56, 0xf0, 0x4d, 0x15, 0x3f, + 0x91, 0x07, 0xf2, 0x17, 0xfb, 0xae, 0x9a, 0xf6, 0xa5, 0x33, 0x91, 0x1f, 0x61, 0x4b, 0xdb, 0x30, + 0xc5, 0x8c, 0x15, 0xf2, 0x61, 0x87, 0x1e, 0x4f, 0xa4, 0xbb, 0x5e, 0x8e, 0xe5, 0xbf, 0xf9, 0x2e, + 0xd9, 0xae, 0xe5, 0x49, 0x06, 0xc5, 0x3a, 0x7a, 0x82, 0x29, 0xc9, 0x70, 0x4f, 0x17, 0x1f, 0x5d, + 0x9a, 0xc8, 0x89, 0x60, 0xfc, 0x1e, 0x63, 0x9c, 0x0a, 0x31, 0xd6, 0x18, 0xb4, 0xb4, 0x0a, 0xe3, + 0xc7, 0xe1, 0xfa, 0x3b, 0xc6, 0x95, 0x45, 0x61, 0x92, 0x75, 0x98, 0x20, 0x24, 0x5a, 0xdb, 0xf5, + 0xac, 0x16, 0xa9, 0x7b, 0x77, 0xa7, 0xf9, 0xfb, 0x77, 0xe9, 0x5a, 0xc9, 0x61, 0xd8, 0xaa, 0x8f, + 0x2a, 0x95, 0x80, 0x7c, 0xcb, 0xaa, 0x23, 0xcd, 0x88, 0x60, 0x78, 0x83, 0x39, 0xe2, 0xdb, 0x97, + 0x3e, 0x03, 0xd3, 0xf8, 0x6f, 0x52, 0x96, 0xc2, 0x9e, 0x44, 0xdf, 0xa4, 0xe5, 0xbf, 0xff, 0x12, + 0x5d, 0x8e, 0x53, 0x3e, 0x41, 0xc8, 0xa7, 0xd0, 0x2c, 0x36, 0x91, 0xe7, 0x21, 0xc7, 0x55, 0x54, + 0x63, 0x90, 0x7b, 0xa1, 0xab, 0x88, 0xfc, 0x97, 0xde, 0xeb, 0x9e, 0xc5, 0x75, 0x8a, 0x2c, 0x1b, + 0x46, 0x69, 0x0f, 0x4e, 0x0e, 0xc8, 0x8a, 0x21, 0x38, 0x5f, 0x66, 0x9c, 0xd3, 0x7d, 0x99, 0x81, + 0x69, 0x77, 0x80, 0xcb, 0xfd, 0xb9, 0x1c, 0x82, 0xf3, 0x77, 0x18, 0xa7, 0xc4, 0xb0, 0x7c, 0x4a, + 0x31, 0xe3, 0x33, 0x30, 0x79, 0x1d, 0x39, 0xfb, 0x96, 0xcb, 0xae, 0x7f, 0x86, 0xa0, 0x7b, 0x85, + 0xd1, 0x4d, 0x30, 0x20, 0xb9, 0x0f, 0xc2, 0x5c, 0x17, 0x21, 0xd5, 0x50, 0x35, 0x34, 0x04, 0xc5, + 0x97, 0x19, 0xc5, 0x18, 0xb6, 0xc7, 0xd0, 0x32, 0x64, 0x9b, 0x16, 0xdb, 0x99, 0xa2, 0xe1, 0xaf, + 0x32, 0x78, 0x86, 0x63, 0x18, 0x85, 0x6d, 0xd9, 0x6d, 0x03, 0x6f, 0x5b, 0xd1, 0x14, 0xbf, 0xcb, + 0x29, 0x38, 0x86, 0x51, 0x1c, 0x23, 0xac, 0xbf, 0xc7, 0x29, 0xdc, 0x50, 0x3c, 0x9f, 0x86, 0x8c, + 0x65, 0x1a, 0x1d, 0xcb, 0x1c, 0xc6, 0x89, 0xaf, 0x30, 0x06, 0x60, 0x10, 0x4c, 0x70, 0x09, 0xd2, + 0xc3, 0x4e, 0xc4, 0x1f, 0xbc, 0xc7, 0x97, 0x07, 0x9f, 0x81, 0x75, 0x98, 0xe0, 0x05, 0x4a, 0xb7, + 0xcc, 0x21, 0x28, 0xbe, 0xc6, 0x28, 0x72, 0x21, 0x18, 0x1b, 0x86, 0x87, 0x5c, 0xaf, 0x89, 0x86, + 0x21, 0x79, 0x8d, 0x0f, 0x83, 0x41, 0x58, 0x28, 0xf7, 0x91, 0xa9, 0x1d, 0x0c, 0xc7, 0xf0, 0x3a, + 0x0f, 0x25, 0xc7, 0x60, 0x8a, 0x55, 0x18, 0x6f, 0xa9, 0x8e, 0x7b, 0xa0, 0x1a, 0x43, 0x4d, 0xc7, + 0x1f, 0x32, 0x8e, 0xac, 0x0f, 0x62, 0x11, 0x69, 0x9b, 0xc7, 0xa1, 0xf9, 0x3a, 0x8f, 0x48, 0x08, + 0xc6, 0x96, 0x9e, 0xeb, 0x91, 0xbb, 0xb2, 0xe3, 0xb0, 0xfd, 0x11, 0x5f, 0x7a, 0x14, 0xbb, 0x15, + 0x66, 0xbc, 0x04, 0x69, 0x57, 0xbf, 0x39, 0x14, 0xcd, 0x1f, 0xf3, 0x99, 0x26, 0x00, 0x0c, 0x7e, + 0x1e, 0x4e, 0x0d, 0xdc, 0x26, 0x86, 0x20, 0xfb, 0x13, 0x46, 0x76, 0x62, 0xc0, 0x56, 0xc1, 0x4a, + 0xc2, 0x71, 0x29, 0xff, 0x94, 0x97, 0x04, 0xd4, 0xc3, 0xb5, 0x83, 0xcf, 0x0a, 0xae, 0xda, 0x38, + 0x5e, 0xd4, 0xfe, 0x8c, 0x47, 0x8d, 0x62, 0xbb, 0xa2, 0xb6, 0x0b, 0x27, 0x18, 0xe3, 0xf1, 0xe6, + 0xf5, 0x1b, 0xbc, 0xb0, 0x52, 0xf4, 0x5e, 0xf7, 0xec, 0x7e, 0x16, 0x66, 0xfc, 0x70, 0xf2, 0xa6, + 0xd4, 0x55, 0x5a, 0xaa, 0x3d, 0x04, 0xf3, 0x37, 0x19, 0x33, 0xaf, 0xf8, 0x7e, 0x57, 0xeb, 0x6e, + 0xa9, 0x36, 0x26, 0x7f, 0x0e, 0xf2, 0x9c, 0xbc, 0x6d, 0x3a, 0x48, 0xb3, 0x9a, 0xa6, 0x7e, 0x13, + 0xd5, 0x87, 0xa0, 0xfe, 0xf3, 0x9e, 0xa9, 0xda, 0x0b, 0xc1, 0x31, 0xf3, 0x06, 0x88, 0x7e, 0xaf, + 0xa2, 0xe8, 0x2d, 0xdb, 0x72, 0xbc, 0x08, 0xc6, 0xbf, 0xe0, 0x33, 0xe5, 0xe3, 0x36, 0x08, 0xac, + 0x54, 0x81, 0x1c, 0x79, 0x1c, 0x36, 0x25, 0xff, 0x92, 0x11, 0x8d, 0x07, 0x28, 0x56, 0x38, 0x34, + 0xab, 0x65, 0xab, 0xce, 0x30, 0xf5, 0xef, 0xaf, 0x78, 0xe1, 0x60, 0x10, 0x56, 0x38, 0xbc, 0x8e, + 0x8d, 0xf0, 0x6e, 0x3f, 0x04, 0xc3, 0xb7, 0x78, 0xe1, 0xe0, 0x18, 0x46, 0xc1, 0x1b, 0x86, 0x21, + 0x28, 0xfe, 0x9a, 0x53, 0x70, 0x0c, 0xa6, 0xf8, 0x74, 0xb0, 0xd1, 0x3a, 0xa8, 0xa9, 0xbb, 0x9e, + 0x43, 0x5b, 0xe1, 0xbb, 0x53, 0x7d, 0xfb, 0xbd, 0xee, 0x26, 0x4c, 0x0e, 0x41, 0x71, 0x25, 0x62, + 0x57, 0xa8, 0xe4, 0xa4, 0x14, 0xed, 0xd8, 0x77, 0x78, 0x25, 0x0a, 0xc1, 0xb0, 0x6f, 0xa1, 0x0e, + 0x11, 0x87, 0x5d, 0xc3, 0xe7, 0x83, 0x21, 0xe8, 0xbe, 0xdb, 0xe3, 0x5c, 0x8d, 0x63, 0x31, 0x67, + 0xa8, 0xff, 0x69, 0x9b, 0xd7, 0x50, 0x67, 0xa8, 0xec, 0xfc, 0x9b, 0x9e, 0xfe, 0x67, 0x8f, 0x22, + 0x69, 0x0d, 0x99, 0xe8, 0xe9, 0xa7, 0xa4, 0xa8, 0x5f, 0x01, 0xe5, 0x7f, 0xf6, 0x0e, 0x1b, 0x6f, + 0x77, 0x3b, 0x55, 0xda, 0xc4, 0x49, 0xde, 0xdd, 0xf4, 0x44, 0x93, 0xbd, 0x74, 0xc7, 0xcf, 0xf3, + 0xae, 0x9e, 0xa7, 0x74, 0x19, 0xc6, 0xbb, 0x1a, 0x9e, 0x68, 0xaa, 0x9f, 0x63, 0x54, 0xd9, 0x70, + 0xbf, 0x53, 0x5a, 0x82, 0x04, 0x6e, 0x5e, 0xa2, 0xe1, 0x3f, 0xcf, 0xe0, 0xc4, 0xbc, 0xf4, 0x49, + 0x48, 0xf1, 0xa6, 0x25, 0x1a, 0xfa, 0x0b, 0x0c, 0xea, 0x43, 0x30, 0x9c, 0x37, 0x2c, 0xd1, 0xf0, + 0x5f, 0xe4, 0x70, 0x0e, 0xc1, 0xf0, 0xe1, 0x43, 0xf8, 0xb7, 0xbf, 0x94, 0x60, 0x9b, 0x0e, 0x8f, + 0xdd, 0x25, 0x18, 0x63, 0x9d, 0x4a, 0x34, 0xfa, 0xf3, 0xec, 0xe5, 0x1c, 0x51, 0x3a, 0x0f, 0xc9, + 0x21, 0x03, 0xfe, 0x2b, 0x0c, 0x4a, 0xed, 0x4b, 0xab, 0x90, 0x09, 0x75, 0x27, 0xd1, 0xf0, 0x5f, + 0x65, 0xf0, 0x30, 0x0a, 0xbb, 0xce, 0xba, 0x93, 0x68, 0x82, 0x5f, 0xe3, 0xae, 0x33, 0x04, 0x0e, + 0x1b, 0x6f, 0x4c, 0xa2, 0xd1, 0xbf, 0xce, 0xa3, 0xce, 0x21, 0xa5, 0xa7, 0x21, 0xed, 0x6f, 0x36, + 0xd1, 0xf8, 0xdf, 0x60, 0xf8, 0x00, 0x83, 0x23, 0x10, 0xda, 0xec, 0xa2, 0x29, 0xbe, 0xc0, 0x23, + 0x10, 0x42, 0xe1, 0x65, 0xd4, 0xdb, 0xc0, 0x44, 0x33, 0xfd, 0x26, 0x5f, 0x46, 0x3d, 0xfd, 0x0b, + 0x9e, 0x4d, 0x52, 0xf3, 0xa3, 0x29, 0x7e, 0x8b, 0xcf, 0x26, 0xb1, 0xc7, 0x6e, 0xf4, 0x76, 0x04, + 0xd1, 0x1c, 0xbf, 0xcd, 0xdd, 0xe8, 0x69, 0x08, 0x4a, 0x3b, 0x20, 0xf5, 0x77, 0x03, 0xd1, 0x7c, + 0x5f, 0x64, 0x7c, 0x93, 0x7d, 0xcd, 0x40, 0xe9, 0x59, 0x38, 0x31, 0xb8, 0x13, 0x88, 0x66, 0xfd, + 0xd2, 0x9d, 0x9e, 0xb3, 0x5b, 0xb8, 0x11, 0x28, 0xed, 0x06, 0x5b, 0x4a, 0xb8, 0x0b, 0x88, 0xa6, + 0x7d, 0xf9, 0x4e, 0x77, 0xe1, 0x0e, 0x37, 0x01, 0xa5, 0x32, 0x40, 0xb0, 0x01, 0x47, 0x73, 0xbd, + 0xc2, 0xb8, 0x42, 0x20, 0xbc, 0x34, 0xd8, 0xfe, 0x1b, 0x8d, 0xff, 0x32, 0x5f, 0x1a, 0x0c, 0x81, + 0x97, 0x06, 0xdf, 0x7a, 0xa3, 0xd1, 0xaf, 0xf2, 0xa5, 0xc1, 0x21, 0x38, 0xb3, 0x43, 0xbb, 0x5b, + 0x34, 0xc3, 0x57, 0x78, 0x66, 0x87, 0x50, 0xa5, 0x6d, 0x98, 0xec, 0xdb, 0x10, 0xa3, 0xa9, 0xbe, + 0xca, 0xa8, 0xc4, 0xde, 0xfd, 0x30, 0xbc, 0x79, 0xb1, 0xcd, 0x30, 0x9a, 0xed, 0xf7, 0x7b, 0x36, + 0x2f, 0xb6, 0x17, 0x96, 0x2e, 0x41, 0xca, 0x6c, 0x1b, 0x06, 0x5e, 0x3c, 0xd2, 0xdd, 0x7f, 0xb9, + 0x97, 0xff, 0xd7, 0x0f, 0x59, 0x74, 0x38, 0xa0, 0xb4, 0x04, 0x49, 0xd4, 0xda, 0x47, 0xf5, 0x28, + 0xe4, 0xbf, 0x7d, 0xc8, 0x0b, 0x26, 0xb6, 0x2e, 0x3d, 0x0d, 0x40, 0xaf, 0x46, 0xc8, 0x67, 0xbf, + 0x08, 0xec, 0xbf, 0x7f, 0xc8, 0x7e, 0x53, 0x13, 0x40, 0x02, 0x02, 0xfa, 0x0b, 0x9d, 0xbb, 0x13, + 0xbc, 0xd7, 0x4d, 0x40, 0x66, 0xe4, 0x22, 0x8c, 0x5d, 0x75, 0x2d, 0xd3, 0x53, 0x9b, 0x51, 0xe8, + 0xff, 0x60, 0x68, 0x6e, 0x8f, 0x03, 0xd6, 0xb2, 0x1c, 0xe4, 0xa9, 0x4d, 0x37, 0x0a, 0xfb, 0x9f, + 0x0c, 0xeb, 0x03, 0x30, 0x58, 0x53, 0x5d, 0x6f, 0x98, 0x71, 0xff, 0x17, 0x07, 0x73, 0x00, 0x76, + 0x1a, 0xff, 0x7d, 0x0d, 0x75, 0xa2, 0xb0, 0xef, 0x73, 0xa7, 0x99, 0x7d, 0xe9, 0x93, 0x90, 0xc6, + 0x7f, 0xd2, 0x1f, 0xca, 0x45, 0x80, 0xff, 0x9b, 0x81, 0x03, 0x04, 0x7e, 0xb3, 0xeb, 0xd5, 0x3d, + 0x3d, 0x3a, 0xd8, 0xff, 0xc3, 0x66, 0x9a, 0xdb, 0x97, 0xca, 0x90, 0x71, 0xbd, 0x7a, 0xbd, 0xcd, + 0xfa, 0xd3, 0x08, 0xf8, 0xff, 0x7e, 0xe8, 0x5f, 0x59, 0xf8, 0x18, 0x3c, 0xdb, 0x37, 0xae, 0x79, + 0xb6, 0x45, 0x3e, 0x73, 0x44, 0x31, 0xdc, 0x61, 0x0c, 0x21, 0xc8, 0x4a, 0x65, 0xf0, 0xf5, 0x2d, + 0xac, 0x5b, 0xeb, 0x16, 0xbd, 0xb8, 0x7d, 0xa1, 0x18, 0x7d, 0x03, 0x0b, 0xb7, 0xd2, 0x70, 0x9f, + 0x66, 0xb5, 0xf6, 0x2d, 0x77, 0x3e, 0x54, 0xcc, 0xe7, 0x2d, 0x93, 0x71, 0x4a, 0x71, 0xcb, 0x44, + 0x33, 0xc7, 0xbb, 0xcb, 0x2d, 0x9e, 0x82, 0x64, 0xad, 0xbd, 0xbf, 0xdf, 0x91, 0x44, 0x88, 0xbb, + 0xed, 0x7d, 0xf6, 0x83, 0x2b, 0xfc, 0x67, 0xf1, 0xad, 0x38, 0x8c, 0x97, 0x0d, 0x63, 0xb7, 0x63, + 0x23, 0xb7, 0x6a, 0xa2, 0x6a, 0x43, 0xca, 0xc3, 0x28, 0x19, 0xec, 0x53, 0xc4, 0x4c, 0xb8, 0x32, + 0x22, 0xb3, 0x67, 0x5f, 0xb3, 0x40, 0x6e, 0xb9, 0x63, 0xbe, 0x66, 0xc1, 0xd7, 0x9c, 0xa3, 0x97, + 0xdc, 0xbe, 0xe6, 0x9c, 0xaf, 0x59, 0x24, 0x57, 0xdd, 0x71, 0x5f, 0xb3, 0xe8, 0x6b, 0x96, 0xc8, + 0xa7, 0x9c, 0x71, 0x5f, 0xb3, 0xe4, 0x6b, 0x96, 0xc9, 0xc7, 0x9b, 0x84, 0xaf, 0x59, 0xf6, 0x35, 0xe7, 0xc9, 0x37, 0x9b, 0x49, 0x5f, 0x73, 0xde, 0xd7, 0x5c, 0x20, 0xdf, 0x69, 0x24, 0x5f, 0x73, 0xc1, 0xd7, 0x5c, 0x24, 0xbf, 0xac, 0x1a, 0xf3, 0x35, 0x17, 0xa5, 0x19, 0x18, 0xa3, 0x23, 0x7b, - 0x8a, 0x7c, 0xcc, 0x9f, 0xb8, 0x32, 0x22, 0x73, 0x41, 0xa0, 0x7b, 0x9a, 0xfc, 0x7a, 0x6a, 0x34, - 0xd0, 0x3d, 0x1d, 0xe8, 0x16, 0xc8, 0x7f, 0xe2, 0x10, 0x03, 0xdd, 0x42, 0xa0, 0x3b, 0x5b, 0x1c, - 0xc7, 0x39, 0x12, 0xe8, 0xce, 0x06, 0xba, 0xc5, 0x62, 0x01, 0xcf, 0x40, 0xa0, 0x5b, 0x0c, 0x74, - 0x4b, 0xc5, 0x89, 0xd3, 0xc2, 0x6c, 0x3e, 0xd0, 0x2d, 0x49, 0x4f, 0x42, 0xce, 0xed, 0xec, 0x29, - 0xac, 0xda, 0x93, 0x5f, 0x69, 0xe5, 0x16, 0x60, 0x0e, 0xe7, 0x04, 0x99, 0xd6, 0x2b, 0x23, 0x32, - 0xb8, 0x9d, 0x3d, 0x56, 0x8c, 0x97, 0xf3, 0x40, 0xee, 0xa0, 0x14, 0xf2, 0xe3, 0xea, 0xf2, 0x9b, - 0x02, 0x64, 0x77, 0x6e, 0x58, 0xe4, 0x53, 0xbe, 0xfb, 0xff, 0x3c, 0xb9, 0xdc, 0xe9, 0xb3, 0x8b, - 0xe4, 0x6b, 0x6b, 0xf6, 0x8a, 0x20, 0x73, 0x41, 0xa0, 0x5b, 0x2a, 0x3e, 0x48, 0x06, 0xe4, 0xeb, - 0x96, 0xa4, 0x79, 0xc8, 0x87, 0x06, 0xb4, 0x40, 0x7e, 0x3f, 0x15, 0x1d, 0x91, 0x20, 0xe7, 0x82, - 0x11, 0x2d, 0x2c, 0xa7, 0x01, 0xa7, 0x3d, 0xfe, 0xc7, 0xbb, 0x61, 0x95, 0x3f, 0x97, 0x80, 0x1c, - 0xbd, 0xb6, 0x26, 0xa3, 0xc2, 0xaf, 0xa2, 0x27, 0x9b, 0x2e, 0x73, 0x63, 0x44, 0xe6, 0x02, 0x49, - 0x06, 0xa0, 0xa6, 0x38, 0xc3, 0xa9, 0x27, 0xcb, 0x4f, 0xfd, 0xc3, 0x5b, 0xa7, 0x9e, 0x38, 0x72, - 0x05, 0xe1, 0xd8, 0xcd, 0xd3, 0x32, 0x3e, 0xb7, 0xab, 0x9b, 0xde, 0xd3, 0x0b, 0x17, 0x70, 0x80, - 0x03, 0x16, 0x69, 0x17, 0x32, 0x2b, 0xaa, 0x4b, 0x7e, 0x79, 0x49, 0x5c, 0x4f, 0x2d, 0x9f, 0xff, - 0x9f, 0xb7, 0x4e, 0x9d, 0x8d, 0x61, 0x64, 0x15, 0x76, 0x6e, 0xb3, 0x8b, 0x59, 0xcf, 0x2d, 0x62, - 0xf8, 0x95, 0x11, 0xd9, 0xa7, 0x92, 0x16, 0xb8, 0xab, 0x5b, 0x6a, 0x9b, 0xfe, 0x50, 0x2c, 0xb9, - 0x2c, 0x1e, 0xbe, 0x75, 0x2a, 0xbf, 0xd9, 0x0d, 0xe4, 0x81, 0x2b, 0xf8, 0x69, 0x39, 0x03, 0xa3, - 0xd4, 0xd5, 0xe5, 0xd5, 0x37, 0x6e, 0x97, 0x46, 0xde, 0xbc, 0x5d, 0x1a, 0xf9, 0xfb, 0xdb, 0xa5, - 0x91, 0xb7, 0x6f, 0x97, 0x84, 0xf7, 0x6e, 0x97, 0x84, 0xf7, 0x6f, 0x97, 0x84, 0x5b, 0x87, 0x25, - 0xe1, 0xab, 0x87, 0x25, 0xe1, 0xeb, 0x87, 0x25, 0xe1, 0x5b, 0x87, 0x25, 0xe1, 0x8d, 0xc3, 0xd2, - 0xc8, 0x9b, 0x87, 0x25, 0xe1, 0xed, 0xc3, 0x92, 0xf0, 0x83, 0xc3, 0xd2, 0xc8, 0x7b, 0x87, 0x25, - 0xe1, 0xfd, 0xc3, 0xd2, 0xc8, 0xad, 0xef, 0x97, 0x46, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x83, - 0x6f, 0x66, 0xca, 0x73, 0x37, 0x00, 0x00, + 0x92, 0x7c, 0xcc, 0x9f, 0xb8, 0x32, 0x22, 0x73, 0x41, 0xa0, 0x7b, 0x8a, 0xfc, 0x7a, 0x6a, 0x34, + 0xd0, 0x3d, 0x15, 0xe8, 0x16, 0xc8, 0x7f, 0xe2, 0x10, 0x03, 0xdd, 0x42, 0xa0, 0x3b, 0x97, 0x1f, + 0xc7, 0x39, 0x12, 0xe8, 0xce, 0x05, 0xba, 0xc5, 0x7c, 0x0e, 0xcf, 0x40, 0xa0, 0x5b, 0x0c, 0x74, + 0x4b, 0xf9, 0x89, 0x33, 0xc2, 0x6c, 0x36, 0xd0, 0x2d, 0x49, 0x4f, 0x40, 0xc6, 0x6d, 0xef, 0x2b, + 0xac, 0xda, 0x93, 0x5f, 0x69, 0x65, 0x16, 0x60, 0x0e, 0xe7, 0x04, 0x99, 0xd6, 0x2b, 0x23, 0x32, + 0xb8, 0xed, 0x7d, 0x56, 0x8c, 0x57, 0xb2, 0x40, 0xee, 0xa0, 0x14, 0xf2, 0xe3, 0xea, 0xe2, 0x9b, + 0x02, 0xa4, 0x77, 0x6f, 0x58, 0xe4, 0x53, 0xbe, 0xfb, 0x23, 0x9e, 0x5c, 0xee, 0xf4, 0xb9, 0x45, + 0xf2, 0xb5, 0x35, 0x7d, 0x45, 0x90, 0xb9, 0x20, 0xd0, 0x2d, 0xe5, 0x1f, 0x20, 0x03, 0xf2, 0x75, + 0x4b, 0xd2, 0x3c, 0x64, 0x43, 0x03, 0x5a, 0x20, 0xbf, 0x9f, 0xea, 0x1e, 0x91, 0x20, 0x67, 0x82, + 0x11, 0x2d, 0xac, 0x24, 0x01, 0xa7, 0x3d, 0xfe, 0xc7, 0xbb, 0x61, 0x15, 0xbf, 0x10, 0x83, 0x0c, + 0xbd, 0xb6, 0x26, 0xa3, 0xc2, 0xaf, 0xa2, 0x27, 0x9b, 0x0e, 0x73, 0x63, 0x44, 0xe6, 0x02, 0x49, + 0x06, 0xa0, 0xa6, 0x38, 0xc3, 0xa9, 0x27, 0x2b, 0x4f, 0xfe, 0xd3, 0x5b, 0xa7, 0x1f, 0x3f, 0x72, + 0x05, 0xe1, 0xd8, 0xcd, 0xd3, 0x32, 0x3e, 0xb7, 0xa7, 0x9b, 0xde, 0x53, 0x0b, 0x17, 0x70, 0x80, + 0x03, 0x16, 0x69, 0x0f, 0x52, 0xab, 0xaa, 0x4b, 0x7e, 0x79, 0x49, 0x5c, 0x4f, 0xac, 0x9c, 0xff, + 0xbf, 0xb7, 0x4e, 0x9f, 0x8b, 0x60, 0x64, 0x15, 0x76, 0x6e, 0xab, 0x83, 0x59, 0x97, 0x17, 0x31, + 0xfc, 0xca, 0x88, 0xec, 0x53, 0x49, 0x0b, 0xdc, 0xd5, 0x6d, 0xb5, 0x45, 0x7f, 0x28, 0x16, 0x5f, + 0x11, 0x0f, 0xdf, 0x3a, 0x9d, 0xdd, 0xea, 0x04, 0xf2, 0xc0, 0x15, 0xfc, 0xb4, 0x92, 0x82, 0x51, + 0xea, 0xea, 0xca, 0x95, 0x37, 0x6e, 0x17, 0x46, 0xde, 0xbc, 0x5d, 0x18, 0xf9, 0xc7, 0xdb, 0x85, + 0x91, 0xb7, 0x6f, 0x17, 0x84, 0xf7, 0x6f, 0x17, 0x84, 0x0f, 0x6e, 0x17, 0x84, 0x5b, 0x87, 0x05, + 0xe1, 0xf5, 0xc3, 0x82, 0xf0, 0x8d, 0xc3, 0x82, 0xf0, 0xed, 0xc3, 0x82, 0xf0, 0xc6, 0x61, 0x61, + 0xe4, 0xcd, 0xc3, 0x82, 0xf0, 0xf6, 0x61, 0x41, 0xf8, 0xc1, 0x61, 0x61, 0xe4, 0xfd, 0xc3, 0x82, + 0xf0, 0xc1, 0x61, 0x61, 0xe4, 0xd6, 0x3b, 0x85, 0x91, 0xd7, 0xdf, 0x29, 0x08, 0xff, 0x1f, 0x00, + 0x00, 0xff, 0xff, 0xc9, 0x2c, 0x61, 0x85, 0x77, 0x37, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) @@ -3379,7 +4100,7 @@ } func NewPopulatedSubby(r randyOne, easy bool) *Subby { this := &Subby{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := string(randStringOne(r)) this.Sub = &v1 } @@ -5170,6 +5891,7 @@ func skipOne(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -5201,10 +5923,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -5225,55 +5945,30 @@ return 0, ErrInvalidLengthOne } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthOne - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowOne - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipOne(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthOne - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupOne + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthOne + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthOne = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowOne = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthOne = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowOne = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupOne = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/unmarshaler/onepb_test.go golang-gogoprotobuf-1.3.1/test/oneof/combos/unmarshaler/onepb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/unmarshaler/onepb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/unmarshaler/onepb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -377,6 +377,102 @@ } } +func TestSubbyCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSubby(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &Subby{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSubby(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestAllTypesOneOfCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedAllTypesOneOf(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &AllTypesOneOf{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedAllTypesOneOf(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestTwoOneofsCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedTwoOneofs(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &TwoOneofs{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedTwoOneofs(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestCustomOneofCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedCustomOneof(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &CustomOneof{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedCustomOneof(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} func TestOneDescription(t *testing.T) { OneDescription() } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/unmarshaler/one.proto golang-gogoprotobuf-1.3.1/test/oneof/combos/unmarshaler/one.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/combos/unmarshaler/one.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/combos/unmarshaler/one.proto 2020-05-17 12:22:58.000000000 +0000 @@ -54,6 +54,8 @@ option (gogoproto.unsafe_marshaler_all) = false; option (gogoproto.unsafe_unmarshaler_all) = false; +option (gogoproto.compare_all) = true; + message Subby { optional string sub = 1; } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/one.proto golang-gogoprotobuf-1.3.1/test/oneof/one.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof/one.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof/one.proto 2020-05-17 12:22:58.000000000 +0000 @@ -54,6 +54,8 @@ option (gogoproto.unsafe_marshaler_all) = false; option (gogoproto.unsafe_unmarshaler_all) = false; +option (gogoproto.compare_all) = true; + message Subby { optional string sub = 1; } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/both/one.pb.go golang-gogoprotobuf-1.3.1/test/oneof3/combos/both/one.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/both/one.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/both/one.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,7 +29,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Subby struct { Sub string `protobuf:"bytes,1,opt,name=sub,proto3" json:"sub,omitempty"` @@ -51,7 +51,7 @@ return xxx_messageInfo_Subby.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -107,7 +107,7 @@ return xxx_messageInfo_SampleOneOf.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -132,55 +132,56 @@ VerboseEqual(interface{}) error MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type SampleOneOf_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,proto3,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,proto3,oneof" json:"Field1,omitempty"` } type SampleOneOf_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,proto3,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,proto3,oneof" json:"Field2,omitempty"` } type SampleOneOf_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,proto3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,proto3,oneof" json:"Field3,omitempty"` } type SampleOneOf_Field4 struct { - Field4 int64 `protobuf:"varint,4,opt,name=Field4,proto3,oneof"` + Field4 int64 `protobuf:"varint,4,opt,name=Field4,proto3,oneof" json:"Field4,omitempty"` } type SampleOneOf_Field5 struct { - Field5 uint32 `protobuf:"varint,5,opt,name=Field5,proto3,oneof"` + Field5 uint32 `protobuf:"varint,5,opt,name=Field5,proto3,oneof" json:"Field5,omitempty"` } type SampleOneOf_Field6 struct { - Field6 uint64 `protobuf:"varint,6,opt,name=Field6,proto3,oneof"` + Field6 uint64 `protobuf:"varint,6,opt,name=Field6,proto3,oneof" json:"Field6,omitempty"` } type SampleOneOf_Field7 struct { - Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,proto3,oneof"` + Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,proto3,oneof" json:"Field7,omitempty"` } type SampleOneOf_Field8 struct { - Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,proto3,oneof"` + Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,proto3,oneof" json:"Field8,omitempty"` } type SampleOneOf_Field9 struct { - Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,proto3,oneof"` + Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,proto3,oneof" json:"Field9,omitempty"` } type SampleOneOf_Field10 struct { - Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,proto3,oneof"` + Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,proto3,oneof" json:"Field10,omitempty"` } type SampleOneOf_Field11 struct { - Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,proto3,oneof"` + Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,proto3,oneof" json:"Field11,omitempty"` } type SampleOneOf_Field12 struct { - Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,proto3,oneof"` + Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,proto3,oneof" json:"Field12,omitempty"` } type SampleOneOf_Field13 struct { - Field13 bool `protobuf:"varint,13,opt,name=Field13,proto3,oneof"` + Field13 bool `protobuf:"varint,13,opt,name=Field13,proto3,oneof" json:"Field13,omitempty"` } type SampleOneOf_Field14 struct { - Field14 string `protobuf:"bytes,14,opt,name=Field14,proto3,oneof"` + Field14 string `protobuf:"bytes,14,opt,name=Field14,proto3,oneof" json:"Field14,omitempty"` } type SampleOneOf_Field15 struct { - Field15 []byte `protobuf:"bytes,15,opt,name=Field15,proto3,oneof"` + Field15 []byte `protobuf:"bytes,15,opt,name=Field15,proto3,oneof" json:"Field15,omitempty"` } type SampleOneOf_SubMessage struct { - SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,proto3,oneof"` + SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,proto3,oneof" json:"sub_message,omitempty"` } func (*SampleOneOf_Field1) isSampleOneOf_TestOneof() {} @@ -319,9 +320,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*SampleOneOf) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _SampleOneOf_OneofMarshaler, _SampleOneOf_OneofUnmarshaler, _SampleOneOf_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*SampleOneOf) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*SampleOneOf_Field1)(nil), (*SampleOneOf_Field2)(nil), (*SampleOneOf_Field3)(nil), @@ -341,292 +342,722 @@ } } -func _SampleOneOf_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*SampleOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *SampleOneOf_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *SampleOneOf_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *SampleOneOf_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case *SampleOneOf_Field4: - _ = b.EncodeVarint(4<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field4)) - case *SampleOneOf_Field5: - _ = b.EncodeVarint(5<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field5)) - case *SampleOneOf_Field6: - _ = b.EncodeVarint(6<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field6)) - case *SampleOneOf_Field7: - _ = b.EncodeVarint(7<<3 | proto.WireVarint) - _ = b.EncodeZigzag32(uint64(x.Field7)) - case *SampleOneOf_Field8: - _ = b.EncodeVarint(8<<3 | proto.WireVarint) - _ = b.EncodeZigzag64(uint64(x.Field8)) - case *SampleOneOf_Field9: - _ = b.EncodeVarint(9<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field9)) - case *SampleOneOf_Field10: - _ = b.EncodeVarint(10<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field10)) - case *SampleOneOf_Field11: - _ = b.EncodeVarint(11<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field11)) - case *SampleOneOf_Field12: - _ = b.EncodeVarint(12<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field12)) - case *SampleOneOf_Field13: - t := uint64(0) - if x.Field13 { - t = 1 - } - _ = b.EncodeVarint(13<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *SampleOneOf_Field14: - _ = b.EncodeVarint(14<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field14) - case *SampleOneOf_Field15: - _ = b.EncodeVarint(15<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field15) - case *SampleOneOf_SubMessage: - _ = b.EncodeVarint(16<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage); err != nil { - return err +func init() { + proto.RegisterType((*Subby)(nil), "one.Subby") + proto.RegisterType((*SampleOneOf)(nil), "one.SampleOneOf") +} + +func init() { proto.RegisterFile("combos/both/one.proto", fileDescriptor_5ca5df6bbfd2f47d) } + +var fileDescriptor_5ca5df6bbfd2f47d = []byte{ + // 406 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0xd2, 0xbf, 0x4f, 0x1b, 0x31, + 0x14, 0x07, 0x70, 0x3f, 0x8e, 0x24, 0xe0, 0x84, 0x92, 0x9e, 0x54, 0xe9, 0x95, 0xe1, 0xc9, 0x62, + 0xf2, 0x42, 0xd2, 0xdc, 0x25, 0xfc, 0x58, 0x19, 0xaa, 0x2c, 0x15, 0x52, 0xf8, 0x03, 0x10, 0xa6, + 0xce, 0x81, 0xc4, 0x9d, 0x51, 0xef, 0x6e, 0xe8, 0xc6, 0x9f, 0xc3, 0xd8, 0xb1, 0x7f, 0x02, 0x23, + 0x63, 0x87, 0x0e, 0x9c, 0x59, 0x3a, 0x32, 0x32, 0x56, 0xb9, 0xb4, 0xcf, 0xdb, 0xfb, 0xfa, 0x63, + 0x0f, 0xb6, 0xbf, 0xf2, 0xc3, 0x95, 0xcb, 0x8d, 0x2b, 0xc7, 0xc6, 0x55, 0xd7, 0x63, 0x57, 0xd8, + 0xd1, 0xdd, 0x37, 0x57, 0xb9, 0x38, 0x72, 0x85, 0xdd, 0x3b, 0xc8, 0x6e, 0xaa, 0xeb, 0xda, 0x8c, + 0xae, 0x5c, 0x3e, 0xce, 0x5c, 0xe6, 0xc6, 0xad, 0x99, 0x7a, 0xd9, 0xa6, 0x36, 0xb4, 0xd3, 0xfa, + 0xcc, 0xfe, 0x47, 0xd9, 0x39, 0xaf, 0x8d, 0xf9, 0x1e, 0x0f, 0x65, 0x54, 0xd6, 0x06, 0x41, 0x81, + 0xde, 0x5e, 0xac, 0xc6, 0xfd, 0xdf, 0x91, 0xec, 0x9f, 0x5f, 0xe6, 0x77, 0xb7, 0xf6, 0xac, 0xb0, + 0x67, 0xcb, 0x18, 0x65, 0xf7, 0xf3, 0x8d, 0xbd, 0xfd, 0x3a, 0x69, 0x37, 0xc1, 0x5c, 0x2c, 0xfe, + 0x65, 0x96, 0x04, 0x37, 0x14, 0xe8, 0x0d, 0x96, 0x84, 0x25, 0xc5, 0x48, 0x81, 0xee, 0xb0, 0xa4, + 0x2c, 0x53, 0xdc, 0x54, 0xa0, 0x23, 0x96, 0x29, 0xcb, 0x0c, 0x3b, 0x0a, 0xf4, 0x0e, 0xcb, 0x8c, + 0xe5, 0x10, 0xbb, 0x0a, 0xf4, 0x26, 0xcb, 0x21, 0xcb, 0x11, 0xf6, 0x14, 0xe8, 0xf7, 0x2c, 0x47, + 0x2c, 0xc7, 0xb8, 0xa5, 0x40, 0xc7, 0x2c, 0xc7, 0x2c, 0x27, 0xb8, 0xad, 0x40, 0xf7, 0x58, 0x4e, + 0xe2, 0x3d, 0xd9, 0x5b, 0xdf, 0xec, 0x13, 0x4a, 0x05, 0x7a, 0x77, 0x2e, 0x16, 0xff, 0x17, 0x82, + 0x4d, 0xb0, 0xaf, 0x40, 0x77, 0x83, 0x4d, 0x82, 0x25, 0x38, 0x50, 0xa0, 0x87, 0xc1, 0x92, 0x60, + 0x29, 0xee, 0x28, 0xd0, 0x5b, 0xc1, 0xd2, 0x60, 0x53, 0x7c, 0xb7, 0x7a, 0xff, 0x60, 0xd3, 0x60, + 0x33, 0xdc, 0x55, 0xa0, 0x07, 0xc1, 0x66, 0xf1, 0x81, 0xec, 0x97, 0xb5, 0xb9, 0xc8, 0x6d, 0x59, + 0x5e, 0x66, 0x16, 0x87, 0x0a, 0x74, 0x3f, 0x91, 0xa3, 0x55, 0x23, 0xda, 0x4f, 0x9d, 0x8b, 0x85, + 0x2c, 0x6b, 0xf3, 0x65, 0xed, 0xa7, 0x03, 0x29, 0x2b, 0x5b, 0x56, 0x17, 0xae, 0xb0, 0x6e, 0x79, + 0x3a, 0x7f, 0x6c, 0x48, 0x3c, 0x35, 0x24, 0x7e, 0x35, 0x24, 0x9e, 0x1b, 0x82, 0xd7, 0x86, 0xe0, + 0xad, 0x21, 0xb8, 0xf7, 0x04, 0x0f, 0x9e, 0xe0, 0x87, 0x27, 0xf8, 0xe9, 0x09, 0x1e, 0x3d, 0xc1, + 0x93, 0x27, 0x78, 0xf6, 0x04, 0x7f, 0x3c, 0x89, 0x57, 0x4f, 0xf0, 0xe6, 0x49, 0xdc, 0xbf, 0x90, + 0x78, 0x78, 0x21, 0x30, 0xdd, 0xb6, 0x4a, 0xe9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86, 0x03, + 0x1f, 0x92, 0x97, 0x02, 0x00, 0x00, +} + +func (this *Subby) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Subby) + if !ok { + that2, ok := that.(Subby) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Sub != that1.Sub { + if this.Sub < that1.Sub { + return -1 + } + return 1 + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *SampleOneOf) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf) + if !ok { + that2, ok := that.(SampleOneOf) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.TestOneof == nil { + if this.TestOneof != nil { + return 1 + } + } else if this.TestOneof == nil { + return -1 + } else { + thisType := -1 + switch this.TestOneof.(type) { + case *SampleOneOf_Field1: + thisType = 0 + case *SampleOneOf_Field2: + thisType = 1 + case *SampleOneOf_Field3: + thisType = 2 + case *SampleOneOf_Field4: + thisType = 3 + case *SampleOneOf_Field5: + thisType = 4 + case *SampleOneOf_Field6: + thisType = 5 + case *SampleOneOf_Field7: + thisType = 6 + case *SampleOneOf_Field8: + thisType = 7 + case *SampleOneOf_Field9: + thisType = 8 + case *SampleOneOf_Field10: + thisType = 9 + case *SampleOneOf_Field11: + thisType = 10 + case *SampleOneOf_Field12: + thisType = 11 + case *SampleOneOf_Field13: + thisType = 12 + case *SampleOneOf_Field14: + thisType = 13 + case *SampleOneOf_Field15: + thisType = 14 + case *SampleOneOf_SubMessage: + thisType = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.TestOneof)) + } + that1Type := -1 + switch that1.TestOneof.(type) { + case *SampleOneOf_Field1: + that1Type = 0 + case *SampleOneOf_Field2: + that1Type = 1 + case *SampleOneOf_Field3: + that1Type = 2 + case *SampleOneOf_Field4: + that1Type = 3 + case *SampleOneOf_Field5: + that1Type = 4 + case *SampleOneOf_Field6: + that1Type = 5 + case *SampleOneOf_Field7: + that1Type = 6 + case *SampleOneOf_Field8: + that1Type = 7 + case *SampleOneOf_Field9: + that1Type = 8 + case *SampleOneOf_Field10: + that1Type = 9 + case *SampleOneOf_Field11: + that1Type = 10 + case *SampleOneOf_Field12: + that1Type = 11 + case *SampleOneOf_Field13: + that1Type = 12 + case *SampleOneOf_Field14: + that1Type = 13 + case *SampleOneOf_Field15: + that1Type = 14 + case *SampleOneOf_SubMessage: + that1Type = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.TestOneof)) + } + if thisType == that1Type { + if c := this.TestOneof.Compare(that1.TestOneof); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *SampleOneOf_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field1) + if !ok { + that2, ok := that.(SampleOneOf_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field2) + if !ok { + that2, ok := that.(SampleOneOf_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field3) + if !ok { + that2, ok := that.(SampleOneOf_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field4) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field4) + if !ok { + that2, ok := that.(SampleOneOf_Field4) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field4 != that1.Field4 { + if this.Field4 < that1.Field4 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field5) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field5) + if !ok { + that2, ok := that.(SampleOneOf_Field5) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field5 != that1.Field5 { + if this.Field5 < that1.Field5 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field6) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field6) + if !ok { + that2, ok := that.(SampleOneOf_Field6) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field6 != that1.Field6 { + if this.Field6 < that1.Field6 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field7) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field7) + if !ok { + that2, ok := that.(SampleOneOf_Field7) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field7 != that1.Field7 { + if this.Field7 < that1.Field7 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field8) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field8) + if !ok { + that2, ok := that.(SampleOneOf_Field8) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field8 != that1.Field8 { + if this.Field8 < that1.Field8 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field9) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field9) + if !ok { + that2, ok := that.(SampleOneOf_Field9) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field9 != that1.Field9 { + if this.Field9 < that1.Field9 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field10) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field10) + if !ok { + that2, ok := that.(SampleOneOf_Field10) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field10 != that1.Field10 { + if this.Field10 < that1.Field10 { + return -1 } - case nil: - default: - return fmt.Errorf("SampleOneOf.TestOneof has unexpected type %T", x) + return 1 } - return nil + return 0 } +func (this *SampleOneOf_Field11) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func _SampleOneOf_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*SampleOneOf) - switch tag { - case 1: // test_oneof.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field1{math.Float64frombits(x)} - return true, err - case 2: // test_oneof.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // test_oneof.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field3{int32(x)} - return true, err - case 4: // test_oneof.Field4 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field4{int64(x)} - return true, err - case 5: // test_oneof.Field5 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field5{uint32(x)} - return true, err - case 6: // test_oneof.Field6 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field6{x} - return true, err - case 7: // test_oneof.Field7 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag32() - m.TestOneof = &SampleOneOf_Field7{int32(x)} - return true, err - case 8: // test_oneof.Field8 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag64() - m.TestOneof = &SampleOneOf_Field8{int64(x)} - return true, err - case 9: // test_oneof.Field9 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field9{uint32(x)} - return true, err - case 10: // test_oneof.Field10 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field10{int32(x)} - return true, err - case 11: // test_oneof.Field11 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field11{x} - return true, err - case 12: // test_oneof.Field12 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field12{int64(x)} - return true, err - case 13: // test_oneof.Field13 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field13{x != 0} - return true, err - case 14: // test_oneof.Field14 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.TestOneof = &SampleOneOf_Field14{x} - return true, err - case 15: // test_oneof.Field15 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.TestOneof = &SampleOneOf_Field15{x} - return true, err - case 16: // test_oneof.sub_message - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.TestOneof = &SampleOneOf_SubMessage{msg} - return true, err - default: - return false, nil + that1, ok := that.(*SampleOneOf_Field11) + if !ok { + that2, ok := that.(SampleOneOf_Field11) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field11 != that1.Field11 { + if this.Field11 < that1.Field11 { + return -1 + } + return 1 } + return 0 } +func (this *SampleOneOf_Field12) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func _SampleOneOf_OneofSizer(msg proto.Message) (n int) { - m := msg.(*SampleOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *SampleOneOf_Field1: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field2: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case *SampleOneOf_Field4: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field4)) - case *SampleOneOf_Field5: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field5)) - case *SampleOneOf_Field6: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field6)) - case *SampleOneOf_Field7: - n += 1 // tag and wire - n += proto.SizeVarint(uint64((uint32(x.Field7) << 1) ^ uint32((int32(x.Field7) >> 31)))) - case *SampleOneOf_Field8: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(uint64(x.Field8<<1) ^ uint64((int64(x.Field8) >> 63)))) - case *SampleOneOf_Field9: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field10: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field11: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field12: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field13: - n += 1 // tag and wire - n += 1 - case *SampleOneOf_Field14: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field14))) - n += len(x.Field14) - case *SampleOneOf_Field15: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field15))) - n += len(x.Field15) - case *SampleOneOf_SubMessage: - s := proto.Size(x.SubMessage) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + that1, ok := that.(*SampleOneOf_Field12) + if !ok { + that2, ok := that.(SampleOneOf_Field12) + if ok { + that1 = &that2 + } else { + return 1 + } } - return n + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field12 != that1.Field12 { + if this.Field12 < that1.Field12 { + return -1 + } + return 1 + } + return 0 } +func (this *SampleOneOf_Field13) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func init() { - proto.RegisterType((*Subby)(nil), "one.Subby") - proto.RegisterType((*SampleOneOf)(nil), "one.SampleOneOf") + that1, ok := that.(*SampleOneOf_Field13) + if !ok { + that2, ok := that.(SampleOneOf_Field13) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field13 != that1.Field13 { + if !this.Field13 { + return -1 + } + return 1 + } + return 0 } +func (this *SampleOneOf_Field14) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func init() { proto.RegisterFile("combos/both/one.proto", fileDescriptor_5ca5df6bbfd2f47d) } + that1, ok := that.(*SampleOneOf_Field14) + if !ok { + that2, ok := that.(SampleOneOf_Field14) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field14 != that1.Field14 { + if this.Field14 < that1.Field14 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field15) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -var fileDescriptor_5ca5df6bbfd2f47d = []byte{ - // 404 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0xd2, 0xbf, 0x4f, 0x1b, 0x31, - 0x14, 0x07, 0x70, 0x3f, 0x8e, 0x24, 0xe0, 0x84, 0x92, 0x9e, 0x54, 0xe9, 0x95, 0xe1, 0xc9, 0x62, - 0xf2, 0x42, 0xd2, 0xdc, 0x25, 0xfc, 0x58, 0x51, 0x55, 0x65, 0xa9, 0x90, 0xc2, 0x1f, 0x80, 0x30, - 0x75, 0x0e, 0x24, 0xee, 0x8c, 0x7a, 0x77, 0x43, 0x37, 0xfe, 0x9c, 0x8e, 0x1d, 0xfb, 0x27, 0x30, - 0x32, 0x76, 0xe8, 0xc0, 0xb9, 0x4b, 0x47, 0x46, 0xc6, 0x2a, 0x97, 0xf2, 0xbc, 0xbd, 0xaf, 0x3f, - 0xf6, 0x60, 0xfb, 0x2b, 0xdf, 0x5d, 0xb9, 0xdc, 0xb8, 0x72, 0x6c, 0x5c, 0x75, 0x3d, 0x76, 0x85, - 0x1d, 0xdd, 0x7d, 0x75, 0x95, 0x8b, 0x23, 0x57, 0xd8, 0xbd, 0x83, 0xec, 0xa6, 0xba, 0xae, 0xcd, - 0xe8, 0xca, 0xe5, 0xe3, 0xcc, 0x65, 0x6e, 0xdc, 0x9a, 0xa9, 0x97, 0x6d, 0x6a, 0x43, 0x3b, 0xad, - 0xcf, 0xec, 0xbf, 0x97, 0x9d, 0xf3, 0xda, 0x98, 0x6f, 0xf1, 0x50, 0x46, 0x65, 0x6d, 0x10, 0x14, - 0xe8, 0xed, 0xc5, 0x6a, 0xdc, 0xff, 0x1d, 0xc9, 0xfe, 0xf9, 0x65, 0x7e, 0x77, 0x6b, 0xcf, 0x0a, - 0x7b, 0xb6, 0x8c, 0x51, 0x76, 0x3f, 0xdd, 0xd8, 0xdb, 0x2f, 0x93, 0x76, 0x13, 0xcc, 0xc5, 0xe2, - 0x7f, 0x66, 0x49, 0x70, 0x43, 0x81, 0xde, 0x60, 0x49, 0x58, 0x52, 0x8c, 0x14, 0xe8, 0x0e, 0x4b, - 0xca, 0x32, 0xc5, 0x4d, 0x05, 0x3a, 0x62, 0x99, 0xb2, 0xcc, 0xb0, 0xa3, 0x40, 0xef, 0xb0, 0xcc, - 0x58, 0x0e, 0xb1, 0xab, 0x40, 0x6f, 0xb2, 0x1c, 0xb2, 0x1c, 0x61, 0x4f, 0x81, 0x7e, 0xcb, 0x72, - 0xc4, 0x72, 0x8c, 0x5b, 0x0a, 0x74, 0xcc, 0x72, 0xcc, 0x72, 0x82, 0xdb, 0x0a, 0x74, 0x8f, 0xe5, - 0x24, 0xde, 0x93, 0xbd, 0xf5, 0xcd, 0x3e, 0xa0, 0x54, 0xa0, 0x77, 0xe7, 0x62, 0xf1, 0xba, 0x10, - 0x6c, 0x82, 0x7d, 0x05, 0xba, 0x1b, 0x6c, 0x12, 0x2c, 0xc1, 0x81, 0x02, 0x3d, 0x0c, 0x96, 0x04, - 0x4b, 0x71, 0x47, 0x81, 0xde, 0x0a, 0x96, 0x06, 0x9b, 0xe2, 0x9b, 0xd5, 0xfb, 0x07, 0x9b, 0x06, - 0x9b, 0xe1, 0xae, 0x02, 0x3d, 0x08, 0x36, 0x8b, 0x0f, 0x64, 0xbf, 0xac, 0xcd, 0x45, 0x6e, 0xcb, - 0xf2, 0x32, 0xb3, 0x38, 0x54, 0xa0, 0xfb, 0x89, 0x1c, 0xad, 0x1a, 0xd1, 0x7e, 0xea, 0x5c, 0x2c, - 0x64, 0x59, 0x9b, 0xcf, 0x6b, 0x3f, 0x1d, 0x48, 0x59, 0xd9, 0xb2, 0xba, 0x70, 0x85, 0x75, 0xcb, - 0xd3, 0x8f, 0x0f, 0x0d, 0x89, 0xc7, 0x86, 0xc4, 0xaf, 0x86, 0xc4, 0x53, 0x43, 0xf0, 0xdc, 0x10, - 0xbc, 0x34, 0x04, 0xf7, 0x9e, 0xe0, 0xbb, 0x27, 0xf8, 0xe1, 0x09, 0x7e, 0x7a, 0x82, 0x07, 0x4f, - 0xf0, 0xe8, 0x09, 0x9e, 0x3c, 0xc1, 0x5f, 0x4f, 0xe2, 0xd9, 0x13, 0xbc, 0x78, 0x12, 0xf7, 0x7f, - 0x48, 0x98, 0x6e, 0x5b, 0xa3, 0xf4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x42, 0xd6, 0x88, - 0x93, 0x02, 0x00, 0x00, + that1, ok := that.(*SampleOneOf_Field15) + if !ok { + that2, ok := that.(SampleOneOf_Field15) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field15, that1.Field15); c != 0 { + return c + } + return 0 } +func (this *SampleOneOf_SubMessage) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + that1, ok := that.(*SampleOneOf_SubMessage) + if !ok { + that2, ok := that.(SampleOneOf_SubMessage) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage.Compare(that1.SubMessage); c != 0 { + return c + } + return 0 +} func (this *Subby) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { return OneDescription() } @@ -636,265 +1067,265 @@ func OneDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 4117 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0x1b, 0xe7, - 0x75, 0xe6, 0xe2, 0x46, 0xe0, 0x00, 0x04, 0x97, 0x4b, 0x8a, 0x82, 0xe8, 0x18, 0xa2, 0x68, 0x3b, - 0xa6, 0xed, 0x98, 0xb4, 0x29, 0x52, 0x17, 0xa8, 0x89, 0x0b, 0x92, 0x10, 0x45, 0x97, 0x24, 0x98, - 0x05, 0x19, 0x5f, 0x32, 0x9d, 0x9d, 0xc5, 0xe2, 0x07, 0xb8, 0xd2, 0x62, 0x77, 0xb3, 0xbb, 0x90, - 0x4c, 0x4d, 0x1f, 0xd4, 0x71, 0x2f, 0x93, 0xe9, 0xbd, 0xe9, 0x4c, 0x13, 0xd7, 0x71, 0x9b, 0x74, - 0x1a, 0xa7, 0xe9, 0x2d, 0xe9, 0x25, 0x4d, 0xd2, 0x97, 0xbe, 0xa4, 0xf5, 0x53, 0x27, 0x79, 0xeb, - 0x43, 0x1e, 0x2c, 0xc6, 0x33, 0x4d, 0x5b, 0xb7, 0x75, 0x5b, 0x3d, 0x78, 0x46, 0x2f, 0x99, 0xff, - 0xb6, 0xbb, 0xb8, 0x50, 0x0b, 0x66, 0xc6, 0xce, 0x93, 0xb8, 0xe7, 0x9c, 0xef, 0xdb, 0xf3, 0x9f, - 0xff, 0xfc, 0xff, 0x39, 0xff, 0xbf, 0x10, 0xbc, 0x55, 0x82, 0xd9, 0x96, 0x65, 0xb5, 0x0c, 0xb4, - 0x68, 0x3b, 0x96, 0x67, 0xd5, 0x3b, 0xcd, 0xc5, 0x06, 0x72, 0x35, 0x47, 0xb7, 0x3d, 0xcb, 0x59, - 0x20, 0x32, 0x69, 0x9c, 0x5a, 0x2c, 0x70, 0x8b, 0xb9, 0x6d, 0x98, 0xb8, 0xaa, 0x1b, 0x68, 0xdd, - 0x37, 0xac, 0x21, 0x4f, 0xba, 0x04, 0x89, 0xa6, 0x6e, 0xa0, 0x82, 0x30, 0x1b, 0x9f, 0xcf, 0x2e, - 0x3d, 0xba, 0xd0, 0x03, 0x5a, 0xe8, 0x46, 0xec, 0x62, 0xb1, 0x4c, 0x10, 0x73, 0xef, 0x24, 0x60, - 0x72, 0x80, 0x56, 0x92, 0x20, 0x61, 0xaa, 0x6d, 0xcc, 0x28, 0xcc, 0x67, 0x64, 0xf2, 0xb7, 0x54, - 0x80, 0x51, 0x5b, 0xd5, 0x6e, 0xa8, 0x2d, 0x54, 0x88, 0x11, 0x31, 0x7f, 0x94, 0x8a, 0x00, 0x0d, - 0x64, 0x23, 0xb3, 0x81, 0x4c, 0xed, 0xb0, 0x10, 0x9f, 0x8d, 0xcf, 0x67, 0xe4, 0x90, 0x44, 0x7a, - 0x0a, 0x26, 0xec, 0x4e, 0xdd, 0xd0, 0x35, 0x25, 0x64, 0x06, 0xb3, 0xf1, 0xf9, 0xa4, 0x2c, 0x52, - 0xc5, 0x7a, 0x60, 0xfc, 0x38, 0x8c, 0xdf, 0x42, 0xea, 0x8d, 0xb0, 0x69, 0x96, 0x98, 0xe6, 0xb1, - 0x38, 0x64, 0xb8, 0x06, 0xb9, 0x36, 0x72, 0x5d, 0xb5, 0x85, 0x14, 0xef, 0xd0, 0x46, 0x85, 0x04, - 0x19, 0xfd, 0x6c, 0xdf, 0xe8, 0x7b, 0x47, 0x9e, 0x65, 0xa8, 0xbd, 0x43, 0x1b, 0x49, 0x65, 0xc8, - 0x20, 0xb3, 0xd3, 0xa6, 0x0c, 0xc9, 0x63, 0xe2, 0x57, 0x31, 0x3b, 0xed, 0x5e, 0x96, 0x34, 0x86, - 0x31, 0x8a, 0x51, 0x17, 0x39, 0x37, 0x75, 0x0d, 0x15, 0x52, 0x84, 0xe0, 0xf1, 0x3e, 0x82, 0x1a, - 0xd5, 0xf7, 0x72, 0x70, 0x9c, 0xb4, 0x06, 0x19, 0xf4, 0x8a, 0x87, 0x4c, 0x57, 0xb7, 0xcc, 0xc2, - 0x28, 0x21, 0x79, 0x6c, 0xc0, 0x2c, 0x22, 0xa3, 0xd1, 0x4b, 0x11, 0xe0, 0xa4, 0x0b, 0x30, 0x6a, - 0xd9, 0x9e, 0x6e, 0x99, 0x6e, 0x21, 0x3d, 0x2b, 0xcc, 0x67, 0x97, 0x3e, 0x32, 0x30, 0x11, 0xaa, - 0xd4, 0x46, 0xe6, 0xc6, 0xd2, 0x26, 0x88, 0xae, 0xd5, 0x71, 0x34, 0xa4, 0x68, 0x56, 0x03, 0x29, - 0xba, 0xd9, 0xb4, 0x0a, 0x19, 0x42, 0x70, 0xb6, 0x7f, 0x20, 0xc4, 0x70, 0xcd, 0x6a, 0xa0, 0x4d, - 0xb3, 0x69, 0xc9, 0x79, 0xb7, 0xeb, 0x59, 0x9a, 0x86, 0x94, 0x7b, 0x68, 0x7a, 0xea, 0x2b, 0x85, - 0x1c, 0xc9, 0x10, 0xf6, 0x34, 0xf7, 0xed, 0x14, 0x8c, 0x0f, 0x93, 0x62, 0x57, 0x20, 0xd9, 0xc4, - 0xa3, 0x2c, 0xc4, 0x4e, 0x12, 0x03, 0x8a, 0xe9, 0x0e, 0x62, 0xea, 0x27, 0x0c, 0x62, 0x19, 0xb2, - 0x26, 0x72, 0x3d, 0xd4, 0xa0, 0x19, 0x11, 0x1f, 0x32, 0xa7, 0x80, 0x82, 0xfa, 0x53, 0x2a, 0xf1, - 0x13, 0xa5, 0xd4, 0x8b, 0x30, 0xee, 0xbb, 0xa4, 0x38, 0xaa, 0xd9, 0xe2, 0xb9, 0xb9, 0x18, 0xe5, - 0xc9, 0x42, 0x85, 0xe3, 0x64, 0x0c, 0x93, 0xf3, 0xa8, 0xeb, 0x59, 0x5a, 0x07, 0xb0, 0x4c, 0x64, - 0x35, 0x95, 0x06, 0xd2, 0x8c, 0x42, 0xfa, 0x98, 0x28, 0x55, 0xb1, 0x49, 0x5f, 0x94, 0x2c, 0x2a, - 0xd5, 0x0c, 0xe9, 0x72, 0x90, 0x6a, 0xa3, 0xc7, 0x64, 0xca, 0x36, 0x5d, 0x64, 0x7d, 0xd9, 0xb6, - 0x0f, 0x79, 0x07, 0xe1, 0xbc, 0x47, 0x0d, 0x36, 0xb2, 0x0c, 0x71, 0x62, 0x21, 0x72, 0x64, 0x32, - 0x83, 0xd1, 0x81, 0x8d, 0x39, 0xe1, 0x47, 0xe9, 0x11, 0xf0, 0x05, 0x0a, 0x49, 0x2b, 0x20, 0xbb, - 0x50, 0x8e, 0x0b, 0x77, 0xd4, 0x36, 0x9a, 0xb9, 0x0d, 0xf9, 0xee, 0xf0, 0x48, 0x53, 0x90, 0x74, - 0x3d, 0xd5, 0xf1, 0x48, 0x16, 0x26, 0x65, 0xfa, 0x20, 0x89, 0x10, 0x47, 0x66, 0x83, 0xec, 0x72, - 0x49, 0x19, 0xff, 0x29, 0xfd, 0x6c, 0x30, 0xe0, 0x38, 0x19, 0xf0, 0x47, 0xfb, 0x67, 0xb4, 0x8b, - 0xb9, 0x77, 0xdc, 0x33, 0x17, 0x61, 0xac, 0x6b, 0x00, 0xc3, 0xbe, 0x7a, 0xee, 0x17, 0xe0, 0xd4, - 0x40, 0x6a, 0xe9, 0x45, 0x98, 0xea, 0x98, 0xba, 0xe9, 0x21, 0xc7, 0x76, 0x10, 0xce, 0x58, 0xfa, - 0xaa, 0xc2, 0xbf, 0x8d, 0x1e, 0x93, 0x73, 0xfb, 0x61, 0x6b, 0xca, 0x22, 0x4f, 0x76, 0xfa, 0x85, - 0x4f, 0x66, 0xd2, 0x3f, 0x1a, 0x15, 0xef, 0xdc, 0xb9, 0x73, 0x27, 0x36, 0xf7, 0xf9, 0x14, 0x4c, - 0x0d, 0x5a, 0x33, 0x03, 0x97, 0xef, 0x34, 0xa4, 0xcc, 0x4e, 0xbb, 0x8e, 0x1c, 0x12, 0xa4, 0xa4, - 0xcc, 0x9e, 0xa4, 0x32, 0x24, 0x0d, 0xb5, 0x8e, 0x8c, 0x42, 0x62, 0x56, 0x98, 0xcf, 0x2f, 0x3d, - 0x35, 0xd4, 0xaa, 0x5c, 0xd8, 0xc2, 0x10, 0x99, 0x22, 0xa5, 0x4f, 0x40, 0x82, 0x6d, 0xd1, 0x98, - 0xe1, 0xc9, 0xe1, 0x18, 0xf0, 0x5a, 0x92, 0x09, 0x4e, 0x7a, 0x08, 0x32, 0xf8, 0x5f, 0x9a, 0x1b, - 0x29, 0xe2, 0x73, 0x1a, 0x0b, 0x70, 0x5e, 0x48, 0x33, 0x90, 0x26, 0xcb, 0xa4, 0x81, 0x78, 0x69, - 0xf3, 0x9f, 0x71, 0x62, 0x35, 0x50, 0x53, 0xed, 0x18, 0x9e, 0x72, 0x53, 0x35, 0x3a, 0x88, 0x24, - 0x7c, 0x46, 0xce, 0x31, 0xe1, 0xa7, 0xb0, 0x4c, 0x3a, 0x0b, 0x59, 0xba, 0xaa, 0x74, 0xb3, 0x81, - 0x5e, 0x21, 0xbb, 0x67, 0x52, 0xa6, 0x0b, 0x6d, 0x13, 0x4b, 0xf0, 0xeb, 0xaf, 0xbb, 0x96, 0xc9, - 0x53, 0x93, 0xbc, 0x02, 0x0b, 0xc8, 0xeb, 0x2f, 0xf6, 0x6e, 0xdc, 0x0f, 0x0f, 0x1e, 0x5e, 0x6f, - 0x4e, 0xcd, 0x7d, 0x33, 0x06, 0x09, 0xb2, 0x5f, 0x8c, 0x43, 0x76, 0xef, 0xa5, 0xdd, 0x8a, 0xb2, - 0x5e, 0xdd, 0x5f, 0xdd, 0xaa, 0x88, 0x82, 0x94, 0x07, 0x20, 0x82, 0xab, 0x5b, 0xd5, 0xf2, 0x9e, - 0x18, 0xf3, 0x9f, 0x37, 0x77, 0xf6, 0x2e, 0x2c, 0x8b, 0x71, 0x1f, 0xb0, 0x4f, 0x05, 0x89, 0xb0, - 0xc1, 0xf9, 0x25, 0x31, 0x29, 0x89, 0x90, 0xa3, 0x04, 0x9b, 0x2f, 0x56, 0xd6, 0x2f, 0x2c, 0x8b, - 0xa9, 0x6e, 0xc9, 0xf9, 0x25, 0x71, 0x54, 0x1a, 0x83, 0x0c, 0x91, 0xac, 0x56, 0xab, 0x5b, 0x62, - 0xda, 0xe7, 0xac, 0xed, 0xc9, 0x9b, 0x3b, 0x1b, 0x62, 0xc6, 0xe7, 0xdc, 0x90, 0xab, 0xfb, 0xbb, - 0x22, 0xf8, 0x0c, 0xdb, 0x95, 0x5a, 0xad, 0xbc, 0x51, 0x11, 0xb3, 0xbe, 0xc5, 0xea, 0x4b, 0x7b, - 0x95, 0x9a, 0x98, 0xeb, 0x72, 0xeb, 0xfc, 0x92, 0x38, 0xe6, 0xbf, 0xa2, 0xb2, 0xb3, 0xbf, 0x2d, - 0xe6, 0xa5, 0x09, 0x18, 0xa3, 0xaf, 0xe0, 0x4e, 0x8c, 0xf7, 0x88, 0x2e, 0x2c, 0x8b, 0x62, 0xe0, - 0x08, 0x65, 0x99, 0xe8, 0x12, 0x5c, 0x58, 0x16, 0xa5, 0xb9, 0x35, 0x48, 0x92, 0xec, 0x92, 0x24, - 0xc8, 0x6f, 0x95, 0x57, 0x2b, 0x5b, 0x4a, 0x75, 0x77, 0x6f, 0xb3, 0xba, 0x53, 0xde, 0x12, 0x85, - 0x40, 0x26, 0x57, 0x3e, 0xb9, 0xbf, 0x29, 0x57, 0xd6, 0xc5, 0x58, 0x58, 0xb6, 0x5b, 0x29, 0xef, - 0x55, 0xd6, 0xc5, 0xf8, 0x9c, 0x06, 0x53, 0x83, 0xf6, 0xc9, 0x81, 0x2b, 0x23, 0x34, 0xc5, 0xb1, - 0x63, 0xa6, 0x98, 0x70, 0xf5, 0x4d, 0xf1, 0x0f, 0x63, 0x30, 0x39, 0xa0, 0x56, 0x0c, 0x7c, 0xc9, - 0x73, 0x90, 0xa4, 0x29, 0x4a, 0xab, 0xe7, 0x13, 0x03, 0x8b, 0x0e, 0x49, 0xd8, 0xbe, 0x0a, 0x4a, - 0x70, 0xe1, 0x0e, 0x22, 0x7e, 0x4c, 0x07, 0x81, 0x29, 0xfa, 0xf6, 0xf4, 0x9f, 0xef, 0xdb, 0xd3, - 0x69, 0xd9, 0xbb, 0x30, 0x4c, 0xd9, 0x23, 0xb2, 0x93, 0xed, 0xed, 0xc9, 0x01, 0x7b, 0xfb, 0x15, - 0x98, 0xe8, 0x23, 0x1a, 0x7a, 0x8f, 0x7d, 0x55, 0x80, 0xc2, 0x71, 0xc1, 0x89, 0xd8, 0xe9, 0x62, - 0x5d, 0x3b, 0xdd, 0x95, 0xde, 0x08, 0x9e, 0x3b, 0x7e, 0x12, 0xfa, 0xe6, 0xfa, 0x4d, 0x01, 0xa6, - 0x07, 0x77, 0x8a, 0x03, 0x7d, 0xf8, 0x04, 0xa4, 0xda, 0xc8, 0x3b, 0xb0, 0x78, 0xb7, 0xf4, 0xd1, - 0x01, 0x35, 0x18, 0xab, 0x7b, 0x27, 0x9b, 0xa1, 0xc2, 0x45, 0x3c, 0x7e, 0x5c, 0xbb, 0x47, 0xbd, - 0xe9, 0xf3, 0xf4, 0xb3, 0x31, 0x38, 0x35, 0x90, 0x7c, 0xa0, 0xa3, 0x0f, 0x03, 0xe8, 0xa6, 0xdd, - 0xf1, 0x68, 0x47, 0x44, 0x37, 0xd8, 0x0c, 0x91, 0x90, 0xcd, 0x0b, 0x6f, 0x9e, 0x1d, 0xcf, 0xd7, - 0xc7, 0x89, 0x1e, 0xa8, 0x88, 0x18, 0x5c, 0x0a, 0x1c, 0x4d, 0x10, 0x47, 0x8b, 0xc7, 0x8c, 0xb4, - 0x2f, 0x31, 0x9f, 0x01, 0x51, 0x33, 0x74, 0x64, 0x7a, 0x8a, 0xeb, 0x39, 0x48, 0x6d, 0xeb, 0x66, - 0x8b, 0x54, 0x90, 0x74, 0x29, 0xd9, 0x54, 0x0d, 0x17, 0xc9, 0xe3, 0x54, 0x5d, 0xe3, 0x5a, 0x8c, - 0x20, 0x09, 0xe4, 0x84, 0x10, 0xa9, 0x2e, 0x04, 0x55, 0xfb, 0x88, 0xb9, 0x5f, 0xcf, 0x40, 0x36, - 0xd4, 0x57, 0x4b, 0xe7, 0x20, 0x77, 0x5d, 0xbd, 0xa9, 0x2a, 0xfc, 0xac, 0x44, 0x23, 0x91, 0xc5, - 0xb2, 0x5d, 0x76, 0x5e, 0x7a, 0x06, 0xa6, 0x88, 0x89, 0xd5, 0xf1, 0x90, 0xa3, 0x68, 0x86, 0xea, - 0xba, 0x24, 0x68, 0x69, 0x62, 0x2a, 0x61, 0x5d, 0x15, 0xab, 0xd6, 0xb8, 0x46, 0x5a, 0x81, 0x49, - 0x82, 0x68, 0x77, 0x0c, 0x4f, 0xb7, 0x0d, 0xa4, 0xe0, 0xd3, 0x9b, 0x4b, 0x2a, 0x89, 0xef, 0xd9, - 0x04, 0xb6, 0xd8, 0x66, 0x06, 0xd8, 0x23, 0x57, 0x5a, 0x87, 0x87, 0x09, 0xac, 0x85, 0x4c, 0xe4, - 0xa8, 0x1e, 0x52, 0xd0, 0x67, 0x3a, 0xaa, 0xe1, 0x2a, 0xaa, 0xd9, 0x50, 0x0e, 0x54, 0xf7, 0xa0, - 0x30, 0x85, 0x09, 0x56, 0x63, 0x05, 0x41, 0x3e, 0x83, 0x0d, 0x37, 0x98, 0x5d, 0x85, 0x98, 0x95, - 0xcd, 0xc6, 0x35, 0xd5, 0x3d, 0x90, 0x4a, 0x30, 0x4d, 0x58, 0x5c, 0xcf, 0xd1, 0xcd, 0x96, 0xa2, - 0x1d, 0x20, 0xed, 0x86, 0xd2, 0xf1, 0x9a, 0x97, 0x0a, 0x0f, 0x85, 0xdf, 0x4f, 0x3c, 0xac, 0x11, - 0x9b, 0x35, 0x6c, 0xb2, 0xef, 0x35, 0x2f, 0x49, 0x35, 0xc8, 0xe1, 0xc9, 0x68, 0xeb, 0xb7, 0x91, - 0xd2, 0xb4, 0x1c, 0x52, 0x1a, 0xf3, 0x03, 0xb6, 0xa6, 0x50, 0x04, 0x17, 0xaa, 0x0c, 0xb0, 0x6d, - 0x35, 0x50, 0x29, 0x59, 0xdb, 0xad, 0x54, 0xd6, 0xe5, 0x2c, 0x67, 0xb9, 0x6a, 0x39, 0x38, 0xa1, - 0x5a, 0x96, 0x1f, 0xe0, 0x2c, 0x4d, 0xa8, 0x96, 0xc5, 0xc3, 0xbb, 0x02, 0x93, 0x9a, 0x46, 0xc7, - 0xac, 0x6b, 0x0a, 0x3b, 0x63, 0xb9, 0x05, 0xb1, 0x2b, 0x58, 0x9a, 0xb6, 0x41, 0x0d, 0x58, 0x8e, - 0xbb, 0xd2, 0x65, 0x38, 0x15, 0x04, 0x2b, 0x0c, 0x9c, 0xe8, 0x1b, 0x65, 0x2f, 0x74, 0x05, 0x26, - 0xed, 0xc3, 0x7e, 0xa0, 0xd4, 0xf5, 0x46, 0xfb, 0xb0, 0x17, 0x76, 0x11, 0xa6, 0xec, 0x03, 0xbb, - 0x1f, 0xf7, 0x64, 0x18, 0x27, 0xd9, 0x07, 0x76, 0x2f, 0xf0, 0x31, 0x72, 0xe0, 0x76, 0x90, 0xa6, - 0x7a, 0xa8, 0x51, 0x38, 0x1d, 0x36, 0x0f, 0x29, 0xa4, 0x45, 0x10, 0x35, 0x4d, 0x41, 0xa6, 0x5a, - 0x37, 0x90, 0xa2, 0x3a, 0xc8, 0x54, 0xdd, 0xc2, 0xd9, 0xb0, 0x71, 0x5e, 0xd3, 0x2a, 0x44, 0x5b, - 0x26, 0x4a, 0xe9, 0x49, 0x98, 0xb0, 0xea, 0xd7, 0x35, 0x9a, 0x92, 0x8a, 0xed, 0xa0, 0xa6, 0xfe, - 0x4a, 0xe1, 0x51, 0x12, 0xdf, 0x71, 0xac, 0x20, 0x09, 0xb9, 0x4b, 0xc4, 0xd2, 0x13, 0x20, 0x6a, - 0xee, 0x81, 0xea, 0xd8, 0x64, 0x4f, 0x76, 0x6d, 0x55, 0x43, 0x85, 0xc7, 0xa8, 0x29, 0x95, 0xef, - 0x70, 0x31, 0x5e, 0x12, 0xee, 0x2d, 0xbd, 0xe9, 0x71, 0xc6, 0xc7, 0xe9, 0x92, 0x20, 0x32, 0xc6, - 0x36, 0x0f, 0x22, 0x0e, 0x45, 0xd7, 0x8b, 0xe7, 0x89, 0x59, 0xde, 0x3e, 0xb0, 0xc3, 0xef, 0x7d, - 0x04, 0xc6, 0xb0, 0x65, 0xf0, 0xd2, 0x27, 0x68, 0x43, 0x66, 0x1f, 0x84, 0xde, 0xb8, 0x0c, 0xd3, - 0xd8, 0xa8, 0x8d, 0x3c, 0xb5, 0xa1, 0x7a, 0x6a, 0xc8, 0xfa, 0x63, 0xc4, 0x1a, 0xc7, 0x7d, 0x9b, - 0x29, 0xbb, 0xfc, 0x74, 0x3a, 0xf5, 0x43, 0x3f, 0xb3, 0x9e, 0xa6, 0x7e, 0x62, 0x19, 0xcf, 0xad, - 0x0f, 0xac, 0xe9, 0x9e, 0x2b, 0x41, 0x2e, 0x9c, 0xf8, 0x52, 0x06, 0x68, 0xea, 0x8b, 0x02, 0xee, - 0x82, 0xd6, 0xaa, 0xeb, 0xb8, 0x7f, 0x79, 0xb9, 0x22, 0xc6, 0x70, 0x1f, 0xb5, 0xb5, 0xb9, 0x57, - 0x51, 0xe4, 0xfd, 0x9d, 0xbd, 0xcd, 0xed, 0x8a, 0x18, 0x0f, 0x37, 0xec, 0xdf, 0x8d, 0x41, 0xbe, - 0xfb, 0xec, 0x25, 0xfd, 0x0c, 0x9c, 0xe6, 0x17, 0x25, 0x2e, 0xf2, 0x94, 0x5b, 0xba, 0x43, 0xd6, - 0x62, 0x5b, 0xa5, 0x75, 0xd1, 0xcf, 0x86, 0x29, 0x66, 0x55, 0x43, 0xde, 0x0b, 0xba, 0x83, 0x57, - 0x5a, 0x5b, 0xf5, 0xa4, 0x2d, 0x38, 0x6b, 0x5a, 0x8a, 0xeb, 0xa9, 0x66, 0x43, 0x75, 0x1a, 0x4a, - 0x70, 0x45, 0xa5, 0xa8, 0x9a, 0x86, 0x5c, 0xd7, 0xa2, 0x35, 0xd0, 0x67, 0xf9, 0x88, 0x69, 0xd5, - 0x98, 0x71, 0x50, 0x1c, 0xca, 0xcc, 0xb4, 0x27, 0x73, 0xe3, 0xc7, 0x65, 0xee, 0x43, 0x90, 0x69, - 0xab, 0xb6, 0x82, 0x4c, 0xcf, 0x39, 0x24, 0x1d, 0x77, 0x5a, 0x4e, 0xb7, 0x55, 0xbb, 0x82, 0x9f, - 0x3f, 0x9c, 0x83, 0xcf, 0x0f, 0xe2, 0x90, 0x0b, 0x77, 0xdd, 0xf8, 0x10, 0xa3, 0x91, 0x02, 0x25, - 0x90, 0x2d, 0xec, 0x91, 0x07, 0xf6, 0xe8, 0x0b, 0x6b, 0xb8, 0x72, 0x95, 0x52, 0xb4, 0x17, 0x96, - 0x29, 0x12, 0x77, 0x0d, 0x38, 0xb5, 0x10, 0xed, 0x3d, 0xd2, 0x32, 0x7b, 0x92, 0x36, 0x20, 0x75, - 0xdd, 0x25, 0xdc, 0x29, 0xc2, 0xfd, 0xe8, 0x83, 0xb9, 0x9f, 0xaf, 0x11, 0xf2, 0xcc, 0xf3, 0x35, - 0x65, 0xa7, 0x2a, 0x6f, 0x97, 0xb7, 0x64, 0x06, 0x97, 0xce, 0x40, 0xc2, 0x50, 0x6f, 0x1f, 0x76, - 0xd7, 0x38, 0x22, 0x1a, 0x36, 0xf0, 0x67, 0x20, 0x71, 0x0b, 0xa9, 0x37, 0xba, 0x2b, 0x0b, 0x11, - 0x7d, 0x80, 0xa9, 0xbf, 0x08, 0x49, 0x12, 0x2f, 0x09, 0x80, 0x45, 0x4c, 0x1c, 0x91, 0xd2, 0x90, - 0x58, 0xab, 0xca, 0x38, 0xfd, 0x45, 0xc8, 0x51, 0xa9, 0xb2, 0xbb, 0x59, 0x59, 0xab, 0x88, 0xb1, - 0xb9, 0x15, 0x48, 0xd1, 0x20, 0xe0, 0xa5, 0xe1, 0x87, 0x41, 0x1c, 0x61, 0x8f, 0x8c, 0x43, 0xe0, - 0xda, 0xfd, 0xed, 0xd5, 0x8a, 0x2c, 0xc6, 0xc2, 0xd3, 0xeb, 0x42, 0x2e, 0xdc, 0x70, 0x7f, 0x38, - 0x39, 0xf5, 0x1d, 0x01, 0xb2, 0xa1, 0x06, 0x1a, 0x77, 0x3e, 0xaa, 0x61, 0x58, 0xb7, 0x14, 0xd5, - 0xd0, 0x55, 0x97, 0x25, 0x05, 0x10, 0x51, 0x19, 0x4b, 0x86, 0x9d, 0xb4, 0x0f, 0xc5, 0xf9, 0x37, - 0x04, 0x10, 0x7b, 0x7b, 0xd7, 0x1e, 0x07, 0x85, 0x9f, 0xaa, 0x83, 0xaf, 0x0b, 0x90, 0xef, 0x6e, - 0x58, 0x7b, 0xdc, 0x3b, 0xf7, 0x53, 0x75, 0xef, 0xed, 0x18, 0x8c, 0x75, 0xb5, 0xa9, 0xc3, 0x7a, - 0xf7, 0x19, 0x98, 0xd0, 0x1b, 0xa8, 0x6d, 0x5b, 0x1e, 0x32, 0xb5, 0x43, 0xc5, 0x40, 0x37, 0x91, - 0x51, 0x98, 0x23, 0x1b, 0xc5, 0xe2, 0x83, 0x1b, 0xe1, 0x85, 0xcd, 0x00, 0xb7, 0x85, 0x61, 0xa5, - 0xc9, 0xcd, 0xf5, 0xca, 0xf6, 0x6e, 0x75, 0xaf, 0xb2, 0xb3, 0xf6, 0x92, 0xb2, 0xbf, 0xf3, 0x73, - 0x3b, 0xd5, 0x17, 0x76, 0x64, 0x51, 0xef, 0x31, 0xfb, 0x00, 0x97, 0xfa, 0x2e, 0x88, 0xbd, 0x4e, - 0x49, 0xa7, 0x61, 0x90, 0x5b, 0xe2, 0x88, 0x34, 0x09, 0xe3, 0x3b, 0x55, 0xa5, 0xb6, 0xb9, 0x5e, - 0x51, 0x2a, 0x57, 0xaf, 0x56, 0xd6, 0xf6, 0x6a, 0xf4, 0x6a, 0xc3, 0xb7, 0xde, 0xeb, 0x5e, 0xd4, - 0xaf, 0xc5, 0x61, 0x72, 0x80, 0x27, 0x52, 0x99, 0x1d, 0x4a, 0xe8, 0x39, 0xe9, 0xe9, 0x61, 0xbc, - 0x5f, 0xc0, 0x5d, 0xc1, 0xae, 0xea, 0x78, 0xec, 0x0c, 0xf3, 0x04, 0xe0, 0x28, 0x99, 0x9e, 0xde, - 0xd4, 0x91, 0xc3, 0x6e, 0x82, 0xe8, 0x49, 0x65, 0x3c, 0x90, 0xd3, 0xcb, 0xa0, 0x8f, 0x81, 0x64, - 0x5b, 0xae, 0xee, 0xe9, 0x37, 0x91, 0xa2, 0x9b, 0xfc, 0xda, 0x08, 0x9f, 0x5c, 0x12, 0xb2, 0xc8, - 0x35, 0x9b, 0xa6, 0xe7, 0x5b, 0x9b, 0xa8, 0xa5, 0xf6, 0x58, 0xe3, 0x0d, 0x3c, 0x2e, 0x8b, 0x5c, - 0xe3, 0x5b, 0x9f, 0x83, 0x5c, 0xc3, 0xea, 0xe0, 0x76, 0x8e, 0xda, 0xe1, 0x7a, 0x21, 0xc8, 0x59, - 0x2a, 0xf3, 0x4d, 0x58, 0xa3, 0x1e, 0xdc, 0x57, 0xe5, 0xe4, 0x2c, 0x95, 0x51, 0x93, 0xc7, 0x61, - 0x5c, 0x6d, 0xb5, 0x1c, 0x4c, 0xce, 0x89, 0xe8, 0xd1, 0x23, 0xef, 0x8b, 0x89, 0xe1, 0xcc, 0xf3, - 0x90, 0xe6, 0x71, 0xc0, 0x25, 0x19, 0x47, 0x42, 0xb1, 0xe9, 0x79, 0x3a, 0x36, 0x9f, 0x91, 0xd3, - 0x26, 0x57, 0x9e, 0x83, 0x9c, 0xee, 0x2a, 0xc1, 0xf5, 0x7b, 0x6c, 0x36, 0x36, 0x9f, 0x96, 0xb3, - 0xba, 0xeb, 0x5f, 0x5d, 0xce, 0xbd, 0x19, 0x83, 0x7c, 0xf7, 0xe7, 0x03, 0x69, 0x1d, 0xd2, 0x86, - 0xa5, 0xa9, 0x24, 0xb5, 0xe8, 0xb7, 0xab, 0xf9, 0x88, 0x2f, 0x0e, 0x0b, 0x5b, 0xcc, 0x5e, 0xf6, - 0x91, 0x33, 0xff, 0x22, 0x40, 0x9a, 0x8b, 0xa5, 0x69, 0x48, 0xd8, 0xaa, 0x77, 0x40, 0xe8, 0x92, - 0xab, 0x31, 0x51, 0x90, 0xc9, 0x33, 0x96, 0xbb, 0xb6, 0x6a, 0x92, 0x14, 0x60, 0x72, 0xfc, 0x8c, - 0xe7, 0xd5, 0x40, 0x6a, 0x83, 0x9c, 0x6b, 0xac, 0x76, 0x1b, 0x99, 0x9e, 0xcb, 0xe7, 0x95, 0xc9, - 0xd7, 0x98, 0x58, 0x7a, 0x0a, 0x26, 0x3c, 0x47, 0xd5, 0x8d, 0x2e, 0xdb, 0x04, 0xb1, 0x15, 0xb9, - 0xc2, 0x37, 0x2e, 0xc1, 0x19, 0xce, 0xdb, 0x40, 0x9e, 0xaa, 0x1d, 0xa0, 0x46, 0x00, 0x4a, 0x91, - 0xfb, 0x8b, 0xd3, 0xcc, 0x60, 0x9d, 0xe9, 0x39, 0x76, 0xee, 0xfb, 0x02, 0x4c, 0xf0, 0x93, 0x58, - 0xc3, 0x0f, 0xd6, 0x36, 0x80, 0x6a, 0x9a, 0x96, 0x17, 0x0e, 0x57, 0x7f, 0x2a, 0xf7, 0xe1, 0x16, - 0xca, 0x3e, 0x48, 0x0e, 0x11, 0xcc, 0xb4, 0x01, 0x02, 0xcd, 0xb1, 0x61, 0x3b, 0x0b, 0x59, 0xf6, - 0x6d, 0x88, 0x7c, 0x60, 0xa4, 0x67, 0x77, 0xa0, 0x22, 0x7c, 0x64, 0x93, 0xa6, 0x20, 0x59, 0x47, - 0x2d, 0xdd, 0x64, 0x37, 0xbe, 0xf4, 0x81, 0xdf, 0xb0, 0x24, 0xfc, 0x1b, 0x96, 0xd5, 0x4f, 0xc3, - 0xa4, 0x66, 0xb5, 0x7b, 0xdd, 0x5d, 0x15, 0x7b, 0xee, 0x0f, 0xdc, 0x6b, 0xc2, 0xcb, 0x10, 0xb4, - 0x98, 0xef, 0x0b, 0xc2, 0x97, 0x63, 0xf1, 0x8d, 0xdd, 0xd5, 0xaf, 0xc5, 0x66, 0x36, 0x28, 0x74, - 0x97, 0x8f, 0x54, 0x46, 0x4d, 0x03, 0x69, 0xd8, 0x7b, 0xf8, 0xca, 0x53, 0xf0, 0x74, 0x4b, 0xf7, - 0x0e, 0x3a, 0xf5, 0x05, 0xcd, 0x6a, 0x2f, 0xb6, 0xac, 0x96, 0x15, 0x7c, 0x53, 0xc5, 0x4f, 0xe4, - 0x81, 0xfc, 0xc5, 0xbe, 0xab, 0x66, 0x7c, 0xe9, 0x4c, 0xe4, 0x47, 0xd8, 0xd2, 0x0e, 0x4c, 0x32, - 0x63, 0x85, 0x7c, 0xd8, 0xa1, 0xc7, 0x13, 0xe9, 0x81, 0x97, 0x63, 0x85, 0x6f, 0xbc, 0x43, 0xca, - 0xb5, 0x3c, 0xc1, 0xa0, 0x58, 0x47, 0x4f, 0x30, 0x25, 0x19, 0x4e, 0x75, 0xf1, 0xd1, 0xa5, 0x89, - 0x9c, 0x08, 0xc6, 0xef, 0x32, 0xc6, 0xc9, 0x10, 0x63, 0x8d, 0x41, 0x4b, 0x6b, 0x30, 0x76, 0x12, - 0xae, 0x7f, 0x62, 0x5c, 0x39, 0x14, 0x26, 0xd9, 0x80, 0x71, 0x42, 0xa2, 0x75, 0x5c, 0xcf, 0x6a, - 0x93, 0x7d, 0xef, 0xc1, 0x34, 0xff, 0xfc, 0x0e, 0x5d, 0x2b, 0x79, 0x0c, 0x5b, 0xf3, 0x51, 0xa5, - 0x12, 0x90, 0x6f, 0x59, 0x0d, 0xa4, 0x19, 0x11, 0x0c, 0x6f, 0x31, 0x47, 0x7c, 0xfb, 0xd2, 0xa7, - 0x60, 0x0a, 0xff, 0x4d, 0xb6, 0xa5, 0xb0, 0x27, 0xd1, 0x37, 0x69, 0x85, 0xef, 0xbf, 0x4a, 0x97, - 0xe3, 0xa4, 0x4f, 0x10, 0xf2, 0x29, 0x34, 0x8b, 0x2d, 0xe4, 0x79, 0xc8, 0x71, 0x15, 0xd5, 0x18, - 0xe4, 0x5e, 0xe8, 0x2a, 0xa2, 0xf0, 0x85, 0x77, 0xbb, 0x67, 0x71, 0x83, 0x22, 0xcb, 0x86, 0x51, - 0xda, 0x87, 0xd3, 0x03, 0xb2, 0x62, 0x08, 0xce, 0xd7, 0x18, 0xe7, 0x54, 0x5f, 0x66, 0x60, 0xda, - 0x5d, 0xe0, 0x72, 0x7f, 0x2e, 0x87, 0xe0, 0xfc, 0x03, 0xc6, 0x29, 0x31, 0x2c, 0x9f, 0x52, 0xcc, - 0xf8, 0x3c, 0x4c, 0xdc, 0x44, 0x4e, 0xdd, 0x72, 0xd9, 0xf5, 0xcf, 0x10, 0x74, 0xaf, 0x33, 0xba, - 0x71, 0x06, 0x24, 0xf7, 0x41, 0x98, 0xeb, 0x32, 0xa4, 0x9b, 0xaa, 0x86, 0x86, 0xa0, 0xf8, 0x22, - 0xa3, 0x18, 0xc5, 0xf6, 0x18, 0x5a, 0x86, 0x5c, 0xcb, 0x62, 0x95, 0x29, 0x1a, 0xfe, 0x06, 0x83, - 0x67, 0x39, 0x86, 0x51, 0xd8, 0x96, 0xdd, 0x31, 0x70, 0xd9, 0x8a, 0xa6, 0xf8, 0x43, 0x4e, 0xc1, - 0x31, 0x8c, 0xe2, 0x04, 0x61, 0xfd, 0x23, 0x4e, 0xe1, 0x86, 0xe2, 0xf9, 0x1c, 0x64, 0x2d, 0xd3, - 0x38, 0xb4, 0xcc, 0x61, 0x9c, 0xf8, 0x12, 0x63, 0x00, 0x06, 0xc1, 0x04, 0x57, 0x20, 0x33, 0xec, - 0x44, 0xfc, 0xc9, 0xbb, 0x7c, 0x79, 0xf0, 0x19, 0xd8, 0x80, 0x71, 0xbe, 0x41, 0xe9, 0x96, 0x39, - 0x04, 0xc5, 0x57, 0x18, 0x45, 0x3e, 0x04, 0x63, 0xc3, 0xf0, 0x90, 0xeb, 0xb5, 0xd0, 0x30, 0x24, - 0x6f, 0xf2, 0x61, 0x30, 0x08, 0x0b, 0x65, 0x1d, 0x99, 0xda, 0xc1, 0x70, 0x0c, 0x5f, 0xe5, 0xa1, - 0xe4, 0x18, 0x4c, 0xb1, 0x06, 0x63, 0x6d, 0xd5, 0x71, 0x0f, 0x54, 0x63, 0xa8, 0xe9, 0xf8, 0x53, - 0xc6, 0x91, 0xf3, 0x41, 0x2c, 0x22, 0x1d, 0xf3, 0x24, 0x34, 0x5f, 0xe3, 0x11, 0x09, 0xc1, 0xd8, - 0xd2, 0x73, 0x3d, 0x72, 0x57, 0x76, 0x12, 0xb6, 0x3f, 0xe3, 0x4b, 0x8f, 0x62, 0xb7, 0xc3, 0x8c, - 0x57, 0x20, 0xe3, 0xea, 0xb7, 0x87, 0xa2, 0xf9, 0x73, 0x3e, 0xd3, 0x04, 0x80, 0xc1, 0x2f, 0xc1, - 0x99, 0x81, 0x65, 0x62, 0x08, 0xb2, 0xbf, 0x60, 0x64, 0xd3, 0x03, 0x4a, 0x05, 0xdb, 0x12, 0x4e, - 0x4a, 0xf9, 0x97, 0x7c, 0x4b, 0x40, 0x3d, 0x5c, 0xbb, 0xf8, 0xac, 0xe0, 0xaa, 0xcd, 0x93, 0x45, - 0xed, 0xaf, 0x78, 0xd4, 0x28, 0xb6, 0x2b, 0x6a, 0x7b, 0x30, 0xcd, 0x18, 0x4f, 0x36, 0xaf, 0x5f, - 0xe7, 0x1b, 0x2b, 0x45, 0xef, 0x77, 0xcf, 0xee, 0xa7, 0x61, 0xc6, 0x0f, 0x27, 0x6f, 0x4a, 0x5d, - 0xa5, 0xad, 0xda, 0x43, 0x30, 0x7f, 0x83, 0x31, 0xf3, 0x1d, 0xdf, 0xef, 0x6a, 0xdd, 0x6d, 0xd5, - 0xc6, 0xe4, 0x2f, 0x42, 0x81, 0x93, 0x77, 0x4c, 0x07, 0x69, 0x56, 0xcb, 0xd4, 0x6f, 0xa3, 0xc6, - 0x10, 0xd4, 0x7f, 0xdd, 0x33, 0x55, 0xfb, 0x21, 0x38, 0x66, 0xde, 0x04, 0xd1, 0xef, 0x55, 0x14, - 0xbd, 0x6d, 0x5b, 0x8e, 0x17, 0xc1, 0xf8, 0x37, 0x7c, 0xa6, 0x7c, 0xdc, 0x26, 0x81, 0x95, 0x2a, - 0x90, 0x27, 0x8f, 0xc3, 0xa6, 0xe4, 0xdf, 0x32, 0xa2, 0xb1, 0x00, 0xc5, 0x36, 0x0e, 0xcd, 0x6a, - 0xdb, 0xaa, 0x33, 0xcc, 0xfe, 0xf7, 0x77, 0x7c, 0xe3, 0x60, 0x10, 0xb6, 0x71, 0x78, 0x87, 0x36, - 0xc2, 0xd5, 0x7e, 0x08, 0x86, 0x6f, 0xf2, 0x8d, 0x83, 0x63, 0x18, 0x05, 0x6f, 0x18, 0x86, 0xa0, - 0xf8, 0x7b, 0x4e, 0xc1, 0x31, 0x98, 0xe2, 0x93, 0x41, 0xa1, 0x75, 0x50, 0x4b, 0x77, 0x3d, 0x87, - 0xb6, 0xc2, 0x0f, 0xa6, 0xfa, 0xd6, 0xbb, 0xdd, 0x4d, 0x98, 0x1c, 0x82, 0xe2, 0x9d, 0x88, 0x5d, - 0xa1, 0x92, 0x93, 0x52, 0xb4, 0x63, 0xdf, 0xe6, 0x3b, 0x51, 0x08, 0x86, 0x7d, 0x0b, 0x75, 0x88, - 0x38, 0xec, 0x1a, 0x3e, 0x1f, 0x0c, 0x41, 0xf7, 0x9d, 0x1e, 0xe7, 0x6a, 0x1c, 0x8b, 0x39, 0x43, - 0xfd, 0x4f, 0xc7, 0xbc, 0x81, 0x0e, 0x87, 0xca, 0xce, 0x7f, 0xe8, 0xe9, 0x7f, 0xf6, 0x29, 0x92, - 0xee, 0x21, 0xe3, 0x3d, 0xfd, 0x94, 0x14, 0xf5, 0x2b, 0xa0, 0xc2, 0x2f, 0xde, 0x63, 0xe3, 0xed, - 0x6e, 0xa7, 0x4a, 0x5b, 0x38, 0xc9, 0xbb, 0x9b, 0x9e, 0x68, 0xb2, 0x57, 0xef, 0xf9, 0x79, 0xde, - 0xd5, 0xf3, 0x94, 0xae, 0xc2, 0x58, 0x57, 0xc3, 0x13, 0x4d, 0xf5, 0x4b, 0x8c, 0x2a, 0x17, 0xee, - 0x77, 0x4a, 0x2b, 0x90, 0xc0, 0xcd, 0x4b, 0x34, 0xfc, 0x97, 0x19, 0x9c, 0x98, 0x97, 0x3e, 0x0e, - 0x69, 0xde, 0xb4, 0x44, 0x43, 0x7f, 0x85, 0x41, 0x7d, 0x08, 0x86, 0xf3, 0x86, 0x25, 0x1a, 0xfe, - 0xab, 0x1c, 0xce, 0x21, 0x18, 0x3e, 0x7c, 0x08, 0xff, 0xf1, 0xd7, 0x12, 0xac, 0xe8, 0xf0, 0xd8, - 0x5d, 0x81, 0x51, 0xd6, 0xa9, 0x44, 0xa3, 0x3f, 0xcb, 0x5e, 0xce, 0x11, 0xa5, 0x8b, 0x90, 0x1c, - 0x32, 0xe0, 0xbf, 0xc1, 0xa0, 0xd4, 0xbe, 0xb4, 0x06, 0xd9, 0x50, 0x77, 0x12, 0x0d, 0xff, 0x4d, - 0x06, 0x0f, 0xa3, 0xb0, 0xeb, 0xac, 0x3b, 0x89, 0x26, 0xf8, 0x2d, 0xee, 0x3a, 0x43, 0xe0, 0xb0, - 0xf1, 0xc6, 0x24, 0x1a, 0xfd, 0xdb, 0x3c, 0xea, 0x1c, 0x52, 0x7a, 0x0e, 0x32, 0x7e, 0xb1, 0x89, - 0xc6, 0xff, 0x0e, 0xc3, 0x07, 0x18, 0x1c, 0x81, 0x50, 0xb1, 0x8b, 0xa6, 0xf8, 0x5d, 0x1e, 0x81, - 0x10, 0x0a, 0x2f, 0xa3, 0xde, 0x06, 0x26, 0x9a, 0xe9, 0x73, 0x7c, 0x19, 0xf5, 0xf4, 0x2f, 0x78, - 0x36, 0xc9, 0x9e, 0x1f, 0x4d, 0xf1, 0x7b, 0x7c, 0x36, 0x89, 0x3d, 0x76, 0xa3, 0xb7, 0x23, 0x88, - 0xe6, 0xf8, 0x7d, 0xee, 0x46, 0x4f, 0x43, 0x50, 0xda, 0x05, 0xa9, 0xbf, 0x1b, 0x88, 0xe6, 0xfb, - 0x3c, 0xe3, 0x9b, 0xe8, 0x6b, 0x06, 0x4a, 0x2f, 0xc0, 0xf4, 0xe0, 0x4e, 0x20, 0x9a, 0xf5, 0x0b, - 0xf7, 0x7a, 0xce, 0x6e, 0xe1, 0x46, 0xa0, 0xb4, 0x17, 0x94, 0x94, 0x70, 0x17, 0x10, 0x4d, 0xfb, - 0xda, 0xbd, 0xee, 0x8d, 0x3b, 0xdc, 0x04, 0x94, 0xca, 0x00, 0x41, 0x01, 0x8e, 0xe6, 0x7a, 0x9d, - 0x71, 0x85, 0x40, 0x78, 0x69, 0xb0, 0xfa, 0x1b, 0x8d, 0xff, 0x22, 0x5f, 0x1a, 0x0c, 0x81, 0x97, - 0x06, 0x2f, 0xbd, 0xd1, 0xe8, 0x37, 0xf8, 0xd2, 0xe0, 0x10, 0x9c, 0xd9, 0xa1, 0xea, 0x16, 0xcd, - 0xf0, 0x25, 0x9e, 0xd9, 0x21, 0x54, 0x69, 0x07, 0x26, 0xfa, 0x0a, 0x62, 0x34, 0xd5, 0x97, 0x19, - 0x95, 0xd8, 0x5b, 0x0f, 0xc3, 0xc5, 0x8b, 0x15, 0xc3, 0x68, 0xb6, 0x3f, 0xee, 0x29, 0x5e, 0xac, - 0x16, 0x96, 0xae, 0x40, 0xda, 0xec, 0x18, 0x06, 0x5e, 0x3c, 0xd2, 0x83, 0x7f, 0xb9, 0x57, 0xf8, - 0xf7, 0xfb, 0x2c, 0x3a, 0x1c, 0x50, 0x5a, 0x81, 0x24, 0x6a, 0xd7, 0x51, 0x23, 0x0a, 0xf9, 0x1f, - 0xf7, 0xf9, 0x86, 0x89, 0xad, 0x4b, 0xcf, 0x01, 0xd0, 0xab, 0x11, 0xf2, 0xd9, 0x2f, 0x02, 0xfb, - 0x9f, 0xf7, 0xd9, 0x6f, 0x6a, 0x02, 0x48, 0x40, 0x40, 0x7f, 0xa1, 0xf3, 0x60, 0x82, 0x77, 0xbb, - 0x09, 0xc8, 0x8c, 0x5c, 0x86, 0xd1, 0xeb, 0xae, 0x65, 0x7a, 0x6a, 0x2b, 0x0a, 0xfd, 0x5f, 0x0c, - 0xcd, 0xed, 0x71, 0xc0, 0xda, 0x96, 0x83, 0x3c, 0xb5, 0xe5, 0x46, 0x61, 0xff, 0x9b, 0x61, 0x7d, - 0x00, 0x06, 0x6b, 0xaa, 0xeb, 0x0d, 0x33, 0xee, 0xff, 0xe1, 0x60, 0x0e, 0xc0, 0x4e, 0xe3, 0xbf, - 0x6f, 0xa0, 0xc3, 0x28, 0xec, 0x7b, 0xdc, 0x69, 0x66, 0x5f, 0xfa, 0x38, 0x64, 0xf0, 0x9f, 0xf4, - 0x87, 0x72, 0x11, 0xe0, 0xff, 0x65, 0xe0, 0x00, 0x81, 0xdf, 0xec, 0x7a, 0x0d, 0x4f, 0x8f, 0x0e, - 0xf6, 0xff, 0xb1, 0x99, 0xe6, 0xf6, 0xa5, 0x32, 0x64, 0x5d, 0xaf, 0xd1, 0xe8, 0xb0, 0xfe, 0x34, - 0x02, 0xfe, 0xff, 0xf7, 0xfd, 0x2b, 0x0b, 0x1f, 0x83, 0x67, 0xfb, 0xd6, 0x0d, 0xcf, 0xb6, 0xc8, - 0x67, 0x8e, 0x28, 0x86, 0x7b, 0x8c, 0x21, 0x04, 0x59, 0xad, 0x0c, 0xbe, 0xbe, 0x85, 0x0d, 0x6b, - 0xc3, 0xa2, 0x17, 0xb7, 0x2f, 0xcf, 0x45, 0xdf, 0xc0, 0xc2, 0xe7, 0x92, 0x70, 0x4a, 0xb3, 0xda, - 0x75, 0xcb, 0x5d, 0xac, 0x5b, 0xde, 0xc1, 0xa2, 0x65, 0x32, 0x32, 0x29, 0x6e, 0x99, 0x68, 0xe6, - 0x64, 0x97, 0xb8, 0x73, 0x67, 0x20, 0x59, 0xeb, 0xd4, 0xeb, 0x87, 0x92, 0x08, 0x71, 0xb7, 0x53, - 0x67, 0xbf, 0xb4, 0xc2, 0x7f, 0xce, 0xfd, 0x20, 0x0e, 0xd9, 0x9a, 0xda, 0xb6, 0x0d, 0x54, 0x35, - 0x51, 0xb5, 0x29, 0x15, 0x20, 0x45, 0xc6, 0xf8, 0x2c, 0x31, 0x12, 0xae, 0x8d, 0xc8, 0xec, 0xd9, - 0xd7, 0x2c, 0x91, 0xcb, 0xed, 0x98, 0xaf, 0x59, 0xf2, 0x35, 0xe7, 0xe9, 0xdd, 0xb6, 0xaf, 0x39, - 0xef, 0x6b, 0x96, 0xc9, 0x0d, 0x77, 0xdc, 0xd7, 0x2c, 0xfb, 0x9a, 0x15, 0xf2, 0x05, 0x67, 0xcc, - 0xd7, 0xac, 0xf8, 0x9a, 0x0b, 0xe4, 0x9b, 0x4d, 0xc2, 0xd7, 0x5c, 0xf0, 0x35, 0x17, 0xc9, 0xa7, - 0x9a, 0x09, 0x5f, 0x73, 0xd1, 0xd7, 0x5c, 0x22, 0x9f, 0x67, 0x24, 0x5f, 0x73, 0xc9, 0xd7, 0x5c, - 0x26, 0x3f, 0xa8, 0x1a, 0xf5, 0x35, 0x97, 0xa5, 0x19, 0x18, 0xa5, 0x23, 0x7b, 0x86, 0x7c, 0xc3, - 0x1f, 0xbf, 0x36, 0x22, 0x73, 0x41, 0xa0, 0x7b, 0x96, 0xfc, 0x68, 0x2a, 0x15, 0xe8, 0x9e, 0x0d, - 0x74, 0x4b, 0xe4, 0xff, 0x6e, 0x88, 0x81, 0x6e, 0x29, 0xd0, 0x9d, 0x2f, 0x8c, 0xe1, 0xd4, 0x08, - 0x74, 0xe7, 0x03, 0xdd, 0x72, 0x21, 0x8f, 0xe3, 0x1f, 0xe8, 0x96, 0x03, 0xdd, 0x4a, 0x61, 0x7c, - 0x56, 0x98, 0xcf, 0x05, 0xba, 0x15, 0xe9, 0x69, 0xc8, 0xba, 0x9d, 0xba, 0xc2, 0x36, 0x79, 0xf2, - 0xe3, 0xac, 0xec, 0x12, 0x2c, 0xe0, 0x8c, 0x20, 0x93, 0x7a, 0x6d, 0x44, 0x06, 0xb7, 0x53, 0x67, - 0x7b, 0xf0, 0x6a, 0x0e, 0xc8, 0xd5, 0x93, 0x42, 0x7e, 0x53, 0xbd, 0xba, 0xfe, 0xd6, 0xdd, 0xe2, - 0xc8, 0xf7, 0xee, 0x16, 0x47, 0xfe, 0xf5, 0x6e, 0x71, 0xe4, 0xed, 0xbb, 0x45, 0xe1, 0xbd, 0xbb, - 0x45, 0xe1, 0xfd, 0xbb, 0x45, 0xe1, 0xce, 0x51, 0x51, 0xf8, 0xea, 0x51, 0x51, 0xf8, 0xfa, 0x51, - 0x51, 0xf8, 0xd6, 0x51, 0x51, 0x78, 0xeb, 0xa8, 0x28, 0x7c, 0xef, 0xa8, 0x28, 0xbc, 0x7d, 0x54, - 0x14, 0x7e, 0x74, 0x54, 0x1c, 0x79, 0xef, 0xa8, 0x28, 0xbc, 0x7f, 0x54, 0x1c, 0xb9, 0xf3, 0xc3, - 0xe2, 0x48, 0x3d, 0x45, 0xd2, 0xe8, 0xfc, 0x8f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x60, 0x64, - 0x9d, 0x8a, 0x35, 0x00, 0x00, + // 4121 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0xe3, 0xe6, + 0x75, 0x16, 0x78, 0x13, 0x79, 0x48, 0x51, 0x10, 0xa4, 0xd5, 0x72, 0xe5, 0x98, 0xab, 0x95, 0xed, + 0x58, 0xb6, 0x63, 0xc9, 0xd6, 0x4a, 0x7b, 0xe1, 0x36, 0x71, 0x29, 0x89, 0xab, 0x95, 0x2b, 0x89, + 0x0a, 0x28, 0xc5, 0x97, 0x4c, 0x07, 0x03, 0x82, 0x3f, 0x29, 0xec, 0x82, 0x00, 0x02, 0x80, 0xbb, + 0xd6, 0x4e, 0x1f, 0xb6, 0xe3, 0x5e, 0x26, 0xd3, 0xfb, 0x65, 0x26, 0x89, 0xeb, 0xb8, 0x4d, 0x3a, + 0x8d, 0xdd, 0xf4, 0x96, 0xf4, 0x92, 0x26, 0xe9, 0x4b, 0x5f, 0xd2, 0xfa, 0xa9, 0x93, 0xbc, 0xf5, + 0x21, 0x0f, 0x5e, 0xd9, 0x33, 0x4d, 0x5b, 0xb7, 0x75, 0xdb, 0x7d, 0xf0, 0x8c, 0x5f, 0x32, 0xff, + 0x0d, 0x00, 0x2f, 0x5a, 0x50, 0x99, 0xb1, 0xf3, 0xb4, 0xc2, 0x39, 0xe7, 0xfb, 0x70, 0xfe, 0xf3, + 0x9f, 0xff, 0x3f, 0xe7, 0xff, 0xc1, 0x85, 0x37, 0x4b, 0x30, 0xdb, 0xb2, 0xac, 0x96, 0x81, 0x16, + 0x6d, 0xc7, 0xf2, 0xac, 0x7a, 0xa7, 0xb9, 0xd8, 0x40, 0xae, 0xe6, 0xe8, 0xb6, 0x67, 0x39, 0x0b, + 0x44, 0x26, 0x8d, 0x53, 0x8b, 0x05, 0x6e, 0x31, 0xb7, 0x0d, 0x13, 0x57, 0x75, 0x03, 0xad, 0xfb, + 0x86, 0x35, 0xe4, 0x49, 0x97, 0x20, 0xd1, 0xd4, 0x0d, 0x54, 0x10, 0x66, 0xe3, 0xf3, 0xd9, 0xa5, + 0x87, 0x17, 0x7a, 0x40, 0x0b, 0xdd, 0x88, 0x5d, 0x2c, 0x96, 0x09, 0x62, 0xee, 0x9d, 0x04, 0x4c, + 0x0e, 0xd0, 0x4a, 0x12, 0x24, 0x4c, 0xb5, 0x8d, 0x19, 0x85, 0xf9, 0x8c, 0x4c, 0xfe, 0x96, 0x0a, + 0x30, 0x6a, 0xab, 0xda, 0x0d, 0xb5, 0x85, 0x0a, 0x31, 0x22, 0xe6, 0x8f, 0x52, 0x11, 0xa0, 0x81, + 0x6c, 0x64, 0x36, 0x90, 0xa9, 0x1d, 0x16, 0xe2, 0xb3, 0xf1, 0xf9, 0x8c, 0x1c, 0x92, 0x48, 0x4f, + 0xc0, 0x84, 0xdd, 0xa9, 0x1b, 0xba, 0xa6, 0x84, 0xcc, 0x60, 0x36, 0x3e, 0x9f, 0x94, 0x45, 0xaa, + 0x58, 0x0f, 0x8c, 0x1f, 0x85, 0xf1, 0x5b, 0x48, 0xbd, 0x11, 0x36, 0xcd, 0x12, 0xd3, 0x3c, 0x16, + 0x87, 0x0c, 0xd7, 0x20, 0xd7, 0x46, 0xae, 0xab, 0xb6, 0x90, 0xe2, 0x1d, 0xda, 0xa8, 0x90, 0x20, + 0xa3, 0x9f, 0xed, 0x1b, 0x7d, 0xef, 0xc8, 0xb3, 0x0c, 0xb5, 0x77, 0x68, 0x23, 0xa9, 0x0c, 0x19, + 0x64, 0x76, 0xda, 0x94, 0x21, 0x79, 0x4c, 0xfc, 0x2a, 0x66, 0xa7, 0xdd, 0xcb, 0x92, 0xc6, 0x30, + 0x46, 0x31, 0xea, 0x22, 0xe7, 0xa6, 0xae, 0xa1, 0x42, 0x8a, 0x10, 0x3c, 0xda, 0x47, 0x50, 0xa3, + 0xfa, 0x5e, 0x0e, 0x8e, 0x93, 0xd6, 0x20, 0x83, 0x5e, 0xf2, 0x90, 0xe9, 0xea, 0x96, 0x59, 0x18, + 0x25, 0x24, 0x8f, 0x0c, 0x98, 0x45, 0x64, 0x34, 0x7a, 0x29, 0x02, 0x9c, 0x74, 0x01, 0x46, 0x2d, + 0xdb, 0xd3, 0x2d, 0xd3, 0x2d, 0xa4, 0x67, 0x85, 0xf9, 0xec, 0xd2, 0xc7, 0x06, 0x26, 0x42, 0x95, + 0xda, 0xc8, 0xdc, 0x58, 0xda, 0x04, 0xd1, 0xb5, 0x3a, 0x8e, 0x86, 0x14, 0xcd, 0x6a, 0x20, 0x45, + 0x37, 0x9b, 0x56, 0x21, 0x43, 0x08, 0xce, 0xf6, 0x0f, 0x84, 0x18, 0xae, 0x59, 0x0d, 0xb4, 0x69, + 0x36, 0x2d, 0x39, 0xef, 0x76, 0x3d, 0x4b, 0xd3, 0x90, 0x72, 0x0f, 0x4d, 0x4f, 0x7d, 0xa9, 0x90, + 0x23, 0x19, 0xc2, 0x9e, 0xe6, 0xbe, 0x93, 0x82, 0xf1, 0x61, 0x52, 0xec, 0x0a, 0x24, 0x9b, 0x78, + 0x94, 0x85, 0xd8, 0x49, 0x62, 0x40, 0x31, 0xdd, 0x41, 0x4c, 0xfd, 0x84, 0x41, 0x2c, 0x43, 0xd6, + 0x44, 0xae, 0x87, 0x1a, 0x34, 0x23, 0xe2, 0x43, 0xe6, 0x14, 0x50, 0x50, 0x7f, 0x4a, 0x25, 0x7e, + 0xa2, 0x94, 0x7a, 0x1e, 0xc6, 0x7d, 0x97, 0x14, 0x47, 0x35, 0x5b, 0x3c, 0x37, 0x17, 0xa3, 0x3c, + 0x59, 0xa8, 0x70, 0x9c, 0x8c, 0x61, 0x72, 0x1e, 0x75, 0x3d, 0x4b, 0xeb, 0x00, 0x96, 0x89, 0xac, + 0xa6, 0xd2, 0x40, 0x9a, 0x51, 0x48, 0x1f, 0x13, 0xa5, 0x2a, 0x36, 0xe9, 0x8b, 0x92, 0x45, 0xa5, + 0x9a, 0x21, 0x5d, 0x0e, 0x52, 0x6d, 0xf4, 0x98, 0x4c, 0xd9, 0xa6, 0x8b, 0xac, 0x2f, 0xdb, 0xf6, + 0x21, 0xef, 0x20, 0x9c, 0xf7, 0xa8, 0xc1, 0x46, 0x96, 0x21, 0x4e, 0x2c, 0x44, 0x8e, 0x4c, 0x66, + 0x30, 0x3a, 0xb0, 0x31, 0x27, 0xfc, 0x28, 0x3d, 0x04, 0xbe, 0x40, 0x21, 0x69, 0x05, 0x64, 0x17, + 0xca, 0x71, 0xe1, 0x8e, 0xda, 0x46, 0x33, 0xb7, 0x21, 0xdf, 0x1d, 0x1e, 0x69, 0x0a, 0x92, 0xae, + 0xa7, 0x3a, 0x1e, 0xc9, 0xc2, 0xa4, 0x4c, 0x1f, 0x24, 0x11, 0xe2, 0xc8, 0x6c, 0x90, 0x5d, 0x2e, + 0x29, 0xe3, 0x3f, 0xa5, 0x9f, 0x0d, 0x06, 0x1c, 0x27, 0x03, 0xfe, 0x78, 0xff, 0x8c, 0x76, 0x31, + 0xf7, 0x8e, 0x7b, 0xe6, 0x22, 0x8c, 0x75, 0x0d, 0x60, 0xd8, 0x57, 0xcf, 0xfd, 0x02, 0x9c, 0x1a, + 0x48, 0x2d, 0x3d, 0x0f, 0x53, 0x1d, 0x53, 0x37, 0x3d, 0xe4, 0xd8, 0x0e, 0xc2, 0x19, 0x4b, 0x5f, + 0x55, 0xf8, 0xb7, 0xd1, 0x63, 0x72, 0x6e, 0x3f, 0x6c, 0x4d, 0x59, 0xe4, 0xc9, 0x4e, 0xbf, 0xf0, + 0xf1, 0x4c, 0xfa, 0x47, 0xa3, 0xe2, 0x9d, 0x3b, 0x77, 0xee, 0xc4, 0xe6, 0xbe, 0x98, 0x82, 0xa9, + 0x41, 0x6b, 0x66, 0xe0, 0xf2, 0x9d, 0x86, 0x94, 0xd9, 0x69, 0xd7, 0x91, 0x43, 0x82, 0x94, 0x94, + 0xd9, 0x93, 0x54, 0x86, 0xa4, 0xa1, 0xd6, 0x91, 0x51, 0x48, 0xcc, 0x0a, 0xf3, 0xf9, 0xa5, 0x27, + 0x86, 0x5a, 0x95, 0x0b, 0x5b, 0x18, 0x22, 0x53, 0xa4, 0xf4, 0x29, 0x48, 0xb0, 0x2d, 0x1a, 0x33, + 0x3c, 0x3e, 0x1c, 0x03, 0x5e, 0x4b, 0x32, 0xc1, 0x49, 0x0f, 0x40, 0x06, 0xff, 0x4b, 0x73, 0x23, + 0x45, 0x7c, 0x4e, 0x63, 0x01, 0xce, 0x0b, 0x69, 0x06, 0xd2, 0x64, 0x99, 0x34, 0x10, 0x2f, 0x6d, + 0xfe, 0x33, 0x4e, 0xac, 0x06, 0x6a, 0xaa, 0x1d, 0xc3, 0x53, 0x6e, 0xaa, 0x46, 0x07, 0x91, 0x84, + 0xcf, 0xc8, 0x39, 0x26, 0xfc, 0x0c, 0x96, 0x49, 0x67, 0x21, 0x4b, 0x57, 0x95, 0x6e, 0x36, 0xd0, + 0x4b, 0x64, 0xf7, 0x4c, 0xca, 0x74, 0xa1, 0x6d, 0x62, 0x09, 0x7e, 0xfd, 0x75, 0xd7, 0x32, 0x79, + 0x6a, 0x92, 0x57, 0x60, 0x01, 0x79, 0xfd, 0xc5, 0xde, 0x8d, 0xfb, 0xc1, 0xc1, 0xc3, 0xeb, 0xcd, + 0xa9, 0xb9, 0x6f, 0xc5, 0x20, 0x41, 0xf6, 0x8b, 0x71, 0xc8, 0xee, 0xbd, 0xb0, 0x5b, 0x51, 0xd6, + 0xab, 0xfb, 0xab, 0x5b, 0x15, 0x51, 0x90, 0xf2, 0x00, 0x44, 0x70, 0x75, 0xab, 0x5a, 0xde, 0x13, + 0x63, 0xfe, 0xf3, 0xe6, 0xce, 0xde, 0x85, 0x65, 0x31, 0xee, 0x03, 0xf6, 0xa9, 0x20, 0x11, 0x36, + 0x38, 0xbf, 0x24, 0x26, 0x25, 0x11, 0x72, 0x94, 0x60, 0xf3, 0xf9, 0xca, 0xfa, 0x85, 0x65, 0x31, + 0xd5, 0x2d, 0x39, 0xbf, 0x24, 0x8e, 0x4a, 0x63, 0x90, 0x21, 0x92, 0xd5, 0x6a, 0x75, 0x4b, 0x4c, + 0xfb, 0x9c, 0xb5, 0x3d, 0x79, 0x73, 0x67, 0x43, 0xcc, 0xf8, 0x9c, 0x1b, 0x72, 0x75, 0x7f, 0x57, + 0x04, 0x9f, 0x61, 0xbb, 0x52, 0xab, 0x95, 0x37, 0x2a, 0x62, 0xd6, 0xb7, 0x58, 0x7d, 0x61, 0xaf, + 0x52, 0x13, 0x73, 0x5d, 0x6e, 0x9d, 0x5f, 0x12, 0xc7, 0xfc, 0x57, 0x54, 0x76, 0xf6, 0xb7, 0xc5, + 0xbc, 0x34, 0x01, 0x63, 0xf4, 0x15, 0xdc, 0x89, 0xf1, 0x1e, 0xd1, 0x85, 0x65, 0x51, 0x0c, 0x1c, + 0xa1, 0x2c, 0x13, 0x5d, 0x82, 0x0b, 0xcb, 0xa2, 0x34, 0xb7, 0x06, 0x49, 0x92, 0x5d, 0x92, 0x04, + 0xf9, 0xad, 0xf2, 0x6a, 0x65, 0x4b, 0xa9, 0xee, 0xee, 0x6d, 0x56, 0x77, 0xca, 0x5b, 0xa2, 0x10, + 0xc8, 0xe4, 0xca, 0xa7, 0xf7, 0x37, 0xe5, 0xca, 0xba, 0x18, 0x0b, 0xcb, 0x76, 0x2b, 0xe5, 0xbd, + 0xca, 0xba, 0x18, 0x9f, 0xd3, 0x60, 0x6a, 0xd0, 0x3e, 0x39, 0x70, 0x65, 0x84, 0xa6, 0x38, 0x76, + 0xcc, 0x14, 0x13, 0xae, 0xbe, 0x29, 0x7e, 0x3b, 0x06, 0x93, 0x03, 0x6a, 0xc5, 0xc0, 0x97, 0x3c, + 0x03, 0x49, 0x9a, 0xa2, 0xb4, 0x7a, 0x3e, 0x36, 0xb0, 0xe8, 0x90, 0x84, 0xed, 0xab, 0xa0, 0x04, + 0x17, 0xee, 0x20, 0xe2, 0xc7, 0x74, 0x10, 0x98, 0xa2, 0x6f, 0x4f, 0xff, 0xf9, 0xbe, 0x3d, 0x9d, + 0x96, 0xbd, 0x0b, 0xc3, 0x94, 0x3d, 0x22, 0x3b, 0xd9, 0xde, 0x9e, 0x1c, 0xb0, 0xb7, 0x5f, 0x81, + 0x89, 0x3e, 0xa2, 0xa1, 0xf7, 0xd8, 0x97, 0x05, 0x28, 0x1c, 0x17, 0x9c, 0x88, 0x9d, 0x2e, 0xd6, + 0xb5, 0xd3, 0x5d, 0xe9, 0x8d, 0xe0, 0xb9, 0xe3, 0x27, 0xa1, 0x6f, 0xae, 0x5f, 0x17, 0x60, 0x7a, + 0x70, 0xa7, 0x38, 0xd0, 0x87, 0x4f, 0x41, 0xaa, 0x8d, 0xbc, 0x03, 0x8b, 0x77, 0x4b, 0x1f, 0x1f, + 0x50, 0x83, 0xb1, 0xba, 0x77, 0xb2, 0x19, 0x2a, 0x5c, 0xc4, 0xe3, 0xc7, 0xb5, 0x7b, 0xd4, 0x9b, + 0x3e, 0x4f, 0x3f, 0x1f, 0x83, 0x53, 0x03, 0xc9, 0x07, 0x3a, 0xfa, 0x20, 0x80, 0x6e, 0xda, 0x1d, + 0x8f, 0x76, 0x44, 0x74, 0x83, 0xcd, 0x10, 0x09, 0xd9, 0xbc, 0xf0, 0xe6, 0xd9, 0xf1, 0x7c, 0x7d, + 0x9c, 0xe8, 0x81, 0x8a, 0x88, 0xc1, 0xa5, 0xc0, 0xd1, 0x04, 0x71, 0xb4, 0x78, 0xcc, 0x48, 0xfb, + 0x12, 0xf3, 0x29, 0x10, 0x35, 0x43, 0x47, 0xa6, 0xa7, 0xb8, 0x9e, 0x83, 0xd4, 0xb6, 0x6e, 0xb6, + 0x48, 0x05, 0x49, 0x97, 0x92, 0x4d, 0xd5, 0x70, 0x91, 0x3c, 0x4e, 0xd5, 0x35, 0xae, 0xc5, 0x08, + 0x92, 0x40, 0x4e, 0x08, 0x91, 0xea, 0x42, 0x50, 0xb5, 0x8f, 0x98, 0xfb, 0xf5, 0x0c, 0x64, 0x43, + 0x7d, 0xb5, 0x74, 0x0e, 0x72, 0xd7, 0xd5, 0x9b, 0xaa, 0xc2, 0xcf, 0x4a, 0x34, 0x12, 0x59, 0x2c, + 0xdb, 0x65, 0xe7, 0xa5, 0xa7, 0x60, 0x8a, 0x98, 0x58, 0x1d, 0x0f, 0x39, 0x8a, 0x66, 0xa8, 0xae, + 0x4b, 0x82, 0x96, 0x26, 0xa6, 0x12, 0xd6, 0x55, 0xb1, 0x6a, 0x8d, 0x6b, 0xa4, 0x15, 0x98, 0x24, + 0x88, 0x76, 0xc7, 0xf0, 0x74, 0xdb, 0x40, 0x0a, 0x3e, 0xbd, 0xb9, 0xa4, 0x92, 0xf8, 0x9e, 0x4d, + 0x60, 0x8b, 0x6d, 0x66, 0x80, 0x3d, 0x72, 0xa5, 0x75, 0x78, 0x90, 0xc0, 0x5a, 0xc8, 0x44, 0x8e, + 0xea, 0x21, 0x05, 0x7d, 0xae, 0xa3, 0x1a, 0xae, 0xa2, 0x9a, 0x0d, 0xe5, 0x40, 0x75, 0x0f, 0x0a, + 0x53, 0x98, 0x60, 0x35, 0x56, 0x10, 0xe4, 0x33, 0xd8, 0x70, 0x83, 0xd9, 0x55, 0x88, 0x59, 0xd9, + 0x6c, 0x5c, 0x53, 0xdd, 0x03, 0xa9, 0x04, 0xd3, 0x84, 0xc5, 0xf5, 0x1c, 0xdd, 0x6c, 0x29, 0xda, + 0x01, 0xd2, 0x6e, 0x28, 0x1d, 0xaf, 0x79, 0xa9, 0xf0, 0x40, 0xf8, 0xfd, 0xc4, 0xc3, 0x1a, 0xb1, + 0x59, 0xc3, 0x26, 0xfb, 0x5e, 0xf3, 0x92, 0x54, 0x83, 0x1c, 0x9e, 0x8c, 0xb6, 0x7e, 0x1b, 0x29, + 0x4d, 0xcb, 0x21, 0xa5, 0x31, 0x3f, 0x60, 0x6b, 0x0a, 0x45, 0x70, 0xa1, 0xca, 0x00, 0xdb, 0x56, + 0x03, 0x95, 0x92, 0xb5, 0xdd, 0x4a, 0x65, 0x5d, 0xce, 0x72, 0x96, 0xab, 0x96, 0x83, 0x13, 0xaa, + 0x65, 0xf9, 0x01, 0xce, 0xd2, 0x84, 0x6a, 0x59, 0x3c, 0xbc, 0x2b, 0x30, 0xa9, 0x69, 0x74, 0xcc, + 0xba, 0xa6, 0xb0, 0x33, 0x96, 0x5b, 0x10, 0xbb, 0x82, 0xa5, 0x69, 0x1b, 0xd4, 0x80, 0xe5, 0xb8, + 0x2b, 0x5d, 0x86, 0x53, 0x41, 0xb0, 0xc2, 0xc0, 0x89, 0xbe, 0x51, 0xf6, 0x42, 0x57, 0x60, 0xd2, + 0x3e, 0xec, 0x07, 0x4a, 0x5d, 0x6f, 0xb4, 0x0f, 0x7b, 0x61, 0x17, 0x61, 0xca, 0x3e, 0xb0, 0xfb, + 0x71, 0x8f, 0x87, 0x71, 0x92, 0x7d, 0x60, 0xf7, 0x02, 0x1f, 0x21, 0x07, 0x6e, 0x07, 0x69, 0xaa, + 0x87, 0x1a, 0x85, 0xd3, 0x61, 0xf3, 0x90, 0x42, 0x5a, 0x04, 0x51, 0xd3, 0x14, 0x64, 0xaa, 0x75, + 0x03, 0x29, 0xaa, 0x83, 0x4c, 0xd5, 0x2d, 0x9c, 0x0d, 0x1b, 0xe7, 0x35, 0xad, 0x42, 0xb4, 0x65, + 0xa2, 0x94, 0x1e, 0x87, 0x09, 0xab, 0x7e, 0x5d, 0xa3, 0x29, 0xa9, 0xd8, 0x0e, 0x6a, 0xea, 0x2f, + 0x15, 0x1e, 0x26, 0xf1, 0x1d, 0xc7, 0x0a, 0x92, 0x90, 0xbb, 0x44, 0x2c, 0x3d, 0x06, 0xa2, 0xe6, + 0x1e, 0xa8, 0x8e, 0x4d, 0xf6, 0x64, 0xd7, 0x56, 0x35, 0x54, 0x78, 0x84, 0x9a, 0x52, 0xf9, 0x0e, + 0x17, 0xe3, 0x25, 0xe1, 0xde, 0xd2, 0x9b, 0x1e, 0x67, 0x7c, 0x94, 0x2e, 0x09, 0x22, 0x63, 0x6c, + 0xf3, 0x20, 0xe2, 0x50, 0x74, 0xbd, 0x78, 0x9e, 0x98, 0xe5, 0xed, 0x03, 0x3b, 0xfc, 0xde, 0x87, + 0x60, 0x0c, 0x5b, 0x06, 0x2f, 0x7d, 0x8c, 0x36, 0x64, 0xf6, 0x41, 0xe8, 0x8d, 0xcb, 0x30, 0x8d, + 0x8d, 0xda, 0xc8, 0x53, 0x1b, 0xaa, 0xa7, 0x86, 0xac, 0x3f, 0x41, 0xac, 0x71, 0xdc, 0xb7, 0x99, + 0xb2, 0xcb, 0x4f, 0xa7, 0x53, 0x3f, 0xf4, 0x33, 0xeb, 0x49, 0xea, 0x27, 0x96, 0xf1, 0xdc, 0xfa, + 0xd0, 0x9a, 0xee, 0xb9, 0x12, 0xe4, 0xc2, 0x89, 0x2f, 0x65, 0x80, 0xa6, 0xbe, 0x28, 0xe0, 0x2e, + 0x68, 0xad, 0xba, 0x8e, 0xfb, 0x97, 0x17, 0x2b, 0x62, 0x0c, 0xf7, 0x51, 0x5b, 0x9b, 0x7b, 0x15, + 0x45, 0xde, 0xdf, 0xd9, 0xdb, 0xdc, 0xae, 0x88, 0xf1, 0x70, 0xc3, 0xfe, 0xbd, 0x18, 0xe4, 0xbb, + 0xcf, 0x5e, 0xd2, 0xcf, 0xc0, 0x69, 0x7e, 0x51, 0xe2, 0x22, 0x4f, 0xb9, 0xa5, 0x3b, 0x64, 0x2d, + 0xb6, 0x55, 0x5a, 0x17, 0xfd, 0x6c, 0x98, 0x62, 0x56, 0x35, 0xe4, 0x3d, 0xa7, 0x3b, 0x78, 0xa5, + 0xb5, 0x55, 0x4f, 0xda, 0x82, 0xb3, 0xa6, 0xa5, 0xb8, 0x9e, 0x6a, 0x36, 0x54, 0xa7, 0xa1, 0x04, + 0x57, 0x54, 0x8a, 0xaa, 0x69, 0xc8, 0x75, 0x2d, 0x5a, 0x03, 0x7d, 0x96, 0x8f, 0x99, 0x56, 0x8d, + 0x19, 0x07, 0xc5, 0xa1, 0xcc, 0x4c, 0x7b, 0x32, 0x37, 0x7e, 0x5c, 0xe6, 0x3e, 0x00, 0x99, 0xb6, + 0x6a, 0x2b, 0xc8, 0xf4, 0x9c, 0x43, 0xd2, 0x71, 0xa7, 0xe5, 0x74, 0x5b, 0xb5, 0x2b, 0xf8, 0xf9, + 0xa3, 0x39, 0xf8, 0xfc, 0x30, 0x0e, 0xb9, 0x70, 0xd7, 0x8d, 0x0f, 0x31, 0x1a, 0x29, 0x50, 0x02, + 0xd9, 0xc2, 0x1e, 0xba, 0x6f, 0x8f, 0xbe, 0xb0, 0x86, 0x2b, 0x57, 0x29, 0x45, 0x7b, 0x61, 0x99, + 0x22, 0x71, 0xd7, 0x80, 0x53, 0x0b, 0xd1, 0xde, 0x23, 0x2d, 0xb3, 0x27, 0x69, 0x03, 0x52, 0xd7, + 0x5d, 0xc2, 0x9d, 0x22, 0xdc, 0x0f, 0xdf, 0x9f, 0xfb, 0xd9, 0x1a, 0x21, 0xcf, 0x3c, 0x5b, 0x53, + 0x76, 0xaa, 0xf2, 0x76, 0x79, 0x4b, 0x66, 0x70, 0xe9, 0x0c, 0x24, 0x0c, 0xf5, 0xf6, 0x61, 0x77, + 0x8d, 0x23, 0xa2, 0x61, 0x03, 0x7f, 0x06, 0x12, 0xb7, 0x90, 0x7a, 0xa3, 0xbb, 0xb2, 0x10, 0xd1, + 0x87, 0x98, 0xfa, 0x8b, 0x90, 0x24, 0xf1, 0x92, 0x00, 0x58, 0xc4, 0xc4, 0x11, 0x29, 0x0d, 0x89, + 0xb5, 0xaa, 0x8c, 0xd3, 0x5f, 0x84, 0x1c, 0x95, 0x2a, 0xbb, 0x9b, 0x95, 0xb5, 0x8a, 0x18, 0x9b, + 0x5b, 0x81, 0x14, 0x0d, 0x02, 0x5e, 0x1a, 0x7e, 0x18, 0xc4, 0x11, 0xf6, 0xc8, 0x38, 0x04, 0xae, + 0xdd, 0xdf, 0x5e, 0xad, 0xc8, 0x62, 0x2c, 0x3c, 0xbd, 0x2e, 0xe4, 0xc2, 0x0d, 0xf7, 0x47, 0x93, + 0x53, 0xdf, 0x15, 0x20, 0x1b, 0x6a, 0xa0, 0x71, 0xe7, 0xa3, 0x1a, 0x86, 0x75, 0x4b, 0x51, 0x0d, + 0x5d, 0x75, 0x59, 0x52, 0x00, 0x11, 0x95, 0xb1, 0x64, 0xd8, 0x49, 0xfb, 0x48, 0x9c, 0x7f, 0x4d, + 0x00, 0xb1, 0xb7, 0x77, 0xed, 0x71, 0x50, 0xf8, 0xa9, 0x3a, 0xf8, 0xaa, 0x00, 0xf9, 0xee, 0x86, + 0xb5, 0xc7, 0xbd, 0x73, 0x3f, 0x55, 0xf7, 0xde, 0x8a, 0xc1, 0x58, 0x57, 0x9b, 0x3a, 0xac, 0x77, + 0x9f, 0x83, 0x09, 0xbd, 0x81, 0xda, 0xb6, 0xe5, 0x21, 0x53, 0x3b, 0x54, 0x0c, 0x74, 0x13, 0x19, + 0x85, 0x39, 0xb2, 0x51, 0x2c, 0xde, 0xbf, 0x11, 0x5e, 0xd8, 0x0c, 0x70, 0x5b, 0x18, 0x56, 0x9a, + 0xdc, 0x5c, 0xaf, 0x6c, 0xef, 0x56, 0xf7, 0x2a, 0x3b, 0x6b, 0x2f, 0x28, 0xfb, 0x3b, 0x3f, 0xb7, + 0x53, 0x7d, 0x6e, 0x47, 0x16, 0xf5, 0x1e, 0xb3, 0x0f, 0x71, 0xa9, 0xef, 0x82, 0xd8, 0xeb, 0x94, + 0x74, 0x1a, 0x06, 0xb9, 0x25, 0x8e, 0x48, 0x93, 0x30, 0xbe, 0x53, 0x55, 0x6a, 0x9b, 0xeb, 0x15, + 0xa5, 0x72, 0xf5, 0x6a, 0x65, 0x6d, 0xaf, 0x46, 0xaf, 0x36, 0x7c, 0xeb, 0xbd, 0xee, 0x45, 0xfd, + 0x4a, 0x1c, 0x26, 0x07, 0x78, 0x22, 0x95, 0xd9, 0xa1, 0x84, 0x9e, 0x93, 0x9e, 0x1c, 0xc6, 0xfb, + 0x05, 0xdc, 0x15, 0xec, 0xaa, 0x8e, 0xc7, 0xce, 0x30, 0x8f, 0x01, 0x8e, 0x92, 0xe9, 0xe9, 0x4d, + 0x1d, 0x39, 0xec, 0x26, 0x88, 0x9e, 0x54, 0xc6, 0x03, 0x39, 0xbd, 0x0c, 0xfa, 0x04, 0x48, 0xb6, + 0xe5, 0xea, 0x9e, 0x7e, 0x13, 0x29, 0xba, 0xc9, 0xaf, 0x8d, 0xf0, 0xc9, 0x25, 0x21, 0x8b, 0x5c, + 0xb3, 0x69, 0x7a, 0xbe, 0xb5, 0x89, 0x5a, 0x6a, 0x8f, 0x35, 0xde, 0xc0, 0xe3, 0xb2, 0xc8, 0x35, + 0xbe, 0xf5, 0x39, 0xc8, 0x35, 0xac, 0x0e, 0x6e, 0xe7, 0xa8, 0x1d, 0xae, 0x17, 0x82, 0x9c, 0xa5, + 0x32, 0xdf, 0x84, 0x35, 0xea, 0xc1, 0x7d, 0x55, 0x4e, 0xce, 0x52, 0x19, 0x35, 0x79, 0x14, 0xc6, + 0xd5, 0x56, 0xcb, 0xc1, 0xe4, 0x9c, 0x88, 0x1e, 0x3d, 0xf2, 0xbe, 0x98, 0x18, 0xce, 0x3c, 0x0b, + 0x69, 0x1e, 0x07, 0x5c, 0x92, 0x71, 0x24, 0x14, 0x9b, 0x9e, 0xa7, 0x63, 0xf3, 0x19, 0x39, 0x6d, + 0x72, 0xe5, 0x39, 0xc8, 0xe9, 0xae, 0x12, 0x5c, 0xbf, 0xc7, 0x66, 0x63, 0xf3, 0x69, 0x39, 0xab, + 0xbb, 0xfe, 0xd5, 0xe5, 0xdc, 0xeb, 0x31, 0xc8, 0x77, 0x7f, 0x3e, 0x90, 0xd6, 0x21, 0x6d, 0x58, + 0x9a, 0x4a, 0x52, 0x8b, 0x7e, 0xbb, 0x9a, 0x8f, 0xf8, 0xe2, 0xb0, 0xb0, 0xc5, 0xec, 0x65, 0x1f, + 0x39, 0xf3, 0x2f, 0x02, 0xa4, 0xb9, 0x58, 0x9a, 0x86, 0x84, 0xad, 0x7a, 0x07, 0x84, 0x2e, 0xb9, + 0x1a, 0x13, 0x05, 0x99, 0x3c, 0x63, 0xb9, 0x6b, 0xab, 0x26, 0x49, 0x01, 0x26, 0xc7, 0xcf, 0x78, + 0x5e, 0x0d, 0xa4, 0x36, 0xc8, 0xb9, 0xc6, 0x6a, 0xb7, 0x91, 0xe9, 0xb9, 0x7c, 0x5e, 0x99, 0x7c, + 0x8d, 0x89, 0xa5, 0x27, 0x60, 0xc2, 0x73, 0x54, 0xdd, 0xe8, 0xb2, 0x4d, 0x10, 0x5b, 0x91, 0x2b, + 0x7c, 0xe3, 0x12, 0x9c, 0xe1, 0xbc, 0x0d, 0xe4, 0xa9, 0xda, 0x01, 0x6a, 0x04, 0xa0, 0x14, 0xb9, + 0xbf, 0x38, 0xcd, 0x0c, 0xd6, 0x99, 0x9e, 0x63, 0xe7, 0x7e, 0x20, 0xc0, 0x04, 0x3f, 0x89, 0x35, + 0xfc, 0x60, 0x6d, 0x03, 0xa8, 0xa6, 0x69, 0x79, 0xe1, 0x70, 0xf5, 0xa7, 0x72, 0x1f, 0x6e, 0xa1, + 0xec, 0x83, 0xe4, 0x10, 0xc1, 0x4c, 0x1b, 0x20, 0xd0, 0x1c, 0x1b, 0xb6, 0xb3, 0x90, 0x65, 0xdf, + 0x86, 0xc8, 0x07, 0x46, 0x7a, 0x76, 0x07, 0x2a, 0xc2, 0x47, 0x36, 0x69, 0x0a, 0x92, 0x75, 0xd4, + 0xd2, 0x4d, 0x76, 0xe3, 0x4b, 0x1f, 0xf8, 0x0d, 0x4b, 0xc2, 0xbf, 0x61, 0x59, 0xfd, 0x2c, 0x4c, + 0x6a, 0x56, 0xbb, 0xd7, 0xdd, 0x55, 0xb1, 0xe7, 0xfe, 0xc0, 0xbd, 0x26, 0xbc, 0x08, 0x41, 0x8b, + 0xf9, 0xbe, 0x20, 0x7c, 0x35, 0x16, 0xdf, 0xd8, 0x5d, 0xfd, 0x7a, 0x6c, 0x66, 0x83, 0x42, 0x77, + 0xf9, 0x48, 0x65, 0xd4, 0x34, 0x90, 0x86, 0xbd, 0x87, 0xaf, 0x3d, 0x01, 0x4f, 0xb6, 0x74, 0xef, + 0xa0, 0x53, 0x5f, 0xd0, 0xac, 0xf6, 0x62, 0xcb, 0x6a, 0x59, 0xc1, 0x37, 0x55, 0xfc, 0x44, 0x1e, + 0xc8, 0x5f, 0xec, 0xbb, 0x6a, 0xc6, 0x97, 0xce, 0x44, 0x7e, 0x84, 0x2d, 0xed, 0xc0, 0x24, 0x33, + 0x56, 0xc8, 0x87, 0x1d, 0x7a, 0x3c, 0x91, 0xee, 0x7b, 0x39, 0x56, 0xf8, 0xe6, 0x3b, 0xa4, 0x5c, + 0xcb, 0x13, 0x0c, 0x8a, 0x75, 0xf4, 0x04, 0x53, 0x92, 0xe1, 0x54, 0x17, 0x1f, 0x5d, 0x9a, 0xc8, + 0x89, 0x60, 0xfc, 0x1e, 0x63, 0x9c, 0x0c, 0x31, 0xd6, 0x18, 0xb4, 0xb4, 0x06, 0x63, 0x27, 0xe1, + 0xfa, 0x27, 0xc6, 0x95, 0x43, 0x61, 0x92, 0x0d, 0x18, 0x27, 0x24, 0x5a, 0xc7, 0xf5, 0xac, 0x36, + 0xd9, 0xf7, 0xee, 0x4f, 0xf3, 0xcf, 0xef, 0xd0, 0xb5, 0x92, 0xc7, 0xb0, 0x35, 0x1f, 0x55, 0x2a, + 0x01, 0xf9, 0x96, 0xd5, 0x40, 0x9a, 0x11, 0xc1, 0xf0, 0x26, 0x73, 0xc4, 0xb7, 0x2f, 0x7d, 0x06, + 0xa6, 0xf0, 0xdf, 0x64, 0x5b, 0x0a, 0x7b, 0x12, 0x7d, 0x93, 0x56, 0xf8, 0xc1, 0xcb, 0x74, 0x39, + 0x4e, 0xfa, 0x04, 0x21, 0x9f, 0x42, 0xb3, 0xd8, 0x42, 0x9e, 0x87, 0x1c, 0x57, 0x51, 0x8d, 0x41, + 0xee, 0x85, 0xae, 0x22, 0x0a, 0x5f, 0x7a, 0xb7, 0x7b, 0x16, 0x37, 0x28, 0xb2, 0x6c, 0x18, 0xa5, + 0x7d, 0x38, 0x3d, 0x20, 0x2b, 0x86, 0xe0, 0x7c, 0x85, 0x71, 0x4e, 0xf5, 0x65, 0x06, 0xa6, 0xdd, + 0x05, 0x2e, 0xf7, 0xe7, 0x72, 0x08, 0xce, 0x3f, 0x60, 0x9c, 0x12, 0xc3, 0xf2, 0x29, 0xc5, 0x8c, + 0xcf, 0xc2, 0xc4, 0x4d, 0xe4, 0xd4, 0x2d, 0x97, 0x5d, 0xff, 0x0c, 0x41, 0xf7, 0x2a, 0xa3, 0x1b, + 0x67, 0x40, 0x72, 0x1f, 0x84, 0xb9, 0x2e, 0x43, 0xba, 0xa9, 0x6a, 0x68, 0x08, 0x8a, 0x2f, 0x33, + 0x8a, 0x51, 0x6c, 0x8f, 0xa1, 0x65, 0xc8, 0xb5, 0x2c, 0x56, 0x99, 0xa2, 0xe1, 0xaf, 0x31, 0x78, + 0x96, 0x63, 0x18, 0x85, 0x6d, 0xd9, 0x1d, 0x03, 0x97, 0xad, 0x68, 0x8a, 0x3f, 0xe4, 0x14, 0x1c, + 0xc3, 0x28, 0x4e, 0x10, 0xd6, 0x3f, 0xe2, 0x14, 0x6e, 0x28, 0x9e, 0xcf, 0x40, 0xd6, 0x32, 0x8d, + 0x43, 0xcb, 0x1c, 0xc6, 0x89, 0xaf, 0x30, 0x06, 0x60, 0x10, 0x4c, 0x70, 0x05, 0x32, 0xc3, 0x4e, + 0xc4, 0x9f, 0xbc, 0xcb, 0x97, 0x07, 0x9f, 0x81, 0x0d, 0x18, 0xe7, 0x1b, 0x94, 0x6e, 0x99, 0x43, + 0x50, 0x7c, 0x8d, 0x51, 0xe4, 0x43, 0x30, 0x36, 0x0c, 0x0f, 0xb9, 0x5e, 0x0b, 0x0d, 0x43, 0xf2, + 0x3a, 0x1f, 0x06, 0x83, 0xb0, 0x50, 0xd6, 0x91, 0xa9, 0x1d, 0x0c, 0xc7, 0xf0, 0x06, 0x0f, 0x25, + 0xc7, 0x60, 0x8a, 0x35, 0x18, 0x6b, 0xab, 0x8e, 0x7b, 0xa0, 0x1a, 0x43, 0x4d, 0xc7, 0x9f, 0x32, + 0x8e, 0x9c, 0x0f, 0x62, 0x11, 0xe9, 0x98, 0x27, 0xa1, 0xf9, 0x3a, 0x8f, 0x48, 0x08, 0xc6, 0x96, + 0x9e, 0xeb, 0x91, 0xbb, 0xb2, 0x93, 0xb0, 0xfd, 0x19, 0x5f, 0x7a, 0x14, 0xbb, 0x1d, 0x66, 0xbc, + 0x02, 0x19, 0x57, 0xbf, 0x3d, 0x14, 0xcd, 0x9f, 0xf3, 0x99, 0x26, 0x00, 0x0c, 0x7e, 0x01, 0xce, + 0x0c, 0x2c, 0x13, 0x43, 0x90, 0xfd, 0x05, 0x23, 0x9b, 0x1e, 0x50, 0x2a, 0xd8, 0x96, 0x70, 0x52, + 0xca, 0xbf, 0xe4, 0x5b, 0x02, 0xea, 0xe1, 0xda, 0xc5, 0x67, 0x05, 0x57, 0x6d, 0x9e, 0x2c, 0x6a, + 0x7f, 0xc5, 0xa3, 0x46, 0xb1, 0x5d, 0x51, 0xdb, 0x83, 0x69, 0xc6, 0x78, 0xb2, 0x79, 0xfd, 0x06, + 0xdf, 0x58, 0x29, 0x7a, 0xbf, 0x7b, 0x76, 0x3f, 0x0b, 0x33, 0x7e, 0x38, 0x79, 0x53, 0xea, 0x2a, + 0x6d, 0xd5, 0x1e, 0x82, 0xf9, 0x9b, 0x8c, 0x99, 0xef, 0xf8, 0x7e, 0x57, 0xeb, 0x6e, 0xab, 0x36, + 0x26, 0x7f, 0x1e, 0x0a, 0x9c, 0xbc, 0x63, 0x3a, 0x48, 0xb3, 0x5a, 0xa6, 0x7e, 0x1b, 0x35, 0x86, + 0xa0, 0xfe, 0xeb, 0x9e, 0xa9, 0xda, 0x0f, 0xc1, 0x31, 0xf3, 0x26, 0x88, 0x7e, 0xaf, 0xa2, 0xe8, + 0x6d, 0xdb, 0x72, 0xbc, 0x08, 0xc6, 0xbf, 0xe1, 0x33, 0xe5, 0xe3, 0x36, 0x09, 0xac, 0x54, 0x81, + 0x3c, 0x79, 0x1c, 0x36, 0x25, 0xff, 0x96, 0x11, 0x8d, 0x05, 0x28, 0xb6, 0x71, 0x68, 0x56, 0xdb, + 0x56, 0x9d, 0x61, 0xf6, 0xbf, 0xbf, 0xe3, 0x1b, 0x07, 0x83, 0xb0, 0x8d, 0xc3, 0x3b, 0xb4, 0x11, + 0xae, 0xf6, 0x43, 0x30, 0x7c, 0x8b, 0x6f, 0x1c, 0x1c, 0xc3, 0x28, 0x78, 0xc3, 0x30, 0x04, 0xc5, + 0xdf, 0x73, 0x0a, 0x8e, 0xc1, 0x14, 0x9f, 0x0e, 0x0a, 0xad, 0x83, 0x5a, 0xba, 0xeb, 0x39, 0xb4, + 0x15, 0xbe, 0x3f, 0xd5, 0xb7, 0xdf, 0xed, 0x6e, 0xc2, 0xe4, 0x10, 0x14, 0xef, 0x44, 0xec, 0x0a, + 0x95, 0x9c, 0x94, 0xa2, 0x1d, 0xfb, 0x0e, 0xdf, 0x89, 0x42, 0x30, 0xec, 0x5b, 0xa8, 0x43, 0xc4, + 0x61, 0xd7, 0xf0, 0xf9, 0x60, 0x08, 0xba, 0xef, 0xf6, 0x38, 0x57, 0xe3, 0x58, 0xcc, 0x19, 0xea, + 0x7f, 0x3a, 0xe6, 0x0d, 0x74, 0x38, 0x54, 0x76, 0xfe, 0x43, 0x4f, 0xff, 0xb3, 0x4f, 0x91, 0x74, + 0x0f, 0x19, 0xef, 0xe9, 0xa7, 0xa4, 0xa8, 0x5f, 0x01, 0x15, 0x7e, 0xf1, 0x1e, 0x1b, 0x6f, 0x77, + 0x3b, 0x55, 0xda, 0xc2, 0x49, 0xde, 0xdd, 0xf4, 0x44, 0x93, 0xbd, 0x7c, 0xcf, 0xcf, 0xf3, 0xae, + 0x9e, 0xa7, 0x74, 0x15, 0xc6, 0xba, 0x1a, 0x9e, 0x68, 0xaa, 0x5f, 0x62, 0x54, 0xb9, 0x70, 0xbf, + 0x53, 0x5a, 0x81, 0x04, 0x6e, 0x5e, 0xa2, 0xe1, 0xbf, 0xcc, 0xe0, 0xc4, 0xbc, 0xf4, 0x49, 0x48, + 0xf3, 0xa6, 0x25, 0x1a, 0xfa, 0x2b, 0x0c, 0xea, 0x43, 0x30, 0x9c, 0x37, 0x2c, 0xd1, 0xf0, 0x5f, + 0xe5, 0x70, 0x0e, 0xc1, 0xf0, 0xe1, 0x43, 0xf8, 0x8f, 0xbf, 0x96, 0x60, 0x45, 0x87, 0xc7, 0xee, + 0x0a, 0x8c, 0xb2, 0x4e, 0x25, 0x1a, 0xfd, 0x79, 0xf6, 0x72, 0x8e, 0x28, 0x5d, 0x84, 0xe4, 0x90, + 0x01, 0xff, 0x0d, 0x06, 0xa5, 0xf6, 0xa5, 0x35, 0xc8, 0x86, 0xba, 0x93, 0x68, 0xf8, 0x6f, 0x32, + 0x78, 0x18, 0x85, 0x5d, 0x67, 0xdd, 0x49, 0x34, 0xc1, 0x6f, 0x71, 0xd7, 0x19, 0x02, 0x87, 0x8d, + 0x37, 0x26, 0xd1, 0xe8, 0xdf, 0xe6, 0x51, 0xe7, 0x90, 0xd2, 0x33, 0x90, 0xf1, 0x8b, 0x4d, 0x34, + 0xfe, 0x77, 0x18, 0x3e, 0xc0, 0xe0, 0x08, 0x84, 0x8a, 0x5d, 0x34, 0xc5, 0xef, 0xf2, 0x08, 0x84, + 0x50, 0x78, 0x19, 0xf5, 0x36, 0x30, 0xd1, 0x4c, 0xbf, 0xc7, 0x97, 0x51, 0x4f, 0xff, 0x82, 0x67, + 0x93, 0xec, 0xf9, 0xd1, 0x14, 0xbf, 0xcf, 0x67, 0x93, 0xd8, 0x63, 0x37, 0x7a, 0x3b, 0x82, 0x68, + 0x8e, 0x2f, 0x70, 0x37, 0x7a, 0x1a, 0x82, 0xd2, 0x2e, 0x48, 0xfd, 0xdd, 0x40, 0x34, 0xdf, 0x17, + 0x19, 0xdf, 0x44, 0x5f, 0x33, 0x50, 0x7a, 0x0e, 0xa6, 0x07, 0x77, 0x02, 0xd1, 0xac, 0x5f, 0xba, + 0xd7, 0x73, 0x76, 0x0b, 0x37, 0x02, 0xa5, 0xbd, 0xa0, 0xa4, 0x84, 0xbb, 0x80, 0x68, 0xda, 0x57, + 0xee, 0x75, 0x6f, 0xdc, 0xe1, 0x26, 0xa0, 0x54, 0x06, 0x08, 0x0a, 0x70, 0x34, 0xd7, 0xab, 0x8c, + 0x2b, 0x04, 0xc2, 0x4b, 0x83, 0xd5, 0xdf, 0x68, 0xfc, 0x97, 0xf9, 0xd2, 0x60, 0x08, 0xbc, 0x34, + 0x78, 0xe9, 0x8d, 0x46, 0xbf, 0xc6, 0x97, 0x06, 0x87, 0xe0, 0xcc, 0x0e, 0x55, 0xb7, 0x68, 0x86, + 0xaf, 0xf0, 0xcc, 0x0e, 0xa1, 0x4a, 0x3b, 0x30, 0xd1, 0x57, 0x10, 0xa3, 0xa9, 0xbe, 0xca, 0xa8, + 0xc4, 0xde, 0x7a, 0x18, 0x2e, 0x5e, 0xac, 0x18, 0x46, 0xb3, 0xfd, 0x71, 0x4f, 0xf1, 0x62, 0xb5, + 0xb0, 0x74, 0x05, 0xd2, 0x66, 0xc7, 0x30, 0xf0, 0xe2, 0x91, 0xee, 0xff, 0xcb, 0xbd, 0xc2, 0xbf, + 0x7f, 0xc0, 0xa2, 0xc3, 0x01, 0xa5, 0x15, 0x48, 0xa2, 0x76, 0x1d, 0x35, 0xa2, 0x90, 0xff, 0xf1, + 0x01, 0xdf, 0x30, 0xb1, 0x75, 0xe9, 0x19, 0x00, 0x7a, 0x35, 0x42, 0x3e, 0xfb, 0x45, 0x60, 0xff, + 0xf3, 0x03, 0xf6, 0x9b, 0x9a, 0x00, 0x12, 0x10, 0xd0, 0x5f, 0xe8, 0xdc, 0x9f, 0xe0, 0xdd, 0x6e, + 0x02, 0x32, 0x23, 0x97, 0x61, 0xf4, 0xba, 0x6b, 0x99, 0x9e, 0xda, 0x8a, 0x42, 0xff, 0x17, 0x43, + 0x73, 0x7b, 0x1c, 0xb0, 0xb6, 0xe5, 0x20, 0x4f, 0x6d, 0xb9, 0x51, 0xd8, 0xff, 0x66, 0x58, 0x1f, + 0x80, 0xc1, 0x9a, 0xea, 0x7a, 0xc3, 0x8c, 0xfb, 0x7f, 0x38, 0x98, 0x03, 0xb0, 0xd3, 0xf8, 0xef, + 0x1b, 0xe8, 0x30, 0x0a, 0xfb, 0x1e, 0x77, 0x9a, 0xd9, 0x97, 0x3e, 0x09, 0x19, 0xfc, 0x27, 0xfd, + 0xa1, 0x5c, 0x04, 0xf8, 0x7f, 0x19, 0x38, 0x40, 0xe0, 0x37, 0xbb, 0x5e, 0xc3, 0xd3, 0xa3, 0x83, + 0xfd, 0x7f, 0x6c, 0xa6, 0xb9, 0x7d, 0xa9, 0x0c, 0x59, 0xd7, 0x6b, 0x34, 0x3a, 0xac, 0x3f, 0x8d, + 0x80, 0xff, 0xff, 0x07, 0xfe, 0x95, 0x85, 0x8f, 0xc1, 0xb3, 0x7d, 0xeb, 0x86, 0x67, 0x5b, 0xe4, + 0x33, 0x47, 0x14, 0xc3, 0x3d, 0xc6, 0x10, 0x82, 0xac, 0x56, 0x06, 0x5f, 0xdf, 0xc2, 0x86, 0xb5, + 0x61, 0xd1, 0x8b, 0xdb, 0x17, 0xe7, 0xa2, 0x6f, 0x60, 0xe1, 0x0b, 0x49, 0x38, 0xa5, 0x59, 0xed, + 0xba, 0xe5, 0x2e, 0xd6, 0x2d, 0xef, 0x60, 0xd1, 0x32, 0x19, 0x99, 0x14, 0xb7, 0x4c, 0x34, 0x73, + 0xb2, 0x4b, 0xdc, 0xb9, 0x33, 0x90, 0xac, 0x75, 0xea, 0xf5, 0x43, 0x49, 0x84, 0xb8, 0xdb, 0xa9, + 0xb3, 0x5f, 0x5a, 0xe1, 0x3f, 0xe7, 0x7e, 0x18, 0x87, 0x6c, 0x4d, 0x6d, 0xdb, 0x06, 0xaa, 0x9a, + 0xa8, 0xda, 0x94, 0x0a, 0x90, 0x22, 0x63, 0x7c, 0x9a, 0x18, 0x09, 0xd7, 0x46, 0x64, 0xf6, 0xec, + 0x6b, 0x96, 0xc8, 0xe5, 0x76, 0xcc, 0xd7, 0x2c, 0xf9, 0x9a, 0xf3, 0xf4, 0x6e, 0xdb, 0xd7, 0x9c, + 0xf7, 0x35, 0xcb, 0xe4, 0x86, 0x3b, 0xee, 0x6b, 0x96, 0x7d, 0xcd, 0x0a, 0xf9, 0x82, 0x33, 0xe6, + 0x6b, 0x56, 0x7c, 0xcd, 0x05, 0xf2, 0xcd, 0x26, 0xe1, 0x6b, 0x2e, 0xf8, 0x9a, 0x8b, 0xe4, 0x53, + 0xcd, 0x84, 0xaf, 0xb9, 0xe8, 0x6b, 0x2e, 0x91, 0xcf, 0x33, 0x92, 0xaf, 0xb9, 0xe4, 0x6b, 0x2e, + 0x93, 0x1f, 0x54, 0x8d, 0xfa, 0x9a, 0xcb, 0xd2, 0x0c, 0x8c, 0xd2, 0x91, 0x3d, 0x45, 0xbe, 0xe1, + 0x8f, 0x5f, 0x1b, 0x91, 0xb9, 0x20, 0xd0, 0x3d, 0x4d, 0x7e, 0x34, 0x95, 0x0a, 0x74, 0x4f, 0x07, + 0xba, 0x25, 0xf2, 0x7f, 0x37, 0xc4, 0x40, 0xb7, 0x14, 0xe8, 0xce, 0x17, 0xc6, 0x70, 0x6a, 0x04, + 0xba, 0xf3, 0x81, 0x6e, 0xb9, 0x90, 0xc7, 0xf1, 0x0f, 0x74, 0xcb, 0x81, 0x6e, 0xa5, 0x30, 0x3e, + 0x2b, 0xcc, 0xe7, 0x02, 0xdd, 0x8a, 0xf4, 0x24, 0x64, 0xdd, 0x4e, 0x5d, 0x61, 0x9b, 0x3c, 0xf9, + 0x71, 0x56, 0x76, 0x09, 0x16, 0x70, 0x46, 0x90, 0x49, 0xbd, 0x36, 0x22, 0x83, 0xdb, 0xa9, 0xb3, + 0x3d, 0x78, 0x35, 0x07, 0xe4, 0xea, 0x49, 0x21, 0xbf, 0xa9, 0x5e, 0xbd, 0xf6, 0xe6, 0xdd, 0xe2, + 0xc8, 0xf7, 0xef, 0x16, 0x47, 0xfe, 0xf5, 0x6e, 0x71, 0xe4, 0xad, 0xbb, 0x45, 0xe1, 0xbd, 0xbb, + 0x45, 0xe1, 0xfd, 0xbb, 0x45, 0xe1, 0xce, 0x51, 0x51, 0x78, 0xe3, 0xa8, 0x28, 0x7c, 0xe3, 0xa8, + 0x28, 0x7c, 0xfb, 0xa8, 0x28, 0xbc, 0x79, 0x54, 0x14, 0xbe, 0x7f, 0x54, 0x14, 0xde, 0x3a, 0x2a, + 0x0a, 0x3f, 0x3a, 0x2a, 0x8e, 0xbc, 0x77, 0x54, 0x14, 0xde, 0x3f, 0x2a, 0x8e, 0xdc, 0x79, 0xbb, + 0x38, 0xf2, 0xc6, 0xdb, 0x45, 0xa1, 0x9e, 0x22, 0xa9, 0x74, 0xfe, 0xc7, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x08, 0x6d, 0x89, 0x62, 0x8e, 0x35, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) @@ -2073,7 +2504,7 @@ func (m *Subby) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2081,26 +2512,33 @@ } func (m *Subby) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Subby) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Sub) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.Sub) + copy(dAtA[i:], m.Sub) i = encodeVarintOne(dAtA, i, uint64(len(m.Sub))) - i += copy(dAtA[i:], m.Sub) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *SampleOneOf) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2108,167 +2546,261 @@ } func (m *SampleOneOf) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.TestOneof != nil { - nn1, err1 := m.TestOneof.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + { + size := m.TestOneof.Size() + i -= size + if _, err := m.TestOneof.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn1 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *SampleOneOf_Field1) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x9 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field1) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - return i, nil + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field2) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x15 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - return i, nil + i-- + dAtA[i] = 0x15 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field3) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x18 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field3) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field3)) - return i, nil + i-- + dAtA[i] = 0x18 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field4) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x20 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field4) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field4)) - return i, nil + i-- + dAtA[i] = 0x20 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field5) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x28 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field5) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field5)) - return i, nil + i-- + dAtA[i] = 0x28 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field6) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x30 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field6) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field6)) - return i, nil + i-- + dAtA[i] = 0x30 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field7) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x38 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field7) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) - return i, nil + i-- + dAtA[i] = 0x38 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field8) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x40 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field8) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64((uint64(m.Field8)<<1)^uint64((m.Field8>>63)))) - return i, nil + i-- + dAtA[i] = 0x40 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field9) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x4d - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field9) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9)) - i += 4 - return i, nil + i-- + dAtA[i] = 0x4d + return len(dAtA) - i, nil } func (m *SampleOneOf_Field10) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x55 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field10) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10)) - i += 4 - return i, nil + i-- + dAtA[i] = 0x55 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field11) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x59 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field11) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11)) - i += 8 - return i, nil + i-- + dAtA[i] = 0x59 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field12) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x61 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field12) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12)) - i += 8 - return i, nil + i-- + dAtA[i] = 0x61 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field13) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x68 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field13) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i-- if m.Field13 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - return i, nil + i-- + dAtA[i] = 0x68 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field14) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x72 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field14) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= len(m.Field14) + copy(dAtA[i:], m.Field14) i = encodeVarintOne(dAtA, i, uint64(len(m.Field14))) - i += copy(dAtA[i:], m.Field14) - return i, nil + i-- + dAtA[i] = 0x72 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field15) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field15) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Field15 != nil { - dAtA[i] = 0x7a - i++ + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) i = encodeVarintOne(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + i-- + dAtA[i] = 0x7a } - return i, nil + return len(dAtA) - i, nil } func (m *SampleOneOf_SubMessage) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_SubMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.SubMessage != nil { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintOne(dAtA, i, uint64(m.SubMessage.Size())) - n2, err2 := m.SubMessage.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + { + size, err := m.SubMessage.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOne(dAtA, i, uint64(size)) } - i += n2 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintOne(dAtA []byte, offset int, v uint64) int { + offset -= sovOne(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedSubby(r randyOne, easy bool) *Subby { this := &Subby{} @@ -3334,6 +3866,7 @@ func skipOne(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -3365,10 +3898,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -3389,55 +3920,30 @@ return 0, ErrInvalidLengthOne } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthOne - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowOne - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipOne(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthOne - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupOne + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthOne + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthOne = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowOne = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthOne = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowOne = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupOne = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/both/onepb_test.go golang-gogoprotobuf-1.3.1/test/oneof3/combos/both/onepb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/both/onepb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/both/onepb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -255,6 +255,54 @@ } } +func TestSubbyCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSubby(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &Subby{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSubby(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestSampleOneOfCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSampleOneOf(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &SampleOneOf{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSampleOneOf(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} func TestOneDescription(t *testing.T) { OneDescription() } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/both/one.proto golang-gogoprotobuf-1.3.1/test/oneof3/combos/both/one.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/both/one.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/both/one.proto 2020-05-17 12:22:58.000000000 +0000 @@ -54,6 +54,8 @@ option (gogoproto.unsafe_marshaler_all) = false; option (gogoproto.unsafe_unmarshaler_all) = false; +option (gogoproto.compare_all) = true; + message Subby { string sub = 1; } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/marshaler/one.pb.go golang-gogoprotobuf-1.3.1/test/oneof3/combos/marshaler/one.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/marshaler/one.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/marshaler/one.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -28,7 +28,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Subby struct { Sub string `protobuf:"bytes,1,opt,name=sub,proto3" json:"sub,omitempty"` @@ -50,7 +50,7 @@ return xxx_messageInfo_Subby.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -106,7 +106,7 @@ return xxx_messageInfo_SampleOneOf.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -131,55 +131,56 @@ VerboseEqual(interface{}) error MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type SampleOneOf_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,proto3,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,proto3,oneof" json:"Field1,omitempty"` } type SampleOneOf_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,proto3,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,proto3,oneof" json:"Field2,omitempty"` } type SampleOneOf_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,proto3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,proto3,oneof" json:"Field3,omitempty"` } type SampleOneOf_Field4 struct { - Field4 int64 `protobuf:"varint,4,opt,name=Field4,proto3,oneof"` + Field4 int64 `protobuf:"varint,4,opt,name=Field4,proto3,oneof" json:"Field4,omitempty"` } type SampleOneOf_Field5 struct { - Field5 uint32 `protobuf:"varint,5,opt,name=Field5,proto3,oneof"` + Field5 uint32 `protobuf:"varint,5,opt,name=Field5,proto3,oneof" json:"Field5,omitempty"` } type SampleOneOf_Field6 struct { - Field6 uint64 `protobuf:"varint,6,opt,name=Field6,proto3,oneof"` + Field6 uint64 `protobuf:"varint,6,opt,name=Field6,proto3,oneof" json:"Field6,omitempty"` } type SampleOneOf_Field7 struct { - Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,proto3,oneof"` + Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,proto3,oneof" json:"Field7,omitempty"` } type SampleOneOf_Field8 struct { - Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,proto3,oneof"` + Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,proto3,oneof" json:"Field8,omitempty"` } type SampleOneOf_Field9 struct { - Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,proto3,oneof"` + Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,proto3,oneof" json:"Field9,omitempty"` } type SampleOneOf_Field10 struct { - Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,proto3,oneof"` + Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,proto3,oneof" json:"Field10,omitempty"` } type SampleOneOf_Field11 struct { - Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,proto3,oneof"` + Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,proto3,oneof" json:"Field11,omitempty"` } type SampleOneOf_Field12 struct { - Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,proto3,oneof"` + Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,proto3,oneof" json:"Field12,omitempty"` } type SampleOneOf_Field13 struct { - Field13 bool `protobuf:"varint,13,opt,name=Field13,proto3,oneof"` + Field13 bool `protobuf:"varint,13,opt,name=Field13,proto3,oneof" json:"Field13,omitempty"` } type SampleOneOf_Field14 struct { - Field14 string `protobuf:"bytes,14,opt,name=Field14,proto3,oneof"` + Field14 string `protobuf:"bytes,14,opt,name=Field14,proto3,oneof" json:"Field14,omitempty"` } type SampleOneOf_Field15 struct { - Field15 []byte `protobuf:"bytes,15,opt,name=Field15,proto3,oneof"` + Field15 []byte `protobuf:"bytes,15,opt,name=Field15,proto3,oneof" json:"Field15,omitempty"` } type SampleOneOf_SubMessage struct { - SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,proto3,oneof"` + SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,proto3,oneof" json:"sub_message,omitempty"` } func (*SampleOneOf_Field1) isSampleOneOf_TestOneof() {} @@ -318,9 +319,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*SampleOneOf) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _SampleOneOf_OneofMarshaler, _SampleOneOf_OneofUnmarshaler, _SampleOneOf_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*SampleOneOf) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*SampleOneOf_Field1)(nil), (*SampleOneOf_Field2)(nil), (*SampleOneOf_Field3)(nil), @@ -340,292 +341,722 @@ } } -func _SampleOneOf_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*SampleOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *SampleOneOf_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *SampleOneOf_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *SampleOneOf_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case *SampleOneOf_Field4: - _ = b.EncodeVarint(4<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field4)) - case *SampleOneOf_Field5: - _ = b.EncodeVarint(5<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field5)) - case *SampleOneOf_Field6: - _ = b.EncodeVarint(6<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field6)) - case *SampleOneOf_Field7: - _ = b.EncodeVarint(7<<3 | proto.WireVarint) - _ = b.EncodeZigzag32(uint64(x.Field7)) - case *SampleOneOf_Field8: - _ = b.EncodeVarint(8<<3 | proto.WireVarint) - _ = b.EncodeZigzag64(uint64(x.Field8)) - case *SampleOneOf_Field9: - _ = b.EncodeVarint(9<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field9)) - case *SampleOneOf_Field10: - _ = b.EncodeVarint(10<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field10)) - case *SampleOneOf_Field11: - _ = b.EncodeVarint(11<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field11)) - case *SampleOneOf_Field12: - _ = b.EncodeVarint(12<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field12)) - case *SampleOneOf_Field13: - t := uint64(0) - if x.Field13 { - t = 1 - } - _ = b.EncodeVarint(13<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *SampleOneOf_Field14: - _ = b.EncodeVarint(14<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field14) - case *SampleOneOf_Field15: - _ = b.EncodeVarint(15<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field15) - case *SampleOneOf_SubMessage: - _ = b.EncodeVarint(16<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("SampleOneOf.TestOneof has unexpected type %T", x) - } - return nil -} - -func _SampleOneOf_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*SampleOneOf) - switch tag { - case 1: // test_oneof.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field1{math.Float64frombits(x)} - return true, err - case 2: // test_oneof.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // test_oneof.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field3{int32(x)} - return true, err - case 4: // test_oneof.Field4 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field4{int64(x)} - return true, err - case 5: // test_oneof.Field5 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field5{uint32(x)} - return true, err - case 6: // test_oneof.Field6 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field6{x} - return true, err - case 7: // test_oneof.Field7 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag32() - m.TestOneof = &SampleOneOf_Field7{int32(x)} - return true, err - case 8: // test_oneof.Field8 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag64() - m.TestOneof = &SampleOneOf_Field8{int64(x)} - return true, err - case 9: // test_oneof.Field9 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field9{uint32(x)} - return true, err - case 10: // test_oneof.Field10 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field10{int32(x)} - return true, err - case 11: // test_oneof.Field11 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field11{x} - return true, err - case 12: // test_oneof.Field12 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field12{int64(x)} - return true, err - case 13: // test_oneof.Field13 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field13{x != 0} - return true, err - case 14: // test_oneof.Field14 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.TestOneof = &SampleOneOf_Field14{x} - return true, err - case 15: // test_oneof.Field15 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.TestOneof = &SampleOneOf_Field15{x} - return true, err - case 16: // test_oneof.sub_message - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.TestOneof = &SampleOneOf_SubMessage{msg} - return true, err - default: - return false, nil - } -} - -func _SampleOneOf_OneofSizer(msg proto.Message) (n int) { - m := msg.(*SampleOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *SampleOneOf_Field1: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field2: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case *SampleOneOf_Field4: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field4)) - case *SampleOneOf_Field5: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field5)) - case *SampleOneOf_Field6: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field6)) - case *SampleOneOf_Field7: - n += 1 // tag and wire - n += proto.SizeVarint(uint64((uint32(x.Field7) << 1) ^ uint32((int32(x.Field7) >> 31)))) - case *SampleOneOf_Field8: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(uint64(x.Field8<<1) ^ uint64((int64(x.Field8) >> 63)))) - case *SampleOneOf_Field9: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field10: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field11: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field12: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field13: - n += 1 // tag and wire - n += 1 - case *SampleOneOf_Field14: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field14))) - n += len(x.Field14) - case *SampleOneOf_Field15: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field15))) - n += len(x.Field15) - case *SampleOneOf_SubMessage: - s := proto.Size(x.SubMessage) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) +func init() { + proto.RegisterType((*Subby)(nil), "one.Subby") + proto.RegisterType((*SampleOneOf)(nil), "one.SampleOneOf") +} + +func init() { proto.RegisterFile("combos/marshaler/one.proto", fileDescriptor_f8ef4705d619eecc) } + +var fileDescriptor_f8ef4705d619eecc = []byte{ + // 409 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0xd2, 0xbf, 0x52, 0x1b, 0x31, + 0x10, 0x06, 0x70, 0x2d, 0x87, 0x6d, 0x90, 0x4d, 0x70, 0xae, 0xda, 0xb8, 0xd8, 0xd1, 0x50, 0xa9, + 0xc1, 0x8e, 0xef, 0x6c, 0xfe, 0xb4, 0x14, 0x19, 0x37, 0x19, 0x66, 0xcc, 0x03, 0x30, 0x16, 0x91, + 0x0d, 0x33, 0x3e, 0x8b, 0xf1, 0xdd, 0x15, 0xe9, 0x78, 0x1c, 0xca, 0x94, 0x79, 0x04, 0x4a, 0xca, + 0x14, 0x29, 0x38, 0xd1, 0xa4, 0xa4, 0xa4, 0xcc, 0xf8, 0x9c, 0xac, 0xba, 0xfd, 0xf4, 0x93, 0x0a, + 0x49, 0x9f, 0xec, 0xdd, 0xb8, 0xcc, 0xb8, 0x7c, 0x90, 0xcd, 0xd6, 0xf9, 0xed, 0x6c, 0x69, 0xd7, + 0x03, 0xb7, 0xb2, 0xfd, 0xfb, 0xb5, 0x2b, 0x5c, 0x1c, 0xb9, 0x95, 0xed, 0x1d, 0x2f, 0xee, 0x8a, + 0xdb, 0xd2, 0xf4, 0x6f, 0x5c, 0x36, 0x58, 0xb8, 0x85, 0x1b, 0xd4, 0x66, 0xca, 0x79, 0x9d, 0xea, + 0x50, 0x4f, 0xdb, 0x33, 0x47, 0x9f, 0x64, 0xe3, 0xaa, 0x34, 0xe6, 0x7b, 0xdc, 0x95, 0x51, 0x5e, + 0x1a, 0x04, 0x05, 0x7a, 0x7f, 0xba, 0x19, 0x8f, 0x7e, 0x47, 0xb2, 0x7d, 0x35, 0xcb, 0xee, 0x97, + 0xf6, 0x72, 0x65, 0x2f, 0xe7, 0x31, 0xca, 0xe6, 0x97, 0x3b, 0xbb, 0xfc, 0x36, 0xac, 0x37, 0xc1, + 0x44, 0x4c, 0xff, 0x65, 0x96, 0x04, 0x77, 0x14, 0xe8, 0x1d, 0x96, 0x84, 0x25, 0xc5, 0x48, 0x81, + 0x6e, 0xb0, 0xa4, 0x2c, 0x23, 0xdc, 0x55, 0xa0, 0x23, 0x96, 0x11, 0xcb, 0x18, 0x1b, 0x0a, 0xf4, + 0x01, 0xcb, 0x98, 0xe5, 0x04, 0x9b, 0x0a, 0xf4, 0x2e, 0xcb, 0x09, 0xcb, 0x29, 0xb6, 0x14, 0xe8, + 0x8f, 0x2c, 0xa7, 0x2c, 0x67, 0xb8, 0xa7, 0x40, 0xc7, 0x2c, 0x67, 0x2c, 0xe7, 0xb8, 0xaf, 0x40, + 0xb7, 0x58, 0xce, 0xe3, 0x9e, 0x6c, 0x6d, 0x6f, 0xf6, 0x19, 0xa5, 0x02, 0x7d, 0x38, 0x11, 0xd3, + 0xff, 0x0b, 0xc1, 0x86, 0xd8, 0x56, 0xa0, 0x9b, 0xc1, 0x86, 0xc1, 0x12, 0xec, 0x28, 0xd0, 0xdd, + 0x60, 0x49, 0xb0, 0x14, 0x0f, 0x14, 0xe8, 0xbd, 0x60, 0x69, 0xb0, 0x11, 0x7e, 0xd8, 0xbc, 0x7f, + 0xb0, 0x51, 0xb0, 0x31, 0x1e, 0x2a, 0xd0, 0x9d, 0x60, 0xe3, 0xf8, 0x58, 0xb6, 0xf3, 0xd2, 0x5c, + 0x67, 0x36, 0xcf, 0x67, 0x0b, 0x8b, 0x5d, 0x05, 0xba, 0x9d, 0xc8, 0xfe, 0xa6, 0x11, 0xf5, 0xa7, + 0x4e, 0xc4, 0x54, 0xe6, 0xa5, 0xf9, 0xba, 0xf5, 0x8b, 0x8e, 0x94, 0x85, 0xcd, 0x8b, 0x6b, 0xb7, + 0xb2, 0x6e, 0x7e, 0x31, 0x79, 0xaa, 0x48, 0x3c, 0x57, 0x24, 0x7e, 0x55, 0x24, 0x5e, 0x2a, 0x82, + 0xb7, 0x8a, 0xe0, 0xbd, 0x22, 0x78, 0xf0, 0x04, 0x8f, 0x9e, 0xe0, 0x87, 0x27, 0xf8, 0xe9, 0x09, + 0x9e, 0x3c, 0xc1, 0xb3, 0x27, 0xf1, 0xe2, 0x09, 0xfe, 0x78, 0x12, 0x6f, 0x9e, 0xe0, 0xdd, 0x93, + 0x78, 0x78, 0x25, 0xf1, 0xf8, 0x4a, 0x60, 0x9a, 0x75, 0x95, 0xd2, 0xbf, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x29, 0xb0, 0xb0, 0x3f, 0x9c, 0x02, 0x00, 0x00, +} + +func (this *Subby) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Subby) + if !ok { + that2, ok := that.(Subby) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Sub != that1.Sub { + if this.Sub < that1.Sub { + return -1 + } + return 1 + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *SampleOneOf) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf) + if !ok { + that2, ok := that.(SampleOneOf) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.TestOneof == nil { + if this.TestOneof != nil { + return 1 + } + } else if this.TestOneof == nil { + return -1 + } else { + thisType := -1 + switch this.TestOneof.(type) { + case *SampleOneOf_Field1: + thisType = 0 + case *SampleOneOf_Field2: + thisType = 1 + case *SampleOneOf_Field3: + thisType = 2 + case *SampleOneOf_Field4: + thisType = 3 + case *SampleOneOf_Field5: + thisType = 4 + case *SampleOneOf_Field6: + thisType = 5 + case *SampleOneOf_Field7: + thisType = 6 + case *SampleOneOf_Field8: + thisType = 7 + case *SampleOneOf_Field9: + thisType = 8 + case *SampleOneOf_Field10: + thisType = 9 + case *SampleOneOf_Field11: + thisType = 10 + case *SampleOneOf_Field12: + thisType = 11 + case *SampleOneOf_Field13: + thisType = 12 + case *SampleOneOf_Field14: + thisType = 13 + case *SampleOneOf_Field15: + thisType = 14 + case *SampleOneOf_SubMessage: + thisType = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.TestOneof)) + } + that1Type := -1 + switch that1.TestOneof.(type) { + case *SampleOneOf_Field1: + that1Type = 0 + case *SampleOneOf_Field2: + that1Type = 1 + case *SampleOneOf_Field3: + that1Type = 2 + case *SampleOneOf_Field4: + that1Type = 3 + case *SampleOneOf_Field5: + that1Type = 4 + case *SampleOneOf_Field6: + that1Type = 5 + case *SampleOneOf_Field7: + that1Type = 6 + case *SampleOneOf_Field8: + that1Type = 7 + case *SampleOneOf_Field9: + that1Type = 8 + case *SampleOneOf_Field10: + that1Type = 9 + case *SampleOneOf_Field11: + that1Type = 10 + case *SampleOneOf_Field12: + that1Type = 11 + case *SampleOneOf_Field13: + that1Type = 12 + case *SampleOneOf_Field14: + that1Type = 13 + case *SampleOneOf_Field15: + that1Type = 14 + case *SampleOneOf_SubMessage: + that1Type = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.TestOneof)) + } + if thisType == that1Type { + if c := this.TestOneof.Compare(that1.TestOneof); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *SampleOneOf_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field1) + if !ok { + that2, ok := that.(SampleOneOf_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field2) + if !ok { + that2, ok := that.(SampleOneOf_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field3) + if !ok { + that2, ok := that.(SampleOneOf_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field4) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field4) + if !ok { + that2, ok := that.(SampleOneOf_Field4) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field4 != that1.Field4 { + if this.Field4 < that1.Field4 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field5) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field5) + if !ok { + that2, ok := that.(SampleOneOf_Field5) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field5 != that1.Field5 { + if this.Field5 < that1.Field5 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field6) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field6) + if !ok { + that2, ok := that.(SampleOneOf_Field6) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field6 != that1.Field6 { + if this.Field6 < that1.Field6 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field7) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field7) + if !ok { + that2, ok := that.(SampleOneOf_Field7) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field7 != that1.Field7 { + if this.Field7 < that1.Field7 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field8) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field8) + if !ok { + that2, ok := that.(SampleOneOf_Field8) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field8 != that1.Field8 { + if this.Field8 < that1.Field8 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field9) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field9) + if !ok { + that2, ok := that.(SampleOneOf_Field9) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field9 != that1.Field9 { + if this.Field9 < that1.Field9 { + return -1 + } + return 1 } - return n + return 0 } +func (this *SampleOneOf_Field10) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func init() { - proto.RegisterType((*Subby)(nil), "one.Subby") - proto.RegisterType((*SampleOneOf)(nil), "one.SampleOneOf") + that1, ok := that.(*SampleOneOf_Field10) + if !ok { + that2, ok := that.(SampleOneOf_Field10) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field10 != that1.Field10 { + if this.Field10 < that1.Field10 { + return -1 + } + return 1 + } + return 0 } +func (this *SampleOneOf_Field11) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func init() { proto.RegisterFile("combos/marshaler/one.proto", fileDescriptor_f8ef4705d619eecc) } + that1, ok := that.(*SampleOneOf_Field11) + if !ok { + that2, ok := that.(SampleOneOf_Field11) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field11 != that1.Field11 { + if this.Field11 < that1.Field11 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field12) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -var fileDescriptor_f8ef4705d619eecc = []byte{ - // 407 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0xd2, 0xbf, 0x4f, 0x1b, 0x31, - 0x14, 0x07, 0x70, 0x3f, 0x8e, 0x24, 0xe0, 0x84, 0x92, 0xde, 0xf4, 0x9a, 0xe1, 0xc9, 0x62, 0xf2, - 0x42, 0xd2, 0xdc, 0x25, 0xfc, 0x58, 0x51, 0x55, 0x65, 0xa9, 0x90, 0xc2, 0x1f, 0x80, 0x62, 0xea, - 0x04, 0xa4, 0x5c, 0x8c, 0x72, 0x77, 0x43, 0x37, 0xfe, 0x9c, 0x8e, 0x1d, 0xfb, 0x27, 0x30, 0x32, - 0x76, 0xe8, 0xc0, 0xb9, 0x4b, 0x47, 0x46, 0xc6, 0x2a, 0x97, 0xf2, 0xbc, 0xbd, 0xaf, 0x3f, 0xf6, - 0x60, 0xfb, 0x2b, 0x7b, 0x37, 0x2e, 0x33, 0x2e, 0x1f, 0x64, 0xb3, 0x75, 0x7e, 0x3b, 0x5b, 0xda, - 0xf5, 0xc0, 0xad, 0x6c, 0xff, 0x7e, 0xed, 0x0a, 0x17, 0x47, 0x6e, 0x65, 0x7b, 0xc7, 0x8b, 0xbb, - 0xe2, 0xb6, 0x34, 0xfd, 0x1b, 0x97, 0x0d, 0x16, 0x6e, 0xe1, 0x06, 0xb5, 0x99, 0x72, 0x5e, 0xa7, - 0x3a, 0xd4, 0xd3, 0xf6, 0xcc, 0xd1, 0x07, 0xd9, 0xb8, 0x2a, 0x8d, 0xf9, 0x16, 0x77, 0x65, 0x94, - 0x97, 0x06, 0x41, 0x81, 0xde, 0x9f, 0x6e, 0xc6, 0xa3, 0xdf, 0x91, 0x6c, 0x5f, 0xcd, 0xb2, 0xfb, - 0xa5, 0xbd, 0x5c, 0xd9, 0xcb, 0x79, 0x8c, 0xb2, 0xf9, 0xf9, 0xce, 0x2e, 0xbf, 0x0e, 0xeb, 0x4d, - 0x30, 0x11, 0xd3, 0xff, 0x99, 0x25, 0xc1, 0x1d, 0x05, 0x7a, 0x87, 0x25, 0x61, 0x49, 0x31, 0x52, - 0xa0, 0x1b, 0x2c, 0x29, 0xcb, 0x08, 0x77, 0x15, 0xe8, 0x88, 0x65, 0xc4, 0x32, 0xc6, 0x86, 0x02, - 0x7d, 0xc0, 0x32, 0x66, 0x39, 0xc1, 0xa6, 0x02, 0xbd, 0xcb, 0x72, 0xc2, 0x72, 0x8a, 0x2d, 0x05, - 0xfa, 0x3d, 0xcb, 0x29, 0xcb, 0x19, 0xee, 0x29, 0xd0, 0x31, 0xcb, 0x19, 0xcb, 0x39, 0xee, 0x2b, - 0xd0, 0x2d, 0x96, 0xf3, 0xb8, 0x27, 0x5b, 0xdb, 0x9b, 0x7d, 0x44, 0xa9, 0x40, 0x1f, 0x4e, 0xc4, - 0xf4, 0x6d, 0x21, 0xd8, 0x10, 0xdb, 0x0a, 0x74, 0x33, 0xd8, 0x30, 0x58, 0x82, 0x1d, 0x05, 0xba, - 0x1b, 0x2c, 0x09, 0x96, 0xe2, 0x81, 0x02, 0xbd, 0x17, 0x2c, 0x0d, 0x36, 0xc2, 0x77, 0x9b, 0xf7, - 0x0f, 0x36, 0x0a, 0x36, 0xc6, 0x43, 0x05, 0xba, 0x13, 0x6c, 0x1c, 0x1f, 0xcb, 0x76, 0x5e, 0x9a, - 0xeb, 0xcc, 0xe6, 0xf9, 0x6c, 0x61, 0xb1, 0xab, 0x40, 0xb7, 0x13, 0xd9, 0xdf, 0x34, 0xa2, 0xfe, - 0xd4, 0x89, 0x98, 0xca, 0xbc, 0x34, 0x5f, 0xb6, 0x7e, 0xd1, 0x91, 0xb2, 0xb0, 0x79, 0x71, 0xed, - 0x56, 0xd6, 0xcd, 0x2f, 0x3e, 0x3d, 0x56, 0x24, 0x9e, 0x2a, 0x12, 0xbf, 0x2a, 0x12, 0xcf, 0x15, - 0xc1, 0x4b, 0x45, 0xf0, 0x5a, 0x11, 0x3c, 0x78, 0x82, 0xef, 0x9e, 0xe0, 0x87, 0x27, 0xf8, 0xe9, - 0x09, 0x1e, 0x3d, 0xc1, 0x93, 0x27, 0xf1, 0xec, 0x09, 0xfe, 0x7a, 0x12, 0x2f, 0x9e, 0xe0, 0xd5, - 0x93, 0x78, 0xf8, 0x43, 0xc2, 0x34, 0xeb, 0x1a, 0xa5, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x34, - 0x55, 0x0b, 0x2b, 0x98, 0x02, 0x00, 0x00, + that1, ok := that.(*SampleOneOf_Field12) + if !ok { + that2, ok := that.(SampleOneOf_Field12) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field12 != that1.Field12 { + if this.Field12 < that1.Field12 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field13) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field13) + if !ok { + that2, ok := that.(SampleOneOf_Field13) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field13 != that1.Field13 { + if !this.Field13 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field14) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field14) + if !ok { + that2, ok := that.(SampleOneOf_Field14) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field14 != that1.Field14 { + if this.Field14 < that1.Field14 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field15) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field15) + if !ok { + that2, ok := that.(SampleOneOf_Field15) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field15, that1.Field15); c != 0 { + return c + } + return 0 } +func (this *SampleOneOf_SubMessage) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + that1, ok := that.(*SampleOneOf_SubMessage) + if !ok { + that2, ok := that.(SampleOneOf_SubMessage) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage.Compare(that1.SubMessage); c != 0 { + return c + } + return 0 +} func (this *Subby) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { return OneDescription() } @@ -635,265 +1066,265 @@ func OneDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 4115 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0x1b, 0xe7, - 0x75, 0x26, 0xae, 0x04, 0x0e, 0x40, 0x70, 0xb9, 0xa4, 0x25, 0x88, 0x8e, 0x21, 0x89, 0xb6, 0x63, - 0xda, 0x8e, 0x29, 0x9b, 0x22, 0x75, 0x81, 0x9a, 0xb8, 0x20, 0x09, 0x51, 0x74, 0x49, 0x82, 0x59, - 0x90, 0xf1, 0x25, 0xd3, 0xd9, 0x59, 0x2c, 0x7e, 0x80, 0x2b, 0x2d, 0x76, 0x37, 0xbb, 0x0b, 0xc9, - 0xd4, 0xf4, 0x41, 0x1d, 0xf7, 0x32, 0x99, 0xde, 0x2f, 0x33, 0x75, 0x5c, 0xc7, 0x6d, 0xd2, 0x69, - 0x9c, 0xa6, 0xb7, 0xa4, 0x97, 0x34, 0x49, 0x5f, 0xfa, 0x92, 0xd6, 0x4f, 0x9d, 0xe4, 0xad, 0x0f, - 0x79, 0xb0, 0x18, 0xcf, 0x34, 0x6d, 0xdd, 0xd6, 0x6d, 0xf5, 0xe0, 0x19, 0xbf, 0x74, 0xfe, 0xdb, - 0xde, 0x00, 0x6a, 0xc1, 0xcc, 0xd8, 0x79, 0x12, 0xf7, 0x9c, 0xf3, 0x7d, 0x7b, 0xfe, 0xf3, 0x9f, - 0xff, 0xfc, 0xe7, 0xff, 0x17, 0x82, 0xb7, 0xaa, 0x70, 0xa6, 0x6b, 0x9a, 0x5d, 0x1d, 0x9d, 0xb3, - 0x6c, 0xd3, 0x35, 0x5b, 0xfd, 0xce, 0xb9, 0x36, 0x72, 0x54, 0x5b, 0xb3, 0x5c, 0xd3, 0x5e, 0x20, - 0x32, 0x71, 0x92, 0x5a, 0x2c, 0x70, 0x8b, 0xb9, 0x2d, 0x98, 0xba, 0xaa, 0xe9, 0x68, 0xcd, 0x33, - 0x6c, 0x22, 0x57, 0xbc, 0x04, 0xe9, 0x8e, 0xa6, 0xa3, 0x72, 0xe2, 0x4c, 0x6a, 0xbe, 0xb0, 0xf8, - 0xc8, 0x42, 0x04, 0xb4, 0x10, 0x46, 0xec, 0x60, 0xb1, 0x44, 0x10, 0x73, 0xef, 0xa4, 0x61, 0x7a, - 0x88, 0x56, 0x14, 0x21, 0x6d, 0x28, 0x3d, 0xcc, 0x98, 0x98, 0xcf, 0x4b, 0xe4, 0x6f, 0xb1, 0x0c, - 0xe3, 0x96, 0xa2, 0xde, 0x50, 0xba, 0xa8, 0x9c, 0x24, 0x62, 0xfe, 0x28, 0x56, 0x00, 0xda, 0xc8, - 0x42, 0x46, 0x1b, 0x19, 0xea, 0x41, 0x39, 0x75, 0x26, 0x35, 0x9f, 0x97, 0x02, 0x12, 0xf1, 0x49, - 0x98, 0xb2, 0xfa, 0x2d, 0x5d, 0x53, 0xe5, 0x80, 0x19, 0x9c, 0x49, 0xcd, 0x67, 0x24, 0x81, 0x2a, - 0xd6, 0x7c, 0xe3, 0xc7, 0x60, 0xf2, 0x16, 0x52, 0x6e, 0x04, 0x4d, 0x0b, 0xc4, 0xb4, 0x84, 0xc5, - 0x01, 0xc3, 0x55, 0x28, 0xf6, 0x90, 0xe3, 0x28, 0x5d, 0x24, 0xbb, 0x07, 0x16, 0x2a, 0xa7, 0xc9, - 0xe8, 0xcf, 0x0c, 0x8c, 0x3e, 0x3a, 0xf2, 0x02, 0x43, 0xed, 0x1e, 0x58, 0x48, 0xac, 0x41, 0x1e, - 0x19, 0xfd, 0x1e, 0x65, 0xc8, 0x1c, 0x11, 0xbf, 0xba, 0xd1, 0xef, 0x45, 0x59, 0x72, 0x18, 0xc6, - 0x28, 0xc6, 0x1d, 0x64, 0xdf, 0xd4, 0x54, 0x54, 0xce, 0x12, 0x82, 0xc7, 0x06, 0x08, 0x9a, 0x54, - 0x1f, 0xe5, 0xe0, 0x38, 0x71, 0x15, 0xf2, 0xe8, 0x65, 0x17, 0x19, 0x8e, 0x66, 0x1a, 0xe5, 0x71, - 0x42, 0xf2, 0xe8, 0x90, 0x59, 0x44, 0x7a, 0x3b, 0x4a, 0xe1, 0xe3, 0xc4, 0x0b, 0x30, 0x6e, 0x5a, - 0xae, 0x66, 0x1a, 0x4e, 0x39, 0x77, 0x26, 0x31, 0x5f, 0x58, 0xfc, 0xd8, 0xd0, 0x44, 0x68, 0x50, - 0x1b, 0x89, 0x1b, 0x8b, 0x1b, 0x20, 0x38, 0x66, 0xdf, 0x56, 0x91, 0xac, 0x9a, 0x6d, 0x24, 0x6b, - 0x46, 0xc7, 0x2c, 0xe7, 0x09, 0xc1, 0xe9, 0xc1, 0x81, 0x10, 0xc3, 0x55, 0xb3, 0x8d, 0x36, 0x8c, - 0x8e, 0x29, 0x95, 0x9c, 0xd0, 0xb3, 0x78, 0x02, 0xb2, 0xce, 0x81, 0xe1, 0x2a, 0x2f, 0x97, 0x8b, - 0x24, 0x43, 0xd8, 0xd3, 0xdc, 0xb7, 0xb3, 0x30, 0x39, 0x4a, 0x8a, 0x5d, 0x81, 0x4c, 0x07, 0x8f, - 0xb2, 0x9c, 0x3c, 0x4e, 0x0c, 0x28, 0x26, 0x1c, 0xc4, 0xec, 0x8f, 0x19, 0xc4, 0x1a, 0x14, 0x0c, - 0xe4, 0xb8, 0xa8, 0x4d, 0x33, 0x22, 0x35, 0x62, 0x4e, 0x01, 0x05, 0x0d, 0xa6, 0x54, 0xfa, 0xc7, - 0x4a, 0xa9, 0x17, 0x60, 0xd2, 0x73, 0x49, 0xb6, 0x15, 0xa3, 0xcb, 0x73, 0xf3, 0x5c, 0x9c, 0x27, - 0x0b, 0x75, 0x8e, 0x93, 0x30, 0x4c, 0x2a, 0xa1, 0xd0, 0xb3, 0xb8, 0x06, 0x60, 0x1a, 0xc8, 0xec, - 0xc8, 0x6d, 0xa4, 0xea, 0xe5, 0xdc, 0x11, 0x51, 0x6a, 0x60, 0x93, 0x81, 0x28, 0x99, 0x54, 0xaa, - 0xea, 0xe2, 0x65, 0x3f, 0xd5, 0xc6, 0x8f, 0xc8, 0x94, 0x2d, 0xba, 0xc8, 0x06, 0xb2, 0x6d, 0x0f, - 0x4a, 0x36, 0xc2, 0x79, 0x8f, 0xda, 0x6c, 0x64, 0x79, 0xe2, 0xc4, 0x42, 0xec, 0xc8, 0x24, 0x06, - 0xa3, 0x03, 0x9b, 0xb0, 0x83, 0x8f, 0xe2, 0xc3, 0xe0, 0x09, 0x64, 0x92, 0x56, 0x40, 0xaa, 0x50, - 0x91, 0x0b, 0xb7, 0x95, 0x1e, 0x9a, 0xbd, 0x0d, 0xa5, 0x70, 0x78, 0xc4, 0x19, 0xc8, 0x38, 0xae, - 0x62, 0xbb, 0x24, 0x0b, 0x33, 0x12, 0x7d, 0x10, 0x05, 0x48, 0x21, 0xa3, 0x4d, 0xaa, 0x5c, 0x46, - 0xc2, 0x7f, 0x8a, 0x3f, 0xed, 0x0f, 0x38, 0x45, 0x06, 0xfc, 0xf1, 0xc1, 0x19, 0x0d, 0x31, 0x47, - 0xc7, 0x3d, 0x7b, 0x11, 0x26, 0x42, 0x03, 0x18, 0xf5, 0xd5, 0x73, 0x3f, 0x07, 0x0f, 0x0c, 0xa5, - 0x16, 0x5f, 0x80, 0x99, 0xbe, 0xa1, 0x19, 0x2e, 0xb2, 0x2d, 0x1b, 0xe1, 0x8c, 0xa5, 0xaf, 0x2a, - 0xff, 0xeb, 0xf8, 0x11, 0x39, 0xb7, 0x17, 0xb4, 0xa6, 0x2c, 0xd2, 0x74, 0x7f, 0x50, 0xf8, 0x44, - 0x3e, 0xf7, 0xa3, 0x71, 0xe1, 0xce, 0x9d, 0x3b, 0x77, 0x92, 0x73, 0xaf, 0x66, 0x61, 0x66, 0xd8, - 0x9a, 0x19, 0xba, 0x7c, 0x4f, 0x40, 0xd6, 0xe8, 0xf7, 0x5a, 0xc8, 0x26, 0x41, 0xca, 0x48, 0xec, - 0x49, 0xac, 0x41, 0x46, 0x57, 0x5a, 0x48, 0x2f, 0xa7, 0xcf, 0x24, 0xe6, 0x4b, 0x8b, 0x4f, 0x8e, - 0xb4, 0x2a, 0x17, 0x36, 0x31, 0x44, 0xa2, 0x48, 0xf1, 0x53, 0x90, 0x66, 0x25, 0x1a, 0x33, 0x3c, - 0x31, 0x1a, 0x03, 0x5e, 0x4b, 0x12, 0xc1, 0x89, 0x0f, 0x42, 0x1e, 0xff, 0x4b, 0x73, 0x23, 0x4b, - 0x7c, 0xce, 0x61, 0x01, 0xce, 0x0b, 0x71, 0x16, 0x72, 0x64, 0x99, 0xb4, 0x11, 0xdf, 0xda, 0xbc, - 0x67, 0x9c, 0x58, 0x6d, 0xd4, 0x51, 0xfa, 0xba, 0x2b, 0xdf, 0x54, 0xf4, 0x3e, 0x22, 0x09, 0x9f, - 0x97, 0x8a, 0x4c, 0xf8, 0x19, 0x2c, 0x13, 0x4f, 0x43, 0x81, 0xae, 0x2a, 0xcd, 0x68, 0xa3, 0x97, - 0x49, 0xf5, 0xcc, 0x48, 0x74, 0xa1, 0x6d, 0x60, 0x09, 0x7e, 0xfd, 0x75, 0xc7, 0x34, 0x78, 0x6a, - 0x92, 0x57, 0x60, 0x01, 0x79, 0xfd, 0xc5, 0x68, 0xe1, 0x7e, 0x68, 0xf8, 0xf0, 0xa2, 0x39, 0x35, - 0xf7, 0xcd, 0x24, 0xa4, 0x49, 0xbd, 0x98, 0x84, 0xc2, 0xee, 0x8b, 0x3b, 0x75, 0x79, 0xad, 0xb1, - 0xb7, 0xb2, 0x59, 0x17, 0x12, 0x62, 0x09, 0x80, 0x08, 0xae, 0x6e, 0x36, 0x6a, 0xbb, 0x42, 0xd2, - 0x7b, 0xde, 0xd8, 0xde, 0xbd, 0xb0, 0x24, 0xa4, 0x3c, 0xc0, 0x1e, 0x15, 0xa4, 0x83, 0x06, 0xe7, - 0x17, 0x85, 0x8c, 0x28, 0x40, 0x91, 0x12, 0x6c, 0xbc, 0x50, 0x5f, 0xbb, 0xb0, 0x24, 0x64, 0xc3, - 0x92, 0xf3, 0x8b, 0xc2, 0xb8, 0x38, 0x01, 0x79, 0x22, 0x59, 0x69, 0x34, 0x36, 0x85, 0x9c, 0xc7, - 0xd9, 0xdc, 0x95, 0x36, 0xb6, 0xd7, 0x85, 0xbc, 0xc7, 0xb9, 0x2e, 0x35, 0xf6, 0x76, 0x04, 0xf0, - 0x18, 0xb6, 0xea, 0xcd, 0x66, 0x6d, 0xbd, 0x2e, 0x14, 0x3c, 0x8b, 0x95, 0x17, 0x77, 0xeb, 0x4d, - 0xa1, 0x18, 0x72, 0xeb, 0xfc, 0xa2, 0x30, 0xe1, 0xbd, 0xa2, 0xbe, 0xbd, 0xb7, 0x25, 0x94, 0xc4, - 0x29, 0x98, 0xa0, 0xaf, 0xe0, 0x4e, 0x4c, 0x46, 0x44, 0x17, 0x96, 0x04, 0xc1, 0x77, 0x84, 0xb2, - 0x4c, 0x85, 0x04, 0x17, 0x96, 0x04, 0x71, 0x6e, 0x15, 0x32, 0x24, 0xbb, 0x44, 0x11, 0x4a, 0x9b, - 0xb5, 0x95, 0xfa, 0xa6, 0xdc, 0xd8, 0xd9, 0xdd, 0x68, 0x6c, 0xd7, 0x36, 0x85, 0x84, 0x2f, 0x93, - 0xea, 0x9f, 0xde, 0xdb, 0x90, 0xea, 0x6b, 0x42, 0x32, 0x28, 0xdb, 0xa9, 0xd7, 0x76, 0xeb, 0x6b, - 0x42, 0x6a, 0x4e, 0x85, 0x99, 0x61, 0x75, 0x72, 0xe8, 0xca, 0x08, 0x4c, 0x71, 0xf2, 0x88, 0x29, - 0x26, 0x5c, 0x03, 0x53, 0xfc, 0xc3, 0x24, 0x4c, 0x0f, 0xd9, 0x2b, 0x86, 0xbe, 0xe4, 0x59, 0xc8, - 0xd0, 0x14, 0xa5, 0xbb, 0xe7, 0xe3, 0x43, 0x37, 0x1d, 0x92, 0xb0, 0x03, 0x3b, 0x28, 0xc1, 0x05, - 0x3b, 0x88, 0xd4, 0x11, 0x1d, 0x04, 0xa6, 0x18, 0xa8, 0xe9, 0x3f, 0x3b, 0x50, 0xd3, 0xe9, 0xb6, - 0x77, 0x61, 0x94, 0x6d, 0x8f, 0xc8, 0x8e, 0x57, 0xdb, 0x33, 0x43, 0x6a, 0xfb, 0x15, 0x98, 0x1a, - 0x20, 0x1a, 0xb9, 0xc6, 0xbe, 0x92, 0x80, 0xf2, 0x51, 0xc1, 0x89, 0xa9, 0x74, 0xc9, 0x50, 0xa5, - 0xbb, 0x12, 0x8d, 0xe0, 0xd9, 0xa3, 0x27, 0x61, 0x60, 0xae, 0xdf, 0x4c, 0xc0, 0x89, 0xe1, 0x9d, - 0xe2, 0x50, 0x1f, 0x3e, 0x05, 0xd9, 0x1e, 0x72, 0xf7, 0x4d, 0xde, 0x2d, 0x7d, 0x7c, 0xc8, 0x1e, - 0x8c, 0xd5, 0xd1, 0xc9, 0x66, 0xa8, 0xe0, 0x26, 0x9e, 0x3a, 0xaa, 0xdd, 0xa3, 0xde, 0x0c, 0x78, - 0xfa, 0xf9, 0x24, 0x3c, 0x30, 0x94, 0x7c, 0xa8, 0xa3, 0x0f, 0x01, 0x68, 0x86, 0xd5, 0x77, 0x69, - 0x47, 0x44, 0x0b, 0x6c, 0x9e, 0x48, 0x48, 0xf1, 0xc2, 0xc5, 0xb3, 0xef, 0x7a, 0xfa, 0x14, 0xd1, - 0x03, 0x15, 0x11, 0x83, 0x4b, 0xbe, 0xa3, 0x69, 0xe2, 0x68, 0xe5, 0x88, 0x91, 0x0e, 0x24, 0xe6, - 0xd3, 0x20, 0xa8, 0xba, 0x86, 0x0c, 0x57, 0x76, 0x5c, 0x1b, 0x29, 0x3d, 0xcd, 0xe8, 0x92, 0x1d, - 0x24, 0x57, 0xcd, 0x74, 0x14, 0xdd, 0x41, 0xd2, 0x24, 0x55, 0x37, 0xb9, 0x16, 0x23, 0x48, 0x02, - 0xd9, 0x01, 0x44, 0x36, 0x84, 0xa0, 0x6a, 0x0f, 0x31, 0xf7, 0xab, 0x79, 0x28, 0x04, 0xfa, 0x6a, - 0xf1, 0x2c, 0x14, 0xaf, 0x2b, 0x37, 0x15, 0x99, 0x9f, 0x95, 0x68, 0x24, 0x0a, 0x58, 0xb6, 0xc3, - 0xce, 0x4b, 0x4f, 0xc3, 0x0c, 0x31, 0x31, 0xfb, 0x2e, 0xb2, 0x65, 0x55, 0x57, 0x1c, 0x87, 0x04, - 0x2d, 0x47, 0x4c, 0x45, 0xac, 0x6b, 0x60, 0xd5, 0x2a, 0xd7, 0x88, 0xcb, 0x30, 0x4d, 0x10, 0xbd, - 0xbe, 0xee, 0x6a, 0x96, 0x8e, 0x64, 0x7c, 0x7a, 0x73, 0xc8, 0x4e, 0xe2, 0x79, 0x36, 0x85, 0x2d, - 0xb6, 0x98, 0x01, 0xf6, 0xc8, 0x11, 0xd7, 0xe0, 0x21, 0x02, 0xeb, 0x22, 0x03, 0xd9, 0x8a, 0x8b, - 0x64, 0xf4, 0xb9, 0xbe, 0xa2, 0x3b, 0xb2, 0x62, 0xb4, 0xe5, 0x7d, 0xc5, 0xd9, 0x2f, 0xcf, 0x60, - 0x82, 0x95, 0x64, 0x39, 0x21, 0x9d, 0xc2, 0x86, 0xeb, 0xcc, 0xae, 0x4e, 0xcc, 0x6a, 0x46, 0xfb, - 0x9a, 0xe2, 0xec, 0x8b, 0x55, 0x38, 0x41, 0x58, 0x1c, 0xd7, 0xd6, 0x8c, 0xae, 0xac, 0xee, 0x23, - 0xf5, 0x86, 0xdc, 0x77, 0x3b, 0x97, 0xca, 0x0f, 0x06, 0xdf, 0x4f, 0x3c, 0x6c, 0x12, 0x9b, 0x55, - 0x6c, 0xb2, 0xe7, 0x76, 0x2e, 0x89, 0x4d, 0x28, 0xe2, 0xc9, 0xe8, 0x69, 0xb7, 0x91, 0xdc, 0x31, - 0x6d, 0xb2, 0x35, 0x96, 0x86, 0x94, 0xa6, 0x40, 0x04, 0x17, 0x1a, 0x0c, 0xb0, 0x65, 0xb6, 0x51, - 0x35, 0xd3, 0xdc, 0xa9, 0xd7, 0xd7, 0xa4, 0x02, 0x67, 0xb9, 0x6a, 0xda, 0x38, 0xa1, 0xba, 0xa6, - 0x17, 0xe0, 0x02, 0x4d, 0xa8, 0xae, 0xc9, 0xc3, 0xbb, 0x0c, 0xd3, 0xaa, 0x4a, 0xc7, 0xac, 0xa9, - 0x32, 0x3b, 0x63, 0x39, 0x65, 0x21, 0x14, 0x2c, 0x55, 0x5d, 0xa7, 0x06, 0x2c, 0xc7, 0x1d, 0xf1, - 0x32, 0x3c, 0xe0, 0x07, 0x2b, 0x08, 0x9c, 0x1a, 0x18, 0x65, 0x14, 0xba, 0x0c, 0xd3, 0xd6, 0xc1, - 0x20, 0x50, 0x0c, 0xbd, 0xd1, 0x3a, 0x88, 0xc2, 0x2e, 0xc2, 0x8c, 0xb5, 0x6f, 0x0d, 0xe2, 0x9e, - 0x08, 0xe2, 0x44, 0x6b, 0xdf, 0x8a, 0x02, 0x1f, 0x25, 0x07, 0x6e, 0x1b, 0xa9, 0x8a, 0x8b, 0xda, - 0xe5, 0x93, 0x41, 0xf3, 0x80, 0x42, 0x3c, 0x07, 0x82, 0xaa, 0xca, 0xc8, 0x50, 0x5a, 0x3a, 0x92, - 0x15, 0x1b, 0x19, 0x8a, 0x53, 0x3e, 0x1d, 0x34, 0x2e, 0xa9, 0x6a, 0x9d, 0x68, 0x6b, 0x44, 0x29, - 0x3e, 0x01, 0x53, 0x66, 0xeb, 0xba, 0x4a, 0x53, 0x52, 0xb6, 0x6c, 0xd4, 0xd1, 0x5e, 0x2e, 0x3f, - 0x42, 0xe2, 0x3b, 0x89, 0x15, 0x24, 0x21, 0x77, 0x88, 0x58, 0x7c, 0x1c, 0x04, 0xd5, 0xd9, 0x57, - 0x6c, 0x8b, 0xd4, 0x64, 0xc7, 0x52, 0x54, 0x54, 0x7e, 0x94, 0x9a, 0x52, 0xf9, 0x36, 0x17, 0xe3, - 0x25, 0xe1, 0xdc, 0xd2, 0x3a, 0x2e, 0x67, 0x7c, 0x8c, 0x2e, 0x09, 0x22, 0x63, 0x6c, 0xf3, 0x20, - 0xe0, 0x50, 0x84, 0x5e, 0x3c, 0x4f, 0xcc, 0x4a, 0xd6, 0xbe, 0x15, 0x7c, 0xef, 0xc3, 0x30, 0x81, - 0x2d, 0xfd, 0x97, 0x3e, 0x4e, 0x1b, 0x32, 0x6b, 0x3f, 0xf0, 0xc6, 0x25, 0x38, 0x81, 0x8d, 0x7a, - 0xc8, 0x55, 0xda, 0x8a, 0xab, 0x04, 0xac, 0x3f, 0x41, 0xac, 0x71, 0xdc, 0xb7, 0x98, 0x32, 0xe4, - 0xa7, 0xdd, 0x6f, 0x1d, 0x78, 0x99, 0xf5, 0x14, 0xf5, 0x13, 0xcb, 0x78, 0x6e, 0x7d, 0x68, 0x4d, - 0xf7, 0x5c, 0x15, 0x8a, 0xc1, 0xc4, 0x17, 0xf3, 0x40, 0x53, 0x5f, 0x48, 0xe0, 0x2e, 0x68, 0xb5, - 0xb1, 0x86, 0xfb, 0x97, 0x97, 0xea, 0x42, 0x12, 0xf7, 0x51, 0x9b, 0x1b, 0xbb, 0x75, 0x59, 0xda, - 0xdb, 0xde, 0xdd, 0xd8, 0xaa, 0x0b, 0xa9, 0x60, 0xc3, 0xfe, 0xdd, 0x24, 0x94, 0xc2, 0x67, 0x2f, - 0xf1, 0xa7, 0xe0, 0x24, 0xbf, 0x28, 0x71, 0x90, 0x2b, 0xdf, 0xd2, 0x6c, 0xb2, 0x16, 0x7b, 0x0a, - 0xdd, 0x17, 0xbd, 0x6c, 0x98, 0x61, 0x56, 0x4d, 0xe4, 0x3e, 0xaf, 0xd9, 0x78, 0xa5, 0xf5, 0x14, - 0x57, 0xdc, 0x84, 0xd3, 0x86, 0x29, 0x3b, 0xae, 0x62, 0xb4, 0x15, 0xbb, 0x2d, 0xfb, 0x57, 0x54, - 0xb2, 0xa2, 0xaa, 0xc8, 0x71, 0x4c, 0xba, 0x07, 0x7a, 0x2c, 0x1f, 0x33, 0xcc, 0x26, 0x33, 0xf6, - 0x37, 0x87, 0x1a, 0x33, 0x8d, 0x64, 0x6e, 0xea, 0xa8, 0xcc, 0x7d, 0x10, 0xf2, 0x3d, 0xc5, 0x92, - 0x91, 0xe1, 0xda, 0x07, 0xa4, 0xe3, 0xce, 0x49, 0xb9, 0x9e, 0x62, 0xd5, 0xf1, 0xf3, 0x47, 0x73, - 0xf0, 0xf9, 0x41, 0x0a, 0x8a, 0xc1, 0xae, 0x1b, 0x1f, 0x62, 0x54, 0xb2, 0x41, 0x25, 0x48, 0x09, - 0x7b, 0xf8, 0xbe, 0x3d, 0xfa, 0xc2, 0x2a, 0xde, 0xb9, 0xaa, 0x59, 0xda, 0x0b, 0x4b, 0x14, 0x89, - 0xbb, 0x06, 0x9c, 0x5a, 0x88, 0xf6, 0x1e, 0x39, 0x89, 0x3d, 0x89, 0xeb, 0x90, 0xbd, 0xee, 0x10, - 0xee, 0x2c, 0xe1, 0x7e, 0xe4, 0xfe, 0xdc, 0xcf, 0x35, 0x09, 0x79, 0xfe, 0xb9, 0xa6, 0xbc, 0xdd, - 0x90, 0xb6, 0x6a, 0x9b, 0x12, 0x83, 0x8b, 0xa7, 0x20, 0xad, 0x2b, 0xb7, 0x0f, 0xc2, 0x7b, 0x1c, - 0x11, 0x8d, 0x1a, 0xf8, 0x53, 0x90, 0xbe, 0x85, 0x94, 0x1b, 0xe1, 0x9d, 0x85, 0x88, 0x3e, 0xc4, - 0xd4, 0x3f, 0x07, 0x19, 0x12, 0x2f, 0x11, 0x80, 0x45, 0x4c, 0x18, 0x13, 0x73, 0x90, 0x5e, 0x6d, - 0x48, 0x38, 0xfd, 0x05, 0x28, 0x52, 0xa9, 0xbc, 0xb3, 0x51, 0x5f, 0xad, 0x0b, 0xc9, 0xb9, 0x65, - 0xc8, 0xd2, 0x20, 0xe0, 0xa5, 0xe1, 0x85, 0x41, 0x18, 0x63, 0x8f, 0x8c, 0x23, 0xc1, 0xb5, 0x7b, - 0x5b, 0x2b, 0x75, 0x49, 0x48, 0x06, 0xa7, 0xd7, 0x81, 0x62, 0xb0, 0xe1, 0xfe, 0x68, 0x72, 0xea, - 0x3b, 0x09, 0x28, 0x04, 0x1a, 0x68, 0xdc, 0xf9, 0x28, 0xba, 0x6e, 0xde, 0x92, 0x15, 0x5d, 0x53, - 0x1c, 0x96, 0x14, 0x40, 0x44, 0x35, 0x2c, 0x19, 0x75, 0xd2, 0x3e, 0x12, 0xe7, 0xdf, 0x48, 0x80, - 0x10, 0xed, 0x5d, 0x23, 0x0e, 0x26, 0x7e, 0xa2, 0x0e, 0xbe, 0x9e, 0x80, 0x52, 0xb8, 0x61, 0x8d, - 0xb8, 0x77, 0xf6, 0x27, 0xea, 0xde, 0xdb, 0x49, 0x98, 0x08, 0xb5, 0xa9, 0xa3, 0x7a, 0xf7, 0x39, - 0x98, 0xd2, 0xda, 0xa8, 0x67, 0x99, 0x2e, 0x32, 0xd4, 0x03, 0x59, 0x47, 0x37, 0x91, 0x5e, 0x9e, - 0x23, 0x85, 0xe2, 0xdc, 0xfd, 0x1b, 0xe1, 0x85, 0x0d, 0x1f, 0xb7, 0x89, 0x61, 0xd5, 0xe9, 0x8d, - 0xb5, 0xfa, 0xd6, 0x4e, 0x63, 0xb7, 0xbe, 0xbd, 0xfa, 0xa2, 0xbc, 0xb7, 0xfd, 0x33, 0xdb, 0x8d, - 0xe7, 0xb7, 0x25, 0x41, 0x8b, 0x98, 0x7d, 0x88, 0x4b, 0x7d, 0x07, 0x84, 0xa8, 0x53, 0xe2, 0x49, - 0x18, 0xe6, 0x96, 0x30, 0x26, 0x4e, 0xc3, 0xe4, 0x76, 0x43, 0x6e, 0x6e, 0xac, 0xd5, 0xe5, 0xfa, - 0xd5, 0xab, 0xf5, 0xd5, 0xdd, 0x26, 0xbd, 0xda, 0xf0, 0xac, 0x77, 0xc3, 0x8b, 0xfa, 0xb5, 0x14, - 0x4c, 0x0f, 0xf1, 0x44, 0xac, 0xb1, 0x43, 0x09, 0x3d, 0x27, 0x3d, 0x35, 0x8a, 0xf7, 0x0b, 0xb8, - 0x2b, 0xd8, 0x51, 0x6c, 0x97, 0x9d, 0x61, 0x1e, 0x07, 0x1c, 0x25, 0xc3, 0xd5, 0x3a, 0x1a, 0xb2, - 0xd9, 0x4d, 0x10, 0x3d, 0xa9, 0x4c, 0xfa, 0x72, 0x7a, 0x19, 0xf4, 0x09, 0x10, 0x2d, 0xd3, 0xd1, - 0x5c, 0xed, 0x26, 0x92, 0x35, 0x83, 0x5f, 0x1b, 0xe1, 0x93, 0x4b, 0x5a, 0x12, 0xb8, 0x66, 0xc3, - 0x70, 0x3d, 0x6b, 0x03, 0x75, 0x95, 0x88, 0x35, 0x2e, 0xe0, 0x29, 0x49, 0xe0, 0x1a, 0xcf, 0xfa, - 0x2c, 0x14, 0xdb, 0x66, 0x1f, 0xb7, 0x73, 0xd4, 0x0e, 0xef, 0x17, 0x09, 0xa9, 0x40, 0x65, 0x9e, - 0x09, 0x6b, 0xd4, 0xfd, 0xfb, 0xaa, 0xa2, 0x54, 0xa0, 0x32, 0x6a, 0xf2, 0x18, 0x4c, 0x2a, 0xdd, - 0xae, 0x8d, 0xc9, 0x39, 0x11, 0x3d, 0x7a, 0x94, 0x3c, 0x31, 0x31, 0x9c, 0x7d, 0x0e, 0x72, 0x3c, - 0x0e, 0x78, 0x4b, 0xc6, 0x91, 0x90, 0x2d, 0x7a, 0x9e, 0x4e, 0xce, 0xe7, 0xa5, 0x9c, 0xc1, 0x95, - 0x67, 0xa1, 0xa8, 0x39, 0xb2, 0x7f, 0xfd, 0x9e, 0x3c, 0x93, 0x9c, 0xcf, 0x49, 0x05, 0xcd, 0xf1, - 0xae, 0x2e, 0xe7, 0xde, 0x4c, 0x42, 0x29, 0xfc, 0xf9, 0x40, 0x5c, 0x83, 0x9c, 0x6e, 0xaa, 0x0a, - 0x49, 0x2d, 0xfa, 0xed, 0x6a, 0x3e, 0xe6, 0x8b, 0xc3, 0xc2, 0x26, 0xb3, 0x97, 0x3c, 0xe4, 0xec, - 0x3f, 0x27, 0x20, 0xc7, 0xc5, 0xe2, 0x09, 0x48, 0x5b, 0x8a, 0xbb, 0x4f, 0xe8, 0x32, 0x2b, 0x49, - 0x21, 0x21, 0x91, 0x67, 0x2c, 0x77, 0x2c, 0xc5, 0x20, 0x29, 0xc0, 0xe4, 0xf8, 0x19, 0xcf, 0xab, - 0x8e, 0x94, 0x36, 0x39, 0xd7, 0x98, 0xbd, 0x1e, 0x32, 0x5c, 0x87, 0xcf, 0x2b, 0x93, 0xaf, 0x32, - 0xb1, 0xf8, 0x24, 0x4c, 0xb9, 0xb6, 0xa2, 0xe9, 0x21, 0xdb, 0x34, 0xb1, 0x15, 0xb8, 0xc2, 0x33, - 0xae, 0xc2, 0x29, 0xce, 0xdb, 0x46, 0xae, 0xa2, 0xee, 0xa3, 0xb6, 0x0f, 0xca, 0x92, 0xfb, 0x8b, - 0x93, 0xcc, 0x60, 0x8d, 0xe9, 0x39, 0x76, 0xee, 0xfb, 0x09, 0x98, 0xe2, 0x27, 0xb1, 0xb6, 0x17, - 0xac, 0x2d, 0x00, 0xc5, 0x30, 0x4c, 0x37, 0x18, 0xae, 0xc1, 0x54, 0x1e, 0xc0, 0x2d, 0xd4, 0x3c, - 0x90, 0x14, 0x20, 0x98, 0xed, 0x01, 0xf8, 0x9a, 0x23, 0xc3, 0x76, 0x1a, 0x0a, 0xec, 0xdb, 0x10, - 0xf9, 0xc0, 0x48, 0xcf, 0xee, 0x40, 0x45, 0xf8, 0xc8, 0x26, 0xce, 0x40, 0xa6, 0x85, 0xba, 0x9a, - 0xc1, 0x6e, 0x7c, 0xe9, 0x03, 0xbf, 0x61, 0x49, 0x7b, 0x37, 0x2c, 0x2b, 0x9f, 0x85, 0x69, 0xd5, - 0xec, 0x45, 0xdd, 0x5d, 0x11, 0x22, 0xf7, 0x07, 0xce, 0xb5, 0xc4, 0x4b, 0xe0, 0xb7, 0x98, 0xef, - 0x27, 0x12, 0x5f, 0x4e, 0xa6, 0xd6, 0x77, 0x56, 0xbe, 0x96, 0x9c, 0x5d, 0xa7, 0xd0, 0x1d, 0x3e, - 0x52, 0x09, 0x75, 0x74, 0xa4, 0x62, 0xef, 0xe1, 0x2b, 0x4f, 0xc2, 0x53, 0x5d, 0xcd, 0xdd, 0xef, - 0xb7, 0x16, 0x54, 0xb3, 0x77, 0xae, 0x6b, 0x76, 0x4d, 0xff, 0x9b, 0x2a, 0x7e, 0x22, 0x0f, 0xe4, - 0x2f, 0xf6, 0x5d, 0x35, 0xef, 0x49, 0x67, 0x63, 0x3f, 0xc2, 0x56, 0xb7, 0x61, 0x9a, 0x19, 0xcb, - 0xe4, 0xc3, 0x0e, 0x3d, 0x9e, 0x88, 0xf7, 0xbd, 0x1c, 0x2b, 0x7f, 0xe3, 0x1d, 0xb2, 0x5d, 0x4b, - 0x53, 0x0c, 0x8a, 0x75, 0xf4, 0x04, 0x53, 0x95, 0xe0, 0x81, 0x10, 0x1f, 0x5d, 0x9a, 0xc8, 0x8e, - 0x61, 0xfc, 0x2e, 0x63, 0x9c, 0x0e, 0x30, 0x36, 0x19, 0xb4, 0xba, 0x0a, 0x13, 0xc7, 0xe1, 0xfa, - 0x47, 0xc6, 0x55, 0x44, 0x41, 0x92, 0x75, 0x98, 0x24, 0x24, 0x6a, 0xdf, 0x71, 0xcd, 0x1e, 0xa9, - 0x7b, 0xf7, 0xa7, 0xf9, 0xa7, 0x77, 0xe8, 0x5a, 0x29, 0x61, 0xd8, 0xaa, 0x87, 0xaa, 0x56, 0x81, - 0x7c, 0xcb, 0x6a, 0x23, 0x55, 0x8f, 0x61, 0x78, 0x8b, 0x39, 0xe2, 0xd9, 0x57, 0x3f, 0x03, 0x33, - 0xf8, 0x6f, 0x52, 0x96, 0x82, 0x9e, 0xc4, 0xdf, 0xa4, 0x95, 0xbf, 0xff, 0x0a, 0x5d, 0x8e, 0xd3, - 0x1e, 0x41, 0xc0, 0xa7, 0xc0, 0x2c, 0x76, 0x91, 0xeb, 0x22, 0xdb, 0x91, 0x15, 0x7d, 0x98, 0x7b, - 0x81, 0xab, 0x88, 0xf2, 0x17, 0xde, 0x0d, 0xcf, 0xe2, 0x3a, 0x45, 0xd6, 0x74, 0xbd, 0xba, 0x07, - 0x27, 0x87, 0x64, 0xc5, 0x08, 0x9c, 0xaf, 0x31, 0xce, 0x99, 0x81, 0xcc, 0xc0, 0xb4, 0x3b, 0xc0, - 0xe5, 0xde, 0x5c, 0x8e, 0xc0, 0xf9, 0xfb, 0x8c, 0x53, 0x64, 0x58, 0x3e, 0xa5, 0x98, 0xf1, 0x39, - 0x98, 0xba, 0x89, 0xec, 0x96, 0xe9, 0xb0, 0xeb, 0x9f, 0x11, 0xe8, 0x5e, 0x67, 0x74, 0x93, 0x0c, - 0x48, 0xee, 0x83, 0x30, 0xd7, 0x65, 0xc8, 0x75, 0x14, 0x15, 0x8d, 0x40, 0xf1, 0x45, 0x46, 0x31, - 0x8e, 0xed, 0x31, 0xb4, 0x06, 0xc5, 0xae, 0xc9, 0x76, 0xa6, 0x78, 0xf8, 0x1b, 0x0c, 0x5e, 0xe0, - 0x18, 0x46, 0x61, 0x99, 0x56, 0x5f, 0xc7, 0xdb, 0x56, 0x3c, 0xc5, 0x1f, 0x70, 0x0a, 0x8e, 0x61, - 0x14, 0xc7, 0x08, 0xeb, 0x1f, 0x72, 0x0a, 0x27, 0x10, 0xcf, 0x67, 0xa1, 0x60, 0x1a, 0xfa, 0x81, - 0x69, 0x8c, 0xe2, 0xc4, 0x97, 0x18, 0x03, 0x30, 0x08, 0x26, 0xb8, 0x02, 0xf9, 0x51, 0x27, 0xe2, - 0x8f, 0xdf, 0xe5, 0xcb, 0x83, 0xcf, 0xc0, 0x3a, 0x4c, 0xf2, 0x02, 0xa5, 0x99, 0xc6, 0x08, 0x14, - 0x5f, 0x61, 0x14, 0xa5, 0x00, 0x8c, 0x0d, 0xc3, 0x45, 0x8e, 0xdb, 0x45, 0xa3, 0x90, 0xbc, 0xc9, - 0x87, 0xc1, 0x20, 0x2c, 0x94, 0x2d, 0x64, 0xa8, 0xfb, 0xa3, 0x31, 0x7c, 0x95, 0x87, 0x92, 0x63, - 0x30, 0xc5, 0x2a, 0x4c, 0xf4, 0x14, 0xdb, 0xd9, 0x57, 0xf4, 0x91, 0xa6, 0xe3, 0x4f, 0x18, 0x47, - 0xd1, 0x03, 0xb1, 0x88, 0xf4, 0x8d, 0xe3, 0xd0, 0x7c, 0x8d, 0x47, 0x24, 0x00, 0x63, 0x4b, 0xcf, - 0x71, 0xc9, 0x5d, 0xd9, 0x71, 0xd8, 0xfe, 0x94, 0x2f, 0x3d, 0x8a, 0xdd, 0x0a, 0x32, 0x5e, 0x81, - 0xbc, 0xa3, 0xdd, 0x1e, 0x89, 0xe6, 0xcf, 0xf8, 0x4c, 0x13, 0x00, 0x06, 0xbf, 0x08, 0xa7, 0x86, - 0x6e, 0x13, 0x23, 0x90, 0xfd, 0x39, 0x23, 0x3b, 0x31, 0x64, 0xab, 0x60, 0x25, 0xe1, 0xb8, 0x94, - 0x7f, 0xc1, 0x4b, 0x02, 0x8a, 0x70, 0xed, 0xe0, 0xb3, 0x82, 0xa3, 0x74, 0x8e, 0x17, 0xb5, 0xbf, - 0xe4, 0x51, 0xa3, 0xd8, 0x50, 0xd4, 0x76, 0xe1, 0x04, 0x63, 0x3c, 0xde, 0xbc, 0x7e, 0x9d, 0x17, - 0x56, 0x8a, 0xde, 0x0b, 0xcf, 0xee, 0x67, 0x61, 0xd6, 0x0b, 0x27, 0x6f, 0x4a, 0x1d, 0xb9, 0xa7, - 0x58, 0x23, 0x30, 0x7f, 0x83, 0x31, 0xf3, 0x8a, 0xef, 0x75, 0xb5, 0xce, 0x96, 0x62, 0x61, 0xf2, - 0x17, 0xa0, 0xcc, 0xc9, 0xfb, 0x86, 0x8d, 0x54, 0xb3, 0x6b, 0x68, 0xb7, 0x51, 0x7b, 0x04, 0xea, - 0xbf, 0x8a, 0x4c, 0xd5, 0x5e, 0x00, 0x8e, 0x99, 0x37, 0x40, 0xf0, 0x7a, 0x15, 0x59, 0xeb, 0x59, - 0xa6, 0xed, 0xc6, 0x30, 0xfe, 0x35, 0x9f, 0x29, 0x0f, 0xb7, 0x41, 0x60, 0xd5, 0x3a, 0x94, 0xc8, - 0xe3, 0xa8, 0x29, 0xf9, 0x37, 0x8c, 0x68, 0xc2, 0x47, 0xb1, 0xc2, 0xa1, 0x9a, 0x3d, 0x4b, 0xb1, - 0x47, 0xa9, 0x7f, 0x7f, 0xcb, 0x0b, 0x07, 0x83, 0xb0, 0xc2, 0xe1, 0x1e, 0x58, 0x08, 0xef, 0xf6, - 0x23, 0x30, 0x7c, 0x93, 0x17, 0x0e, 0x8e, 0x61, 0x14, 0xbc, 0x61, 0x18, 0x81, 0xe2, 0xef, 0x38, - 0x05, 0xc7, 0x60, 0x8a, 0x4f, 0xfb, 0x1b, 0xad, 0x8d, 0xba, 0x9a, 0xe3, 0xda, 0xb4, 0x15, 0xbe, - 0x3f, 0xd5, 0xb7, 0xde, 0x0d, 0x37, 0x61, 0x52, 0x00, 0x8a, 0x2b, 0x11, 0xbb, 0x42, 0x25, 0x27, - 0xa5, 0x78, 0xc7, 0xbe, 0xcd, 0x2b, 0x51, 0x00, 0x86, 0x7d, 0x0b, 0x74, 0x88, 0x38, 0xec, 0x2a, - 0x3e, 0x1f, 0x8c, 0x40, 0xf7, 0x9d, 0x88, 0x73, 0x4d, 0x8e, 0xc5, 0x9c, 0x81, 0xfe, 0xa7, 0x6f, - 0xdc, 0x40, 0x07, 0x23, 0x65, 0xe7, 0xdf, 0x47, 0xfa, 0x9f, 0x3d, 0x8a, 0xa4, 0x35, 0x64, 0x32, - 0xd2, 0x4f, 0x89, 0x71, 0xbf, 0x02, 0x2a, 0xff, 0xfc, 0x3d, 0x36, 0xde, 0x70, 0x3b, 0x55, 0xdd, - 0xc4, 0x49, 0x1e, 0x6e, 0x7a, 0xe2, 0xc9, 0x5e, 0xb9, 0xe7, 0xe5, 0x79, 0xa8, 0xe7, 0xa9, 0x5e, - 0x85, 0x89, 0x50, 0xc3, 0x13, 0x4f, 0xf5, 0x0b, 0x8c, 0xaa, 0x18, 0xec, 0x77, 0xaa, 0xcb, 0x90, - 0xc6, 0xcd, 0x4b, 0x3c, 0xfc, 0x17, 0x19, 0x9c, 0x98, 0x57, 0x3f, 0x09, 0x39, 0xde, 0xb4, 0xc4, - 0x43, 0x7f, 0x89, 0x41, 0x3d, 0x08, 0x86, 0xf3, 0x86, 0x25, 0x1e, 0xfe, 0xcb, 0x1c, 0xce, 0x21, - 0x18, 0x3e, 0x7a, 0x08, 0xff, 0xe1, 0x57, 0xd2, 0x6c, 0xd3, 0xe1, 0xb1, 0xbb, 0x02, 0xe3, 0xac, - 0x53, 0x89, 0x47, 0x7f, 0x9e, 0xbd, 0x9c, 0x23, 0xaa, 0x17, 0x21, 0x33, 0x62, 0xc0, 0x7f, 0x8d, - 0x41, 0xa9, 0x7d, 0x75, 0x15, 0x0a, 0x81, 0xee, 0x24, 0x1e, 0xfe, 0xeb, 0x0c, 0x1e, 0x44, 0x61, - 0xd7, 0x59, 0x77, 0x12, 0x4f, 0xf0, 0x1b, 0xdc, 0x75, 0x86, 0xc0, 0x61, 0xe3, 0x8d, 0x49, 0x3c, - 0xfa, 0x37, 0x79, 0xd4, 0x39, 0xa4, 0xfa, 0x2c, 0xe4, 0xbd, 0xcd, 0x26, 0x1e, 0xff, 0x5b, 0x0c, - 0xef, 0x63, 0x70, 0x04, 0x02, 0x9b, 0x5d, 0x3c, 0xc5, 0x6f, 0xf3, 0x08, 0x04, 0x50, 0x78, 0x19, - 0x45, 0x1b, 0x98, 0x78, 0xa6, 0xdf, 0xe1, 0xcb, 0x28, 0xd2, 0xbf, 0xe0, 0xd9, 0x24, 0x35, 0x3f, - 0x9e, 0xe2, 0x77, 0xf9, 0x6c, 0x12, 0x7b, 0xec, 0x46, 0xb4, 0x23, 0x88, 0xe7, 0xf8, 0x3d, 0xee, - 0x46, 0xa4, 0x21, 0xa8, 0xee, 0x80, 0x38, 0xd8, 0x0d, 0xc4, 0xf3, 0xbd, 0xca, 0xf8, 0xa6, 0x06, - 0x9a, 0x81, 0xea, 0xf3, 0x70, 0x62, 0x78, 0x27, 0x10, 0xcf, 0xfa, 0x85, 0x7b, 0x91, 0xb3, 0x5b, - 0xb0, 0x11, 0xa8, 0xee, 0xfa, 0x5b, 0x4a, 0xb0, 0x0b, 0x88, 0xa7, 0x7d, 0xed, 0x5e, 0xb8, 0x70, - 0x07, 0x9b, 0x80, 0x6a, 0x0d, 0xc0, 0xdf, 0x80, 0xe3, 0xb9, 0x5e, 0x67, 0x5c, 0x01, 0x10, 0x5e, - 0x1a, 0x6c, 0xff, 0x8d, 0xc7, 0x7f, 0x91, 0x2f, 0x0d, 0x86, 0xc0, 0x4b, 0x83, 0x6f, 0xbd, 0xf1, - 0xe8, 0x37, 0xf8, 0xd2, 0xe0, 0x10, 0x9c, 0xd9, 0x81, 0xdd, 0x2d, 0x9e, 0xe1, 0x4b, 0x3c, 0xb3, - 0x03, 0xa8, 0xea, 0x36, 0x4c, 0x0d, 0x6c, 0x88, 0xf1, 0x54, 0x5f, 0x66, 0x54, 0x42, 0x74, 0x3f, - 0x0c, 0x6e, 0x5e, 0x6c, 0x33, 0x8c, 0x67, 0xfb, 0xa3, 0xc8, 0xe6, 0xc5, 0xf6, 0xc2, 0xea, 0x15, - 0xc8, 0x19, 0x7d, 0x5d, 0xc7, 0x8b, 0x47, 0xbc, 0xff, 0x2f, 0xf7, 0xca, 0xff, 0xf6, 0x01, 0x8b, - 0x0e, 0x07, 0x54, 0x97, 0x21, 0x83, 0x7a, 0x2d, 0xd4, 0x8e, 0x43, 0xfe, 0xfb, 0x07, 0xbc, 0x60, - 0x62, 0xeb, 0xea, 0xb3, 0x00, 0xf4, 0x6a, 0x84, 0x7c, 0xf6, 0x8b, 0xc1, 0xfe, 0xc7, 0x07, 0xec, - 0x37, 0x35, 0x3e, 0xc4, 0x27, 0xa0, 0xbf, 0xd0, 0xb9, 0x3f, 0xc1, 0xbb, 0x61, 0x02, 0x32, 0x23, - 0x97, 0x61, 0xfc, 0xba, 0x63, 0x1a, 0xae, 0xd2, 0x8d, 0x43, 0xff, 0x27, 0x43, 0x73, 0x7b, 0x1c, - 0xb0, 0x9e, 0x69, 0x23, 0x57, 0xe9, 0x3a, 0x71, 0xd8, 0xff, 0x62, 0x58, 0x0f, 0x80, 0xc1, 0xaa, - 0xe2, 0xb8, 0xa3, 0x8c, 0xfb, 0xbf, 0x39, 0x98, 0x03, 0xb0, 0xd3, 0xf8, 0xef, 0x1b, 0xe8, 0x20, - 0x0e, 0xfb, 0x1e, 0x77, 0x9a, 0xd9, 0x57, 0x3f, 0x09, 0x79, 0xfc, 0x27, 0xfd, 0xa1, 0x5c, 0x0c, - 0xf8, 0x7f, 0x18, 0xd8, 0x47, 0xe0, 0x37, 0x3b, 0x6e, 0xdb, 0xd5, 0xe2, 0x83, 0xfd, 0xbf, 0x6c, - 0xa6, 0xb9, 0x7d, 0xb5, 0x06, 0x05, 0xc7, 0x6d, 0xb7, 0xfb, 0xac, 0x3f, 0x8d, 0x81, 0xff, 0xdf, - 0x07, 0xde, 0x95, 0x85, 0x87, 0xc1, 0xb3, 0x7d, 0xeb, 0x86, 0x6b, 0x99, 0xe4, 0x33, 0x47, 0x1c, - 0xc3, 0x3d, 0xc6, 0x10, 0x80, 0xac, 0xd4, 0x87, 0x5f, 0xdf, 0xc2, 0xba, 0xb9, 0x6e, 0xd2, 0x8b, - 0xdb, 0x97, 0xe6, 0xe2, 0x6f, 0x60, 0xe1, 0xd5, 0x0c, 0xcc, 0xaa, 0x66, 0xaf, 0x65, 0x3a, 0xe7, - 0xbc, 0x72, 0x7c, 0xce, 0x34, 0x18, 0xa3, 0x98, 0x32, 0x0d, 0x34, 0x7b, 0xbc, 0x9b, 0xdc, 0xb9, - 0x53, 0x90, 0x69, 0xf6, 0x5b, 0xad, 0x03, 0x51, 0x80, 0x94, 0xd3, 0x6f, 0xb1, 0x9f, 0x5b, 0xe1, - 0x3f, 0xe7, 0x7e, 0x90, 0x82, 0x42, 0x53, 0xe9, 0x59, 0x3a, 0x6a, 0x18, 0xa8, 0xd1, 0x11, 0xcb, - 0x90, 0x25, 0x03, 0x7d, 0x86, 0x18, 0x25, 0xae, 0x8d, 0x49, 0xec, 0xd9, 0xd3, 0x2c, 0x92, 0x1b, - 0xee, 0xa4, 0xa7, 0x59, 0xf4, 0x34, 0xe7, 0xe9, 0x05, 0xb7, 0xa7, 0x39, 0xef, 0x69, 0x96, 0xc8, - 0x35, 0x77, 0xca, 0xd3, 0x2c, 0x79, 0x9a, 0x65, 0xf2, 0x19, 0x67, 0xc2, 0xd3, 0x2c, 0x7b, 0x9a, - 0x0b, 0xe4, 0xc3, 0x4d, 0xda, 0xd3, 0x5c, 0xf0, 0x34, 0x17, 0xc9, 0xf7, 0x9a, 0x29, 0x4f, 0x73, - 0xd1, 0xd3, 0x5c, 0x22, 0xdf, 0x68, 0x44, 0x4f, 0x73, 0xc9, 0xd3, 0x5c, 0x26, 0xbf, 0xaa, 0x1a, - 0xf7, 0x34, 0x97, 0xc5, 0x59, 0x18, 0xa7, 0x23, 0x7b, 0x9a, 0x7c, 0xc8, 0x9f, 0xbc, 0x36, 0x26, - 0x71, 0x81, 0xaf, 0x7b, 0x86, 0xfc, 0x72, 0x2a, 0xeb, 0xeb, 0x9e, 0xf1, 0x75, 0x8b, 0xe4, 0x3f, - 0x70, 0x08, 0xbe, 0x6e, 0xd1, 0xd7, 0x9d, 0x2f, 0x4f, 0xe0, 0xfc, 0xf0, 0x75, 0xe7, 0x7d, 0xdd, - 0x52, 0xb9, 0x84, 0xe3, 0xef, 0xeb, 0x96, 0x7c, 0xdd, 0x72, 0x79, 0xf2, 0x4c, 0x62, 0xbe, 0xe8, - 0xeb, 0x96, 0xc5, 0xa7, 0xa0, 0xe0, 0xf4, 0x5b, 0x32, 0xab, 0xf4, 0xe4, 0x17, 0x5a, 0x85, 0x45, - 0x58, 0xc0, 0x19, 0x41, 0x26, 0xf5, 0xda, 0x98, 0x04, 0x4e, 0xbf, 0xc5, 0x0a, 0xf1, 0x4a, 0x11, - 0xc8, 0xfd, 0x93, 0x4c, 0x7e, 0x58, 0xbd, 0xb2, 0xf6, 0xd6, 0xdd, 0xca, 0xd8, 0xf7, 0xee, 0x56, - 0xc6, 0xfe, 0xe5, 0x6e, 0x65, 0xec, 0xed, 0xbb, 0x95, 0xc4, 0x7b, 0x77, 0x2b, 0x89, 0xf7, 0xef, - 0x56, 0x12, 0x77, 0x0e, 0x2b, 0x89, 0xaf, 0x1e, 0x56, 0x12, 0x5f, 0x3f, 0xac, 0x24, 0xbe, 0x75, - 0x58, 0x49, 0xbc, 0x75, 0x58, 0x49, 0x7c, 0xef, 0xb0, 0x32, 0xf6, 0xf6, 0x61, 0x25, 0xf1, 0xa3, - 0xc3, 0xca, 0xd8, 0x7b, 0x87, 0x95, 0xc4, 0xfb, 0x87, 0x95, 0xb1, 0x3b, 0x3f, 0xac, 0x8c, 0xb5, - 0xb2, 0x24, 0x8d, 0xce, 0xff, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0xb5, 0xb7, 0x77, 0x8f, - 0x35, 0x00, 0x00, + // 4120 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0xe3, 0xe6, + 0x75, 0x16, 0x78, 0x13, 0x79, 0x48, 0x51, 0x10, 0x24, 0x6b, 0xb9, 0x72, 0xcc, 0xd5, 0xca, 0x76, + 0x2c, 0xdb, 0xb1, 0x64, 0x6b, 0xa5, 0xbd, 0x70, 0x9b, 0xb8, 0x94, 0xc4, 0xd5, 0xca, 0x95, 0x44, + 0x05, 0x94, 0xe2, 0x4b, 0xa6, 0x83, 0x01, 0xc1, 0x9f, 0x14, 0x76, 0x41, 0x00, 0x01, 0xc0, 0x5d, + 0x6b, 0xa7, 0x0f, 0xdb, 0x71, 0x2f, 0x93, 0xe9, 0xfd, 0x32, 0xd3, 0xc4, 0x75, 0xdc, 0x26, 0x9d, + 0xc6, 0x6e, 0x7a, 0x4b, 0x7a, 0x49, 0x93, 0xf4, 0xa5, 0x2f, 0x69, 0xfd, 0xd4, 0x49, 0xde, 0xfa, + 0x90, 0x07, 0xaf, 0xec, 0x99, 0xa6, 0xad, 0xdb, 0xba, 0xed, 0x3e, 0x78, 0x66, 0x5f, 0x3a, 0xff, + 0x0d, 0x00, 0x2f, 0x5a, 0x50, 0x99, 0xb1, 0xfd, 0xb4, 0xc2, 0x39, 0xe7, 0xfb, 0x70, 0xfe, 0xf3, + 0x9f, 0xff, 0xfc, 0xe7, 0xff, 0xc1, 0x85, 0xb7, 0x4a, 0x30, 0xdb, 0xb2, 0xac, 0x96, 0x81, 0x16, + 0x6d, 0xc7, 0xf2, 0xac, 0x7a, 0xa7, 0xb9, 0xd8, 0x40, 0xae, 0xe6, 0xe8, 0xb6, 0x67, 0x39, 0x0b, + 0x44, 0x26, 0x8d, 0x53, 0x8b, 0x05, 0x6e, 0x31, 0xb7, 0x0d, 0x13, 0x57, 0x74, 0x03, 0xad, 0xfb, + 0x86, 0x35, 0xe4, 0x49, 0x17, 0x21, 0xd1, 0xd4, 0x0d, 0x54, 0x10, 0x66, 0xe3, 0xf3, 0xd9, 0xa5, + 0x47, 0x16, 0x7a, 0x40, 0x0b, 0xdd, 0x88, 0x5d, 0x2c, 0x96, 0x09, 0x62, 0xee, 0xdd, 0x04, 0x4c, + 0x0e, 0xd0, 0x4a, 0x12, 0x24, 0x4c, 0xb5, 0x8d, 0x19, 0x85, 0xf9, 0x8c, 0x4c, 0xfe, 0x96, 0x0a, + 0x30, 0x6a, 0xab, 0xda, 0x75, 0xb5, 0x85, 0x0a, 0x31, 0x22, 0xe6, 0x8f, 0x52, 0x11, 0xa0, 0x81, + 0x6c, 0x64, 0x36, 0x90, 0xa9, 0x1d, 0x16, 0xe2, 0xb3, 0xf1, 0xf9, 0x8c, 0x1c, 0x92, 0x48, 0x4f, + 0xc2, 0x84, 0xdd, 0xa9, 0x1b, 0xba, 0xa6, 0x84, 0xcc, 0x60, 0x36, 0x3e, 0x9f, 0x94, 0x45, 0xaa, + 0x58, 0x0f, 0x8c, 0x1f, 0x83, 0xf1, 0x9b, 0x48, 0xbd, 0x1e, 0x36, 0xcd, 0x12, 0xd3, 0x3c, 0x16, + 0x87, 0x0c, 0xd7, 0x20, 0xd7, 0x46, 0xae, 0xab, 0xb6, 0x90, 0xe2, 0x1d, 0xda, 0xa8, 0x90, 0x20, + 0xa3, 0x9f, 0xed, 0x1b, 0x7d, 0xef, 0xc8, 0xb3, 0x0c, 0xb5, 0x77, 0x68, 0x23, 0xa9, 0x0c, 0x19, + 0x64, 0x76, 0xda, 0x94, 0x21, 0x79, 0x4c, 0xfc, 0x2a, 0x66, 0xa7, 0xdd, 0xcb, 0x92, 0xc6, 0x30, + 0x46, 0x31, 0xea, 0x22, 0xe7, 0x86, 0xae, 0xa1, 0x42, 0x8a, 0x10, 0x3c, 0xd6, 0x47, 0x50, 0xa3, + 0xfa, 0x5e, 0x0e, 0x8e, 0x93, 0xd6, 0x20, 0x83, 0x5e, 0xf6, 0x90, 0xe9, 0xea, 0x96, 0x59, 0x18, + 0x25, 0x24, 0x8f, 0x0e, 0x98, 0x45, 0x64, 0x34, 0x7a, 0x29, 0x02, 0x9c, 0x74, 0x1e, 0x46, 0x2d, + 0xdb, 0xd3, 0x2d, 0xd3, 0x2d, 0xa4, 0x67, 0x85, 0xf9, 0xec, 0xd2, 0x27, 0x06, 0x26, 0x42, 0x95, + 0xda, 0xc8, 0xdc, 0x58, 0xda, 0x04, 0xd1, 0xb5, 0x3a, 0x8e, 0x86, 0x14, 0xcd, 0x6a, 0x20, 0x45, + 0x37, 0x9b, 0x56, 0x21, 0x43, 0x08, 0xce, 0xf4, 0x0f, 0x84, 0x18, 0xae, 0x59, 0x0d, 0xb4, 0x69, + 0x36, 0x2d, 0x39, 0xef, 0x76, 0x3d, 0x4b, 0xd3, 0x90, 0x72, 0x0f, 0x4d, 0x4f, 0x7d, 0xb9, 0x90, + 0x23, 0x19, 0xc2, 0x9e, 0xe6, 0xbe, 0x9b, 0x82, 0xf1, 0x61, 0x52, 0xec, 0x32, 0x24, 0x9b, 0x78, + 0x94, 0x85, 0xd8, 0x49, 0x62, 0x40, 0x31, 0xdd, 0x41, 0x4c, 0xfd, 0x84, 0x41, 0x2c, 0x43, 0xd6, + 0x44, 0xae, 0x87, 0x1a, 0x34, 0x23, 0xe2, 0x43, 0xe6, 0x14, 0x50, 0x50, 0x7f, 0x4a, 0x25, 0x7e, + 0xa2, 0x94, 0x7a, 0x01, 0xc6, 0x7d, 0x97, 0x14, 0x47, 0x35, 0x5b, 0x3c, 0x37, 0x17, 0xa3, 0x3c, + 0x59, 0xa8, 0x70, 0x9c, 0x8c, 0x61, 0x72, 0x1e, 0x75, 0x3d, 0x4b, 0xeb, 0x00, 0x96, 0x89, 0xac, + 0xa6, 0xd2, 0x40, 0x9a, 0x51, 0x48, 0x1f, 0x13, 0xa5, 0x2a, 0x36, 0xe9, 0x8b, 0x92, 0x45, 0xa5, + 0x9a, 0x21, 0x5d, 0x0a, 0x52, 0x6d, 0xf4, 0x98, 0x4c, 0xd9, 0xa6, 0x8b, 0xac, 0x2f, 0xdb, 0xf6, + 0x21, 0xef, 0x20, 0x9c, 0xf7, 0xa8, 0xc1, 0x46, 0x96, 0x21, 0x4e, 0x2c, 0x44, 0x8e, 0x4c, 0x66, + 0x30, 0x3a, 0xb0, 0x31, 0x27, 0xfc, 0x28, 0x3d, 0x0c, 0xbe, 0x40, 0x21, 0x69, 0x05, 0xa4, 0x0a, + 0xe5, 0xb8, 0x70, 0x47, 0x6d, 0xa3, 0x99, 0x5b, 0x90, 0xef, 0x0e, 0x8f, 0x34, 0x05, 0x49, 0xd7, + 0x53, 0x1d, 0x8f, 0x64, 0x61, 0x52, 0xa6, 0x0f, 0x92, 0x08, 0x71, 0x64, 0x36, 0x48, 0x95, 0x4b, + 0xca, 0xf8, 0x4f, 0xe9, 0xa7, 0x83, 0x01, 0xc7, 0xc9, 0x80, 0x3f, 0xd9, 0x3f, 0xa3, 0x5d, 0xcc, + 0xbd, 0xe3, 0x9e, 0xb9, 0x00, 0x63, 0x5d, 0x03, 0x18, 0xf6, 0xd5, 0x73, 0x3f, 0x07, 0x0f, 0x0c, + 0xa4, 0x96, 0x5e, 0x80, 0xa9, 0x8e, 0xa9, 0x9b, 0x1e, 0x72, 0x6c, 0x07, 0xe1, 0x8c, 0xa5, 0xaf, + 0x2a, 0xfc, 0xeb, 0xe8, 0x31, 0x39, 0xb7, 0x1f, 0xb6, 0xa6, 0x2c, 0xf2, 0x64, 0xa7, 0x5f, 0xf8, + 0x44, 0x26, 0xfd, 0xe3, 0x51, 0xf1, 0xf6, 0xed, 0xdb, 0xb7, 0x63, 0x73, 0x5f, 0x4a, 0xc1, 0xd4, + 0xa0, 0x35, 0x33, 0x70, 0xf9, 0x4e, 0x43, 0xca, 0xec, 0xb4, 0xeb, 0xc8, 0x21, 0x41, 0x4a, 0xca, + 0xec, 0x49, 0x2a, 0x43, 0xd2, 0x50, 0xeb, 0xc8, 0x28, 0x24, 0x66, 0x85, 0xf9, 0xfc, 0xd2, 0x93, + 0x43, 0xad, 0xca, 0x85, 0x2d, 0x0c, 0x91, 0x29, 0x52, 0xfa, 0x0c, 0x24, 0x58, 0x89, 0xc6, 0x0c, + 0x4f, 0x0c, 0xc7, 0x80, 0xd7, 0x92, 0x4c, 0x70, 0xd2, 0x83, 0x90, 0xc1, 0xff, 0xd2, 0xdc, 0x48, + 0x11, 0x9f, 0xd3, 0x58, 0x80, 0xf3, 0x42, 0x9a, 0x81, 0x34, 0x59, 0x26, 0x0d, 0xc4, 0xb7, 0x36, + 0xff, 0x19, 0x27, 0x56, 0x03, 0x35, 0xd5, 0x8e, 0xe1, 0x29, 0x37, 0x54, 0xa3, 0x83, 0x48, 0xc2, + 0x67, 0xe4, 0x1c, 0x13, 0x7e, 0x0e, 0xcb, 0xa4, 0x33, 0x90, 0xa5, 0xab, 0x4a, 0x37, 0x1b, 0xe8, + 0x65, 0x52, 0x3d, 0x93, 0x32, 0x5d, 0x68, 0x9b, 0x58, 0x82, 0x5f, 0x7f, 0xcd, 0xb5, 0x4c, 0x9e, + 0x9a, 0xe4, 0x15, 0x58, 0x40, 0x5e, 0x7f, 0xa1, 0xb7, 0x70, 0x3f, 0x34, 0x78, 0x78, 0xbd, 0x39, + 0x35, 0xf7, 0xed, 0x18, 0x24, 0x48, 0xbd, 0x18, 0x87, 0xec, 0xde, 0x8b, 0xbb, 0x15, 0x65, 0xbd, + 0xba, 0xbf, 0xba, 0x55, 0x11, 0x05, 0x29, 0x0f, 0x40, 0x04, 0x57, 0xb6, 0xaa, 0xe5, 0x3d, 0x31, + 0xe6, 0x3f, 0x6f, 0xee, 0xec, 0x9d, 0x5f, 0x16, 0xe3, 0x3e, 0x60, 0x9f, 0x0a, 0x12, 0x61, 0x83, + 0x73, 0x4b, 0x62, 0x52, 0x12, 0x21, 0x47, 0x09, 0x36, 0x5f, 0xa8, 0xac, 0x9f, 0x5f, 0x16, 0x53, + 0xdd, 0x92, 0x73, 0x4b, 0xe2, 0xa8, 0x34, 0x06, 0x19, 0x22, 0x59, 0xad, 0x56, 0xb7, 0xc4, 0xb4, + 0xcf, 0x59, 0xdb, 0x93, 0x37, 0x77, 0x36, 0xc4, 0x8c, 0xcf, 0xb9, 0x21, 0x57, 0xf7, 0x77, 0x45, + 0xf0, 0x19, 0xb6, 0x2b, 0xb5, 0x5a, 0x79, 0xa3, 0x22, 0x66, 0x7d, 0x8b, 0xd5, 0x17, 0xf7, 0x2a, + 0x35, 0x31, 0xd7, 0xe5, 0xd6, 0xb9, 0x25, 0x71, 0xcc, 0x7f, 0x45, 0x65, 0x67, 0x7f, 0x5b, 0xcc, + 0x4b, 0x13, 0x30, 0x46, 0x5f, 0xc1, 0x9d, 0x18, 0xef, 0x11, 0x9d, 0x5f, 0x16, 0xc5, 0xc0, 0x11, + 0xca, 0x32, 0xd1, 0x25, 0x38, 0xbf, 0x2c, 0x4a, 0x73, 0x6b, 0x90, 0x24, 0xd9, 0x25, 0x49, 0x90, + 0xdf, 0x2a, 0xaf, 0x56, 0xb6, 0x94, 0xea, 0xee, 0xde, 0x66, 0x75, 0xa7, 0xbc, 0x25, 0x0a, 0x81, + 0x4c, 0xae, 0x7c, 0x76, 0x7f, 0x53, 0xae, 0xac, 0x8b, 0xb1, 0xb0, 0x6c, 0xb7, 0x52, 0xde, 0xab, + 0xac, 0x8b, 0xf1, 0x39, 0x0d, 0xa6, 0x06, 0xd5, 0xc9, 0x81, 0x2b, 0x23, 0x34, 0xc5, 0xb1, 0x63, + 0xa6, 0x98, 0x70, 0xf5, 0x4d, 0xf1, 0x3b, 0x31, 0x98, 0x1c, 0xb0, 0x57, 0x0c, 0x7c, 0xc9, 0xb3, + 0x90, 0xa4, 0x29, 0x4a, 0x77, 0xcf, 0xc7, 0x07, 0x6e, 0x3a, 0x24, 0x61, 0xfb, 0x76, 0x50, 0x82, + 0x0b, 0x77, 0x10, 0xf1, 0x63, 0x3a, 0x08, 0x4c, 0xd1, 0x57, 0xd3, 0x7f, 0xb6, 0xaf, 0xa6, 0xd3, + 0x6d, 0xef, 0xfc, 0x30, 0xdb, 0x1e, 0x91, 0x9d, 0xac, 0xb6, 0x27, 0x07, 0xd4, 0xf6, 0xcb, 0x30, + 0xd1, 0x47, 0x34, 0x74, 0x8d, 0x7d, 0x45, 0x80, 0xc2, 0x71, 0xc1, 0x89, 0xa8, 0x74, 0xb1, 0xae, + 0x4a, 0x77, 0xb9, 0x37, 0x82, 0x67, 0x8f, 0x9f, 0x84, 0xbe, 0xb9, 0x7e, 0x43, 0x80, 0xe9, 0xc1, + 0x9d, 0xe2, 0x40, 0x1f, 0x3e, 0x03, 0xa9, 0x36, 0xf2, 0x0e, 0x2c, 0xde, 0x2d, 0x7d, 0x72, 0xc0, + 0x1e, 0x8c, 0xd5, 0xbd, 0x93, 0xcd, 0x50, 0xe1, 0x4d, 0x3c, 0x7e, 0x5c, 0xbb, 0x47, 0xbd, 0xe9, + 0xf3, 0xf4, 0x8b, 0x31, 0x78, 0x60, 0x20, 0xf9, 0x40, 0x47, 0x1f, 0x02, 0xd0, 0x4d, 0xbb, 0xe3, + 0xd1, 0x8e, 0x88, 0x16, 0xd8, 0x0c, 0x91, 0x90, 0xe2, 0x85, 0x8b, 0x67, 0xc7, 0xf3, 0xf5, 0x71, + 0xa2, 0x07, 0x2a, 0x22, 0x06, 0x17, 0x03, 0x47, 0x13, 0xc4, 0xd1, 0xe2, 0x31, 0x23, 0xed, 0x4b, + 0xcc, 0xa7, 0x41, 0xd4, 0x0c, 0x1d, 0x99, 0x9e, 0xe2, 0x7a, 0x0e, 0x52, 0xdb, 0xba, 0xd9, 0x22, + 0x3b, 0x48, 0xba, 0x94, 0x6c, 0xaa, 0x86, 0x8b, 0xe4, 0x71, 0xaa, 0xae, 0x71, 0x2d, 0x46, 0x90, + 0x04, 0x72, 0x42, 0x88, 0x54, 0x17, 0x82, 0xaa, 0x7d, 0xc4, 0xdc, 0xaf, 0x66, 0x20, 0x1b, 0xea, + 0xab, 0xa5, 0xb3, 0x90, 0xbb, 0xa6, 0xde, 0x50, 0x15, 0x7e, 0x56, 0xa2, 0x91, 0xc8, 0x62, 0xd9, + 0x2e, 0x3b, 0x2f, 0x3d, 0x0d, 0x53, 0xc4, 0xc4, 0xea, 0x78, 0xc8, 0x51, 0x34, 0x43, 0x75, 0x5d, + 0x12, 0xb4, 0x34, 0x31, 0x95, 0xb0, 0xae, 0x8a, 0x55, 0x6b, 0x5c, 0x23, 0xad, 0xc0, 0x24, 0x41, + 0xb4, 0x3b, 0x86, 0xa7, 0xdb, 0x06, 0x52, 0xf0, 0xe9, 0xcd, 0x25, 0x3b, 0x89, 0xef, 0xd9, 0x04, + 0xb6, 0xd8, 0x66, 0x06, 0xd8, 0x23, 0x57, 0x5a, 0x87, 0x87, 0x08, 0xac, 0x85, 0x4c, 0xe4, 0xa8, + 0x1e, 0x52, 0xd0, 0x17, 0x3a, 0xaa, 0xe1, 0x2a, 0xaa, 0xd9, 0x50, 0x0e, 0x54, 0xf7, 0xa0, 0x30, + 0x85, 0x09, 0x56, 0x63, 0x05, 0x41, 0x3e, 0x8d, 0x0d, 0x37, 0x98, 0x5d, 0x85, 0x98, 0x95, 0xcd, + 0xc6, 0x55, 0xd5, 0x3d, 0x90, 0x4a, 0x30, 0x4d, 0x58, 0x5c, 0xcf, 0xd1, 0xcd, 0x96, 0xa2, 0x1d, + 0x20, 0xed, 0xba, 0xd2, 0xf1, 0x9a, 0x17, 0x0b, 0x0f, 0x86, 0xdf, 0x4f, 0x3c, 0xac, 0x11, 0x9b, + 0x35, 0x6c, 0xb2, 0xef, 0x35, 0x2f, 0x4a, 0x35, 0xc8, 0xe1, 0xc9, 0x68, 0xeb, 0xb7, 0x90, 0xd2, + 0xb4, 0x1c, 0xb2, 0x35, 0xe6, 0x07, 0x94, 0xa6, 0x50, 0x04, 0x17, 0xaa, 0x0c, 0xb0, 0x6d, 0x35, + 0x50, 0x29, 0x59, 0xdb, 0xad, 0x54, 0xd6, 0xe5, 0x2c, 0x67, 0xb9, 0x62, 0x39, 0x38, 0xa1, 0x5a, + 0x96, 0x1f, 0xe0, 0x2c, 0x4d, 0xa8, 0x96, 0xc5, 0xc3, 0xbb, 0x02, 0x93, 0x9a, 0x46, 0xc7, 0xac, + 0x6b, 0x0a, 0x3b, 0x63, 0xb9, 0x05, 0xb1, 0x2b, 0x58, 0x9a, 0xb6, 0x41, 0x0d, 0x58, 0x8e, 0xbb, + 0xd2, 0x25, 0x78, 0x20, 0x08, 0x56, 0x18, 0x38, 0xd1, 0x37, 0xca, 0x5e, 0xe8, 0x0a, 0x4c, 0xda, + 0x87, 0xfd, 0x40, 0xa9, 0xeb, 0x8d, 0xf6, 0x61, 0x2f, 0xec, 0x02, 0x4c, 0xd9, 0x07, 0x76, 0x3f, + 0xee, 0x89, 0x30, 0x4e, 0xb2, 0x0f, 0xec, 0x5e, 0xe0, 0xa3, 0xe4, 0xc0, 0xed, 0x20, 0x4d, 0xf5, + 0x50, 0xa3, 0x70, 0x2a, 0x6c, 0x1e, 0x52, 0x48, 0x8b, 0x20, 0x6a, 0x9a, 0x82, 0x4c, 0xb5, 0x6e, + 0x20, 0x45, 0x75, 0x90, 0xa9, 0xba, 0x85, 0x33, 0x61, 0xe3, 0xbc, 0xa6, 0x55, 0x88, 0xb6, 0x4c, + 0x94, 0xd2, 0x13, 0x30, 0x61, 0xd5, 0xaf, 0x69, 0x34, 0x25, 0x15, 0xdb, 0x41, 0x4d, 0xfd, 0xe5, + 0xc2, 0x23, 0x24, 0xbe, 0xe3, 0x58, 0x41, 0x12, 0x72, 0x97, 0x88, 0xa5, 0xc7, 0x41, 0xd4, 0xdc, + 0x03, 0xd5, 0xb1, 0x49, 0x4d, 0x76, 0x6d, 0x55, 0x43, 0x85, 0x47, 0xa9, 0x29, 0x95, 0xef, 0x70, + 0x31, 0x5e, 0x12, 0xee, 0x4d, 0xbd, 0xe9, 0x71, 0xc6, 0xc7, 0xe8, 0x92, 0x20, 0x32, 0xc6, 0x36, + 0x0f, 0x22, 0x0e, 0x45, 0xd7, 0x8b, 0xe7, 0x89, 0x59, 0xde, 0x3e, 0xb0, 0xc3, 0xef, 0x7d, 0x18, + 0xc6, 0xb0, 0x65, 0xf0, 0xd2, 0xc7, 0x69, 0x43, 0x66, 0x1f, 0x84, 0xde, 0xb8, 0x0c, 0xd3, 0xd8, + 0xa8, 0x8d, 0x3c, 0xb5, 0xa1, 0x7a, 0x6a, 0xc8, 0xfa, 0x53, 0xc4, 0x1a, 0xc7, 0x7d, 0x9b, 0x29, + 0xbb, 0xfc, 0x74, 0x3a, 0xf5, 0x43, 0x3f, 0xb3, 0x9e, 0xa2, 0x7e, 0x62, 0x19, 0xcf, 0xad, 0x0f, + 0xad, 0xe9, 0x9e, 0x2b, 0x41, 0x2e, 0x9c, 0xf8, 0x52, 0x06, 0x68, 0xea, 0x8b, 0x02, 0xee, 0x82, + 0xd6, 0xaa, 0xeb, 0xb8, 0x7f, 0x79, 0xa9, 0x22, 0xc6, 0x70, 0x1f, 0xb5, 0xb5, 0xb9, 0x57, 0x51, + 0xe4, 0xfd, 0x9d, 0xbd, 0xcd, 0xed, 0x8a, 0x18, 0x0f, 0x37, 0xec, 0xdf, 0x8f, 0x41, 0xbe, 0xfb, + 0xec, 0x25, 0xfd, 0x14, 0x9c, 0xe2, 0x17, 0x25, 0x2e, 0xf2, 0x94, 0x9b, 0xba, 0x43, 0xd6, 0x62, + 0x5b, 0xa5, 0xfb, 0xa2, 0x9f, 0x0d, 0x53, 0xcc, 0xaa, 0x86, 0xbc, 0xe7, 0x75, 0x07, 0xaf, 0xb4, + 0xb6, 0xea, 0x49, 0x5b, 0x70, 0xc6, 0xb4, 0x14, 0xd7, 0x53, 0xcd, 0x86, 0xea, 0x34, 0x94, 0xe0, + 0x8a, 0x4a, 0x51, 0x35, 0x0d, 0xb9, 0xae, 0x45, 0xf7, 0x40, 0x9f, 0xe5, 0x13, 0xa6, 0x55, 0x63, + 0xc6, 0xc1, 0xe6, 0x50, 0x66, 0xa6, 0x3d, 0x99, 0x1b, 0x3f, 0x2e, 0x73, 0x1f, 0x84, 0x4c, 0x5b, + 0xb5, 0x15, 0x64, 0x7a, 0xce, 0x21, 0xe9, 0xb8, 0xd3, 0x72, 0xba, 0xad, 0xda, 0x15, 0xfc, 0xfc, + 0xd1, 0x1c, 0x7c, 0x7e, 0x14, 0x87, 0x5c, 0xb8, 0xeb, 0xc6, 0x87, 0x18, 0x8d, 0x6c, 0x50, 0x02, + 0x29, 0x61, 0x0f, 0xdf, 0xb7, 0x47, 0x5f, 0x58, 0xc3, 0x3b, 0x57, 0x29, 0x45, 0x7b, 0x61, 0x99, + 0x22, 0x71, 0xd7, 0x80, 0x53, 0x0b, 0xd1, 0xde, 0x23, 0x2d, 0xb3, 0x27, 0x69, 0x03, 0x52, 0xd7, + 0x5c, 0xc2, 0x9d, 0x22, 0xdc, 0x8f, 0xdc, 0x9f, 0xfb, 0xb9, 0x1a, 0x21, 0xcf, 0x3c, 0x57, 0x53, + 0x76, 0xaa, 0xf2, 0x76, 0x79, 0x4b, 0x66, 0x70, 0xe9, 0x34, 0x24, 0x0c, 0xf5, 0xd6, 0x61, 0xf7, + 0x1e, 0x47, 0x44, 0xc3, 0x06, 0xfe, 0x34, 0x24, 0x6e, 0x22, 0xf5, 0x7a, 0xf7, 0xce, 0x42, 0x44, + 0x1f, 0x62, 0xea, 0x2f, 0x42, 0x92, 0xc4, 0x4b, 0x02, 0x60, 0x11, 0x13, 0x47, 0xa4, 0x34, 0x24, + 0xd6, 0xaa, 0x32, 0x4e, 0x7f, 0x11, 0x72, 0x54, 0xaa, 0xec, 0x6e, 0x56, 0xd6, 0x2a, 0x62, 0x6c, + 0x6e, 0x05, 0x52, 0x34, 0x08, 0x78, 0x69, 0xf8, 0x61, 0x10, 0x47, 0xd8, 0x23, 0xe3, 0x10, 0xb8, + 0x76, 0x7f, 0x7b, 0xb5, 0x22, 0x8b, 0xb1, 0xf0, 0xf4, 0xba, 0x90, 0x0b, 0x37, 0xdc, 0x1f, 0x4d, + 0x4e, 0x7d, 0x4f, 0x80, 0x6c, 0xa8, 0x81, 0xc6, 0x9d, 0x8f, 0x6a, 0x18, 0xd6, 0x4d, 0x45, 0x35, + 0x74, 0xd5, 0x65, 0x49, 0x01, 0x44, 0x54, 0xc6, 0x92, 0x61, 0x27, 0xed, 0x23, 0x71, 0xfe, 0x75, + 0x01, 0xc4, 0xde, 0xde, 0xb5, 0xc7, 0x41, 0xe1, 0x63, 0x75, 0xf0, 0x35, 0x01, 0xf2, 0xdd, 0x0d, + 0x6b, 0x8f, 0x7b, 0x67, 0x3f, 0x56, 0xf7, 0xde, 0x8e, 0xc1, 0x58, 0x57, 0x9b, 0x3a, 0xac, 0x77, + 0x5f, 0x80, 0x09, 0xbd, 0x81, 0xda, 0xb6, 0xe5, 0x21, 0x53, 0x3b, 0x54, 0x0c, 0x74, 0x03, 0x19, + 0x85, 0x39, 0x52, 0x28, 0x16, 0xef, 0xdf, 0x08, 0x2f, 0x6c, 0x06, 0xb8, 0x2d, 0x0c, 0x2b, 0x4d, + 0x6e, 0xae, 0x57, 0xb6, 0x77, 0xab, 0x7b, 0x95, 0x9d, 0xb5, 0x17, 0x95, 0xfd, 0x9d, 0x9f, 0xd9, + 0xa9, 0x3e, 0xbf, 0x23, 0x8b, 0x7a, 0x8f, 0xd9, 0x87, 0xb8, 0xd4, 0x77, 0x41, 0xec, 0x75, 0x4a, + 0x3a, 0x05, 0x83, 0xdc, 0x12, 0x47, 0xa4, 0x49, 0x18, 0xdf, 0xa9, 0x2a, 0xb5, 0xcd, 0xf5, 0x8a, + 0x52, 0xb9, 0x72, 0xa5, 0xb2, 0xb6, 0x57, 0xa3, 0x57, 0x1b, 0xbe, 0xf5, 0x5e, 0xf7, 0xa2, 0x7e, + 0x35, 0x0e, 0x93, 0x03, 0x3c, 0x91, 0xca, 0xec, 0x50, 0x42, 0xcf, 0x49, 0x4f, 0x0d, 0xe3, 0xfd, + 0x02, 0xee, 0x0a, 0x76, 0x55, 0xc7, 0x63, 0x67, 0x98, 0xc7, 0x01, 0x47, 0xc9, 0xf4, 0xf4, 0xa6, + 0x8e, 0x1c, 0x76, 0x13, 0x44, 0x4f, 0x2a, 0xe3, 0x81, 0x9c, 0x5e, 0x06, 0x7d, 0x0a, 0x24, 0xdb, + 0x72, 0x75, 0x4f, 0xbf, 0x81, 0x14, 0xdd, 0xe4, 0xd7, 0x46, 0xf8, 0xe4, 0x92, 0x90, 0x45, 0xae, + 0xd9, 0x34, 0x3d, 0xdf, 0xda, 0x44, 0x2d, 0xb5, 0xc7, 0x1a, 0x17, 0xf0, 0xb8, 0x2c, 0x72, 0x8d, + 0x6f, 0x7d, 0x16, 0x72, 0x0d, 0xab, 0x83, 0xdb, 0x39, 0x6a, 0x87, 0xf7, 0x0b, 0x41, 0xce, 0x52, + 0x99, 0x6f, 0xc2, 0x1a, 0xf5, 0xe0, 0xbe, 0x2a, 0x27, 0x67, 0xa9, 0x8c, 0x9a, 0x3c, 0x06, 0xe3, + 0x6a, 0xab, 0xe5, 0x60, 0x72, 0x4e, 0x44, 0x8f, 0x1e, 0x79, 0x5f, 0x4c, 0x0c, 0x67, 0x9e, 0x83, + 0x34, 0x8f, 0x03, 0xde, 0x92, 0x71, 0x24, 0x14, 0x9b, 0x9e, 0xa7, 0x63, 0xf3, 0x19, 0x39, 0x6d, + 0x72, 0xe5, 0x59, 0xc8, 0xe9, 0xae, 0x12, 0x5c, 0xbf, 0xc7, 0x66, 0x63, 0xf3, 0x69, 0x39, 0xab, + 0xbb, 0xfe, 0xd5, 0xe5, 0xdc, 0x1b, 0x31, 0xc8, 0x77, 0x7f, 0x3e, 0x90, 0xd6, 0x21, 0x6d, 0x58, + 0x9a, 0x4a, 0x52, 0x8b, 0x7e, 0xbb, 0x9a, 0x8f, 0xf8, 0xe2, 0xb0, 0xb0, 0xc5, 0xec, 0x65, 0x1f, + 0x39, 0xf3, 0xcf, 0x02, 0xa4, 0xb9, 0x58, 0x9a, 0x86, 0x84, 0xad, 0x7a, 0x07, 0x84, 0x2e, 0xb9, + 0x1a, 0x13, 0x05, 0x99, 0x3c, 0x63, 0xb9, 0x6b, 0xab, 0x26, 0x49, 0x01, 0x26, 0xc7, 0xcf, 0x78, + 0x5e, 0x0d, 0xa4, 0x36, 0xc8, 0xb9, 0xc6, 0x6a, 0xb7, 0x91, 0xe9, 0xb9, 0x7c, 0x5e, 0x99, 0x7c, + 0x8d, 0x89, 0xa5, 0x27, 0x61, 0xc2, 0x73, 0x54, 0xdd, 0xe8, 0xb2, 0x4d, 0x10, 0x5b, 0x91, 0x2b, + 0x7c, 0xe3, 0x12, 0x9c, 0xe6, 0xbc, 0x0d, 0xe4, 0xa9, 0xda, 0x01, 0x6a, 0x04, 0xa0, 0x14, 0xb9, + 0xbf, 0x38, 0xc5, 0x0c, 0xd6, 0x99, 0x9e, 0x63, 0xe7, 0x7e, 0x28, 0xc0, 0x04, 0x3f, 0x89, 0x35, + 0xfc, 0x60, 0x6d, 0x03, 0xa8, 0xa6, 0x69, 0x79, 0xe1, 0x70, 0xf5, 0xa7, 0x72, 0x1f, 0x6e, 0xa1, + 0xec, 0x83, 0xe4, 0x10, 0xc1, 0x4c, 0x1b, 0x20, 0xd0, 0x1c, 0x1b, 0xb6, 0x33, 0x90, 0x65, 0xdf, + 0x86, 0xc8, 0x07, 0x46, 0x7a, 0x76, 0x07, 0x2a, 0xc2, 0x47, 0x36, 0x69, 0x0a, 0x92, 0x75, 0xd4, + 0xd2, 0x4d, 0x76, 0xe3, 0x4b, 0x1f, 0xf8, 0x0d, 0x4b, 0xc2, 0xbf, 0x61, 0x59, 0xfd, 0x3c, 0x4c, + 0x6a, 0x56, 0xbb, 0xd7, 0xdd, 0x55, 0xb1, 0xe7, 0xfe, 0xc0, 0xbd, 0x2a, 0xbc, 0x04, 0x41, 0x8b, + 0xf9, 0x81, 0x20, 0x7c, 0x2d, 0x16, 0xdf, 0xd8, 0x5d, 0xfd, 0x46, 0x6c, 0x66, 0x83, 0x42, 0x77, + 0xf9, 0x48, 0x65, 0xd4, 0x34, 0x90, 0x86, 0xbd, 0x87, 0xaf, 0x3f, 0x09, 0x4f, 0xb5, 0x74, 0xef, + 0xa0, 0x53, 0x5f, 0xd0, 0xac, 0xf6, 0x62, 0xcb, 0x6a, 0x59, 0xc1, 0x37, 0x55, 0xfc, 0x44, 0x1e, + 0xc8, 0x5f, 0xec, 0xbb, 0x6a, 0xc6, 0x97, 0xce, 0x44, 0x7e, 0x84, 0x2d, 0xed, 0xc0, 0x24, 0x33, + 0x56, 0xc8, 0x87, 0x1d, 0x7a, 0x3c, 0x91, 0xee, 0x7b, 0x39, 0x56, 0xf8, 0xd6, 0xbb, 0x64, 0xbb, + 0x96, 0x27, 0x18, 0x14, 0xeb, 0xe8, 0x09, 0xa6, 0x24, 0xc3, 0x03, 0x5d, 0x7c, 0x74, 0x69, 0x22, + 0x27, 0x82, 0xf1, 0xfb, 0x8c, 0x71, 0x32, 0xc4, 0x58, 0x63, 0xd0, 0xd2, 0x1a, 0x8c, 0x9d, 0x84, + 0xeb, 0x1f, 0x19, 0x57, 0x0e, 0x85, 0x49, 0x36, 0x60, 0x9c, 0x90, 0x68, 0x1d, 0xd7, 0xb3, 0xda, + 0xa4, 0xee, 0xdd, 0x9f, 0xe6, 0x9f, 0xde, 0xa5, 0x6b, 0x25, 0x8f, 0x61, 0x6b, 0x3e, 0xaa, 0x54, + 0x02, 0xf2, 0x2d, 0xab, 0x81, 0x34, 0x23, 0x82, 0xe1, 0x2d, 0xe6, 0x88, 0x6f, 0x5f, 0xfa, 0x1c, + 0x4c, 0xe1, 0xbf, 0x49, 0x59, 0x0a, 0x7b, 0x12, 0x7d, 0x93, 0x56, 0xf8, 0xe1, 0x2b, 0x74, 0x39, + 0x4e, 0xfa, 0x04, 0x21, 0x9f, 0x42, 0xb3, 0xd8, 0x42, 0x9e, 0x87, 0x1c, 0x57, 0x51, 0x8d, 0x41, + 0xee, 0x85, 0xae, 0x22, 0x0a, 0x5f, 0x7e, 0xaf, 0x7b, 0x16, 0x37, 0x28, 0xb2, 0x6c, 0x18, 0xa5, + 0x7d, 0x38, 0x35, 0x20, 0x2b, 0x86, 0xe0, 0x7c, 0x95, 0x71, 0x4e, 0xf5, 0x65, 0x06, 0xa6, 0xdd, + 0x05, 0x2e, 0xf7, 0xe7, 0x72, 0x08, 0xce, 0xdf, 0x67, 0x9c, 0x12, 0xc3, 0xf2, 0x29, 0xc5, 0x8c, + 0xcf, 0xc1, 0xc4, 0x0d, 0xe4, 0xd4, 0x2d, 0x97, 0x5d, 0xff, 0x0c, 0x41, 0xf7, 0x1a, 0xa3, 0x1b, + 0x67, 0x40, 0x72, 0x1f, 0x84, 0xb9, 0x2e, 0x41, 0xba, 0xa9, 0x6a, 0x68, 0x08, 0x8a, 0xaf, 0x30, + 0x8a, 0x51, 0x6c, 0x8f, 0xa1, 0x65, 0xc8, 0xb5, 0x2c, 0xb6, 0x33, 0x45, 0xc3, 0x5f, 0x67, 0xf0, + 0x2c, 0xc7, 0x30, 0x0a, 0xdb, 0xb2, 0x3b, 0x06, 0xde, 0xb6, 0xa2, 0x29, 0xfe, 0x80, 0x53, 0x70, + 0x0c, 0xa3, 0x38, 0x41, 0x58, 0xff, 0x90, 0x53, 0xb8, 0xa1, 0x78, 0x3e, 0x0b, 0x59, 0xcb, 0x34, + 0x0e, 0x2d, 0x73, 0x18, 0x27, 0xbe, 0xca, 0x18, 0x80, 0x41, 0x30, 0xc1, 0x65, 0xc8, 0x0c, 0x3b, + 0x11, 0x7f, 0xfc, 0x1e, 0x5f, 0x1e, 0x7c, 0x06, 0x36, 0x60, 0x9c, 0x17, 0x28, 0xdd, 0x32, 0x87, + 0xa0, 0xf8, 0x3a, 0xa3, 0xc8, 0x87, 0x60, 0x6c, 0x18, 0x1e, 0x72, 0xbd, 0x16, 0x1a, 0x86, 0xe4, + 0x0d, 0x3e, 0x0c, 0x06, 0x61, 0xa1, 0xac, 0x23, 0x53, 0x3b, 0x18, 0x8e, 0xe1, 0x4d, 0x1e, 0x4a, + 0x8e, 0xc1, 0x14, 0x6b, 0x30, 0xd6, 0x56, 0x1d, 0xf7, 0x40, 0x35, 0x86, 0x9a, 0x8e, 0x3f, 0x61, + 0x1c, 0x39, 0x1f, 0xc4, 0x22, 0xd2, 0x31, 0x4f, 0x42, 0xf3, 0x0d, 0x1e, 0x91, 0x10, 0x8c, 0x2d, + 0x3d, 0xd7, 0x23, 0x77, 0x65, 0x27, 0x61, 0xfb, 0x53, 0xbe, 0xf4, 0x28, 0x76, 0x3b, 0xcc, 0x78, + 0x19, 0x32, 0xae, 0x7e, 0x6b, 0x28, 0x9a, 0x3f, 0xe3, 0x33, 0x4d, 0x00, 0x18, 0xfc, 0x22, 0x9c, + 0x1e, 0xb8, 0x4d, 0x0c, 0x41, 0xf6, 0xe7, 0x8c, 0x6c, 0x7a, 0xc0, 0x56, 0xc1, 0x4a, 0xc2, 0x49, + 0x29, 0xff, 0x82, 0x97, 0x04, 0xd4, 0xc3, 0xb5, 0x8b, 0xcf, 0x0a, 0xae, 0xda, 0x3c, 0x59, 0xd4, + 0xfe, 0x92, 0x47, 0x8d, 0x62, 0xbb, 0xa2, 0xb6, 0x07, 0xd3, 0x8c, 0xf1, 0x64, 0xf3, 0xfa, 0x4d, + 0x5e, 0x58, 0x29, 0x7a, 0xbf, 0x7b, 0x76, 0x3f, 0x0f, 0x33, 0x7e, 0x38, 0x79, 0x53, 0xea, 0x2a, + 0x6d, 0xd5, 0x1e, 0x82, 0xf9, 0x5b, 0x8c, 0x99, 0x57, 0x7c, 0xbf, 0xab, 0x75, 0xb7, 0x55, 0x1b, + 0x93, 0xbf, 0x00, 0x05, 0x4e, 0xde, 0x31, 0x1d, 0xa4, 0x59, 0x2d, 0x53, 0xbf, 0x85, 0x1a, 0x43, + 0x50, 0xff, 0x55, 0xcf, 0x54, 0xed, 0x87, 0xe0, 0x98, 0x79, 0x13, 0x44, 0xbf, 0x57, 0x51, 0xf4, + 0xb6, 0x6d, 0x39, 0x5e, 0x04, 0xe3, 0x5f, 0xf3, 0x99, 0xf2, 0x71, 0x9b, 0x04, 0x56, 0xaa, 0x40, + 0x9e, 0x3c, 0x0e, 0x9b, 0x92, 0x7f, 0xc3, 0x88, 0xc6, 0x02, 0x14, 0x2b, 0x1c, 0x9a, 0xd5, 0xb6, + 0x55, 0x67, 0x98, 0xfa, 0xf7, 0xb7, 0xbc, 0x70, 0x30, 0x08, 0x2b, 0x1c, 0xde, 0xa1, 0x8d, 0xf0, + 0x6e, 0x3f, 0x04, 0xc3, 0xb7, 0x79, 0xe1, 0xe0, 0x18, 0x46, 0xc1, 0x1b, 0x86, 0x21, 0x28, 0xfe, + 0x8e, 0x53, 0x70, 0x0c, 0xa6, 0xf8, 0x6c, 0xb0, 0xd1, 0x3a, 0xa8, 0xa5, 0xbb, 0x9e, 0x43, 0x5b, + 0xe1, 0xfb, 0x53, 0x7d, 0xe7, 0xbd, 0xee, 0x26, 0x4c, 0x0e, 0x41, 0x71, 0x25, 0x62, 0x57, 0xa8, + 0xe4, 0xa4, 0x14, 0xed, 0xd8, 0x77, 0x79, 0x25, 0x0a, 0xc1, 0xb0, 0x6f, 0xa1, 0x0e, 0x11, 0x87, + 0x5d, 0xc3, 0xe7, 0x83, 0x21, 0xe8, 0xbe, 0xd7, 0xe3, 0x5c, 0x8d, 0x63, 0x31, 0x67, 0xa8, 0xff, + 0xe9, 0x98, 0xd7, 0xd1, 0xe1, 0x50, 0xd9, 0xf9, 0xf7, 0x3d, 0xfd, 0xcf, 0x3e, 0x45, 0xd2, 0x1a, + 0x32, 0xde, 0xd3, 0x4f, 0x49, 0x51, 0xbf, 0x02, 0x2a, 0xfc, 0xfc, 0x5d, 0x36, 0xde, 0xee, 0x76, + 0xaa, 0xb4, 0x85, 0x93, 0xbc, 0xbb, 0xe9, 0x89, 0x26, 0x7b, 0xe5, 0xae, 0x9f, 0xe7, 0x5d, 0x3d, + 0x4f, 0xe9, 0x0a, 0x8c, 0x75, 0x35, 0x3c, 0xd1, 0x54, 0xbf, 0xc0, 0xa8, 0x72, 0xe1, 0x7e, 0xa7, + 0xb4, 0x02, 0x09, 0xdc, 0xbc, 0x44, 0xc3, 0x7f, 0x91, 0xc1, 0x89, 0x79, 0xe9, 0xd3, 0x90, 0xe6, + 0x4d, 0x4b, 0x34, 0xf4, 0x97, 0x18, 0xd4, 0x87, 0x60, 0x38, 0x6f, 0x58, 0xa2, 0xe1, 0xbf, 0xcc, + 0xe1, 0x1c, 0x82, 0xe1, 0xc3, 0x87, 0xf0, 0x1f, 0x7e, 0x25, 0xc1, 0x36, 0x1d, 0x1e, 0xbb, 0xcb, + 0x30, 0xca, 0x3a, 0x95, 0x68, 0xf4, 0x17, 0xd9, 0xcb, 0x39, 0xa2, 0x74, 0x01, 0x92, 0x43, 0x06, + 0xfc, 0xd7, 0x18, 0x94, 0xda, 0x97, 0xd6, 0x20, 0x1b, 0xea, 0x4e, 0xa2, 0xe1, 0xbf, 0xce, 0xe0, + 0x61, 0x14, 0x76, 0x9d, 0x75, 0x27, 0xd1, 0x04, 0xbf, 0xc1, 0x5d, 0x67, 0x08, 0x1c, 0x36, 0xde, + 0x98, 0x44, 0xa3, 0x7f, 0x93, 0x47, 0x9d, 0x43, 0x4a, 0xcf, 0x42, 0xc6, 0xdf, 0x6c, 0xa2, 0xf1, + 0xbf, 0xc5, 0xf0, 0x01, 0x06, 0x47, 0x20, 0xb4, 0xd9, 0x45, 0x53, 0xfc, 0x36, 0x8f, 0x40, 0x08, + 0x85, 0x97, 0x51, 0x6f, 0x03, 0x13, 0xcd, 0xf4, 0x3b, 0x7c, 0x19, 0xf5, 0xf4, 0x2f, 0x78, 0x36, + 0x49, 0xcd, 0x8f, 0xa6, 0xf8, 0x5d, 0x3e, 0x9b, 0xc4, 0x1e, 0xbb, 0xd1, 0xdb, 0x11, 0x44, 0x73, + 0xfc, 0x1e, 0x77, 0xa3, 0xa7, 0x21, 0x28, 0xed, 0x82, 0xd4, 0xdf, 0x0d, 0x44, 0xf3, 0x7d, 0x89, + 0xf1, 0x4d, 0xf4, 0x35, 0x03, 0xa5, 0xe7, 0x61, 0x7a, 0x70, 0x27, 0x10, 0xcd, 0xfa, 0xe5, 0xbb, + 0x3d, 0x67, 0xb7, 0x70, 0x23, 0x50, 0xda, 0x0b, 0xb6, 0x94, 0x70, 0x17, 0x10, 0x4d, 0xfb, 0xea, + 0xdd, 0xee, 0xc2, 0x1d, 0x6e, 0x02, 0x4a, 0x65, 0x80, 0x60, 0x03, 0x8e, 0xe6, 0x7a, 0x8d, 0x71, + 0x85, 0x40, 0x78, 0x69, 0xb0, 0xfd, 0x37, 0x1a, 0xff, 0x15, 0xbe, 0x34, 0x18, 0x02, 0x2f, 0x0d, + 0xbe, 0xf5, 0x46, 0xa3, 0x5f, 0xe7, 0x4b, 0x83, 0x43, 0x70, 0x66, 0x87, 0x76, 0xb7, 0x68, 0x86, + 0xaf, 0xf2, 0xcc, 0x0e, 0xa1, 0x4a, 0x3b, 0x30, 0xd1, 0xb7, 0x21, 0x46, 0x53, 0x7d, 0x8d, 0x51, + 0x89, 0xbd, 0xfb, 0x61, 0x78, 0xf3, 0x62, 0x9b, 0x61, 0x34, 0xdb, 0x1f, 0xf5, 0x6c, 0x5e, 0x6c, + 0x2f, 0x2c, 0x5d, 0x86, 0xb4, 0xd9, 0x31, 0x0c, 0xbc, 0x78, 0xa4, 0xfb, 0xff, 0x72, 0xaf, 0xf0, + 0x6f, 0xf7, 0x58, 0x74, 0x38, 0xa0, 0xb4, 0x02, 0x49, 0xd4, 0xae, 0xa3, 0x46, 0x14, 0xf2, 0xdf, + 0xef, 0xf1, 0x82, 0x89, 0xad, 0x4b, 0xcf, 0x02, 0xd0, 0xab, 0x11, 0xf2, 0xd9, 0x2f, 0x02, 0xfb, + 0x1f, 0xf7, 0xd8, 0x6f, 0x6a, 0x02, 0x48, 0x40, 0x40, 0x7f, 0xa1, 0x73, 0x7f, 0x82, 0xf7, 0xba, + 0x09, 0xc8, 0x8c, 0x5c, 0x82, 0xd1, 0x6b, 0xae, 0x65, 0x7a, 0x6a, 0x2b, 0x0a, 0xfd, 0x9f, 0x0c, + 0xcd, 0xed, 0x71, 0xc0, 0xda, 0x96, 0x83, 0x3c, 0xb5, 0xe5, 0x46, 0x61, 0xff, 0x8b, 0x61, 0x7d, + 0x00, 0x06, 0x6b, 0xaa, 0xeb, 0x0d, 0x33, 0xee, 0xff, 0xe6, 0x60, 0x0e, 0xc0, 0x4e, 0xe3, 0xbf, + 0xaf, 0xa3, 0xc3, 0x28, 0xec, 0xfb, 0xdc, 0x69, 0x66, 0x5f, 0xfa, 0x34, 0x64, 0xf0, 0x9f, 0xf4, + 0x87, 0x72, 0x11, 0xe0, 0xff, 0x61, 0xe0, 0x00, 0x81, 0xdf, 0xec, 0x7a, 0x0d, 0x4f, 0x8f, 0x0e, + 0xf6, 0xff, 0xb2, 0x99, 0xe6, 0xf6, 0xa5, 0x32, 0x64, 0x5d, 0xaf, 0xd1, 0xe8, 0xb0, 0xfe, 0x34, + 0x02, 0xfe, 0x7f, 0xf7, 0xfc, 0x2b, 0x0b, 0x1f, 0x83, 0x67, 0xfb, 0xe6, 0x75, 0xcf, 0xb6, 0xc8, + 0x67, 0x8e, 0x28, 0x86, 0xbb, 0x8c, 0x21, 0x04, 0x59, 0xad, 0x0c, 0xbe, 0xbe, 0x85, 0x0d, 0x6b, + 0xc3, 0xa2, 0x17, 0xb7, 0x2f, 0xcd, 0x45, 0xdf, 0xc0, 0xc2, 0x6b, 0x49, 0x98, 0xd1, 0xac, 0x76, + 0xdd, 0x72, 0x17, 0xfd, 0x72, 0xbc, 0x68, 0x99, 0x8c, 0x51, 0x8a, 0x5b, 0x26, 0x9a, 0x39, 0xd9, + 0x4d, 0xee, 0xdc, 0x69, 0x48, 0xd6, 0x3a, 0xf5, 0xfa, 0xa1, 0x24, 0x42, 0xdc, 0xed, 0xd4, 0xd9, + 0xcf, 0xad, 0xf0, 0x9f, 0x73, 0x3f, 0x8a, 0x43, 0xb6, 0xa6, 0xb6, 0x6d, 0x03, 0x55, 0x4d, 0x54, + 0x6d, 0x4a, 0x05, 0x48, 0x91, 0x81, 0x3e, 0x43, 0x8c, 0x84, 0xab, 0x23, 0x32, 0x7b, 0xf6, 0x35, + 0x4b, 0xe4, 0x86, 0x3b, 0xe6, 0x6b, 0x96, 0x7c, 0xcd, 0x39, 0x7a, 0xc1, 0xed, 0x6b, 0xce, 0xf9, + 0x9a, 0x65, 0x72, 0xcd, 0x1d, 0xf7, 0x35, 0xcb, 0xbe, 0x66, 0x85, 0x7c, 0xc6, 0x19, 0xf3, 0x35, + 0x2b, 0xbe, 0xe6, 0x3c, 0xf9, 0x70, 0x93, 0xf0, 0x35, 0xe7, 0x7d, 0xcd, 0x05, 0xf2, 0xbd, 0x66, + 0xc2, 0xd7, 0x5c, 0xf0, 0x35, 0x17, 0xc9, 0x37, 0x1a, 0xc9, 0xd7, 0x5c, 0xf4, 0x35, 0x97, 0xc8, + 0xaf, 0xaa, 0x46, 0x7d, 0xcd, 0x25, 0x69, 0x06, 0x46, 0xe9, 0xc8, 0x9e, 0x26, 0x1f, 0xf2, 0xc7, + 0xaf, 0x8e, 0xc8, 0x5c, 0x10, 0xe8, 0x9e, 0x21, 0xbf, 0x9c, 0x4a, 0x05, 0xba, 0x67, 0x02, 0xdd, + 0x12, 0xf9, 0x0f, 0x1c, 0x62, 0xa0, 0x5b, 0x0a, 0x74, 0xe7, 0x0a, 0x63, 0x38, 0x3f, 0x02, 0xdd, + 0xb9, 0x40, 0xb7, 0x5c, 0xc8, 0xe3, 0xf8, 0x07, 0xba, 0xe5, 0x40, 0xb7, 0x52, 0x18, 0x9f, 0x15, + 0xe6, 0x73, 0x81, 0x6e, 0x45, 0x7a, 0x0a, 0xb2, 0x6e, 0xa7, 0xae, 0xb0, 0x4a, 0x4f, 0x7e, 0xa1, + 0x95, 0x5d, 0x82, 0x05, 0x9c, 0x11, 0x64, 0x52, 0xaf, 0x8e, 0xc8, 0xe0, 0x76, 0xea, 0xac, 0x10, + 0xaf, 0xe6, 0x80, 0xdc, 0x3f, 0x29, 0xe4, 0x87, 0xd5, 0xab, 0x57, 0xdf, 0xba, 0x53, 0x1c, 0xf9, + 0xc1, 0x9d, 0xe2, 0xc8, 0xbf, 0xdc, 0x29, 0x8e, 0xbc, 0x7d, 0xa7, 0x28, 0xbc, 0x7f, 0xa7, 0x28, + 0x7c, 0x70, 0xa7, 0x28, 0xdc, 0x3e, 0x2a, 0x0a, 0x6f, 0x1e, 0x15, 0x85, 0x6f, 0x1e, 0x15, 0x85, + 0xef, 0x1c, 0x15, 0x85, 0xb7, 0x8e, 0x8a, 0xc2, 0x0f, 0x8e, 0x8a, 0x23, 0x6f, 0x1f, 0x15, 0x85, + 0x1f, 0x1f, 0x15, 0x47, 0xde, 0x3f, 0x2a, 0x0a, 0x1f, 0x1c, 0x15, 0x47, 0x6e, 0xbf, 0x53, 0x1c, + 0x79, 0xf3, 0x9d, 0xa2, 0x50, 0x4f, 0x91, 0x54, 0x3a, 0xf7, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, + 0x8d, 0x4e, 0x27, 0x39, 0x93, 0x35, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) @@ -2072,7 +2503,7 @@ func (m *Subby) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2080,26 +2511,33 @@ } func (m *Subby) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Subby) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Sub) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.Sub) + copy(dAtA[i:], m.Sub) i = encodeVarintOne(dAtA, i, uint64(len(m.Sub))) - i += copy(dAtA[i:], m.Sub) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *SampleOneOf) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2107,167 +2545,261 @@ } func (m *SampleOneOf) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.TestOneof != nil { - nn1, err1 := m.TestOneof.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + { + size := m.TestOneof.Size() + i -= size + if _, err := m.TestOneof.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn1 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *SampleOneOf_Field1) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x9 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field1) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - return i, nil + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field2) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x15 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field2) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - return i, nil + i-- + dAtA[i] = 0x15 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field3) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x18 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field3) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field3)) - return i, nil + i-- + dAtA[i] = 0x18 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field4) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x20 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field4) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field4)) - return i, nil + i-- + dAtA[i] = 0x20 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field5) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x28 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field5) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field5)) - return i, nil + i-- + dAtA[i] = 0x28 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field6) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x30 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field6) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64(m.Field6)) - return i, nil + i-- + dAtA[i] = 0x30 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field7) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x38 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field7) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) - return i, nil + i-- + dAtA[i] = 0x38 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field8) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x40 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field8) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintOne(dAtA, i, uint64((uint64(m.Field8)<<1)^uint64((m.Field8>>63)))) - return i, nil + i-- + dAtA[i] = 0x40 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field9) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x4d - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field9) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9)) - i += 4 - return i, nil + i-- + dAtA[i] = 0x4d + return len(dAtA) - i, nil } func (m *SampleOneOf_Field10) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x55 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field10) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10)) - i += 4 - return i, nil + i-- + dAtA[i] = 0x55 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field11) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x59 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field11) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11)) - i += 8 - return i, nil + i-- + dAtA[i] = 0x59 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field12) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x61 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field12) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12)) - i += 8 - return i, nil + i-- + dAtA[i] = 0x61 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field13) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x68 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field13) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i-- if m.Field13 { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - return i, nil + i-- + dAtA[i] = 0x68 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field14) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x72 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field14) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= len(m.Field14) + copy(dAtA[i:], m.Field14) i = encodeVarintOne(dAtA, i, uint64(len(m.Field14))) - i += copy(dAtA[i:], m.Field14) - return i, nil + i-- + dAtA[i] = 0x72 + return len(dAtA) - i, nil } func (m *SampleOneOf_Field15) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_Field15) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Field15 != nil { - dAtA[i] = 0x7a - i++ + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) i = encodeVarintOne(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + i-- + dAtA[i] = 0x7a } - return i, nil + return len(dAtA) - i, nil } func (m *SampleOneOf_SubMessage) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SampleOneOf_SubMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.SubMessage != nil { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintOne(dAtA, i, uint64(m.SubMessage.Size())) - n2, err2 := m.SubMessage.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + { + size, err := m.SubMessage.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOne(dAtA, i, uint64(size)) } - i += n2 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintOne(dAtA []byte, offset int, v uint64) int { + offset -= sovOne(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedSubby(r randyOne, easy bool) *Subby { this := &Subby{} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/marshaler/onepb_test.go golang-gogoprotobuf-1.3.1/test/oneof3/combos/marshaler/onepb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/marshaler/onepb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/marshaler/onepb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -255,6 +255,54 @@ } } +func TestSubbyCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSubby(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &Subby{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSubby(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestSampleOneOfCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSampleOneOf(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &SampleOneOf{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSampleOneOf(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} func TestOneDescription(t *testing.T) { OneDescription() } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/marshaler/one.proto golang-gogoprotobuf-1.3.1/test/oneof3/combos/marshaler/one.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/marshaler/one.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/marshaler/one.proto 2020-05-17 12:22:58.000000000 +0000 @@ -54,6 +54,8 @@ option (gogoproto.unsafe_marshaler_all) = false; option (gogoproto.unsafe_unmarshaler_all) = false; +option (gogoproto.compare_all) = true; + message Subby { string sub = 1; } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/neither/one.pb.go golang-gogoprotobuf-1.3.1/test/oneof3/combos/neither/one.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/neither/one.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/neither/one.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -27,7 +27,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Subby struct { Sub string `protobuf:"bytes,1,opt,name=sub,proto3" json:"sub,omitempty"` @@ -111,55 +111,56 @@ Equal(interface{}) bool VerboseEqual(interface{}) error Size() int + Compare(interface{}) int } type SampleOneOf_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,proto3,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,proto3,oneof" json:"Field1,omitempty"` } type SampleOneOf_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,proto3,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,proto3,oneof" json:"Field2,omitempty"` } type SampleOneOf_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,proto3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,proto3,oneof" json:"Field3,omitempty"` } type SampleOneOf_Field4 struct { - Field4 int64 `protobuf:"varint,4,opt,name=Field4,proto3,oneof"` + Field4 int64 `protobuf:"varint,4,opt,name=Field4,proto3,oneof" json:"Field4,omitempty"` } type SampleOneOf_Field5 struct { - Field5 uint32 `protobuf:"varint,5,opt,name=Field5,proto3,oneof"` + Field5 uint32 `protobuf:"varint,5,opt,name=Field5,proto3,oneof" json:"Field5,omitempty"` } type SampleOneOf_Field6 struct { - Field6 uint64 `protobuf:"varint,6,opt,name=Field6,proto3,oneof"` + Field6 uint64 `protobuf:"varint,6,opt,name=Field6,proto3,oneof" json:"Field6,omitempty"` } type SampleOneOf_Field7 struct { - Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,proto3,oneof"` + Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,proto3,oneof" json:"Field7,omitempty"` } type SampleOneOf_Field8 struct { - Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,proto3,oneof"` + Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,proto3,oneof" json:"Field8,omitempty"` } type SampleOneOf_Field9 struct { - Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,proto3,oneof"` + Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,proto3,oneof" json:"Field9,omitempty"` } type SampleOneOf_Field10 struct { - Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,proto3,oneof"` + Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,proto3,oneof" json:"Field10,omitempty"` } type SampleOneOf_Field11 struct { - Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,proto3,oneof"` + Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,proto3,oneof" json:"Field11,omitempty"` } type SampleOneOf_Field12 struct { - Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,proto3,oneof"` + Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,proto3,oneof" json:"Field12,omitempty"` } type SampleOneOf_Field13 struct { - Field13 bool `protobuf:"varint,13,opt,name=Field13,proto3,oneof"` + Field13 bool `protobuf:"varint,13,opt,name=Field13,proto3,oneof" json:"Field13,omitempty"` } type SampleOneOf_Field14 struct { - Field14 string `protobuf:"bytes,14,opt,name=Field14,proto3,oneof"` + Field14 string `protobuf:"bytes,14,opt,name=Field14,proto3,oneof" json:"Field14,omitempty"` } type SampleOneOf_Field15 struct { - Field15 []byte `protobuf:"bytes,15,opt,name=Field15,proto3,oneof"` + Field15 []byte `protobuf:"bytes,15,opt,name=Field15,proto3,oneof" json:"Field15,omitempty"` } type SampleOneOf_SubMessage struct { - SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,proto3,oneof"` + SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,proto3,oneof" json:"sub_message,omitempty"` } func (*SampleOneOf_Field1) isSampleOneOf_TestOneof() {} @@ -298,9 +299,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*SampleOneOf) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _SampleOneOf_OneofMarshaler, _SampleOneOf_OneofUnmarshaler, _SampleOneOf_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*SampleOneOf) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*SampleOneOf_Field1)(nil), (*SampleOneOf_Field2)(nil), (*SampleOneOf_Field3)(nil), @@ -320,292 +321,722 @@ } } -func _SampleOneOf_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*SampleOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *SampleOneOf_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *SampleOneOf_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *SampleOneOf_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case *SampleOneOf_Field4: - _ = b.EncodeVarint(4<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field4)) - case *SampleOneOf_Field5: - _ = b.EncodeVarint(5<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field5)) - case *SampleOneOf_Field6: - _ = b.EncodeVarint(6<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field6)) - case *SampleOneOf_Field7: - _ = b.EncodeVarint(7<<3 | proto.WireVarint) - _ = b.EncodeZigzag32(uint64(x.Field7)) - case *SampleOneOf_Field8: - _ = b.EncodeVarint(8<<3 | proto.WireVarint) - _ = b.EncodeZigzag64(uint64(x.Field8)) - case *SampleOneOf_Field9: - _ = b.EncodeVarint(9<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field9)) - case *SampleOneOf_Field10: - _ = b.EncodeVarint(10<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field10)) - case *SampleOneOf_Field11: - _ = b.EncodeVarint(11<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field11)) - case *SampleOneOf_Field12: - _ = b.EncodeVarint(12<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field12)) - case *SampleOneOf_Field13: - t := uint64(0) - if x.Field13 { - t = 1 - } - _ = b.EncodeVarint(13<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *SampleOneOf_Field14: - _ = b.EncodeVarint(14<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field14) - case *SampleOneOf_Field15: - _ = b.EncodeVarint(15<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field15) - case *SampleOneOf_SubMessage: - _ = b.EncodeVarint(16<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("SampleOneOf.TestOneof has unexpected type %T", x) +func init() { + proto.RegisterType((*Subby)(nil), "one.Subby") + proto.RegisterType((*SampleOneOf)(nil), "one.SampleOneOf") +} + +func init() { proto.RegisterFile("combos/neither/one.proto", fileDescriptor_e4ee9759a7520144) } + +var fileDescriptor_e4ee9759a7520144 = []byte{ + // 406 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0xd2, 0xbf, 0x52, 0x1b, 0x31, + 0x10, 0x06, 0x70, 0x2d, 0x87, 0x6d, 0x90, 0x4d, 0x70, 0xae, 0xda, 0x50, 0xec, 0x68, 0xa8, 0xd4, + 0x60, 0xc7, 0x77, 0x36, 0x7f, 0x5a, 0x8a, 0x8c, 0x9b, 0x0c, 0x33, 0xe6, 0x01, 0x18, 0x44, 0x64, + 0xe3, 0x19, 0xee, 0xc4, 0x70, 0x77, 0x45, 0x3a, 0x1e, 0x87, 0x32, 0x65, 0x1e, 0x81, 0x92, 0x32, + 0x45, 0x0a, 0x4e, 0x34, 0x29, 0x29, 0x5d, 0x66, 0x7c, 0x4e, 0x56, 0xdd, 0x7e, 0xfa, 0x49, 0x85, + 0xa4, 0x4f, 0xe2, 0x8d, 0xcb, 0x8c, 0x2b, 0x86, 0xb9, 0x5d, 0x96, 0xb7, 0xf6, 0x61, 0xe8, 0x72, + 0x3b, 0xb8, 0x7f, 0x70, 0xa5, 0x8b, 0x23, 0x97, 0xdb, 0x83, 0xa3, 0xc5, 0xb2, 0xbc, 0xad, 0xcc, + 0xe0, 0xc6, 0x65, 0xc3, 0x85, 0x5b, 0xb8, 0x61, 0x63, 0xa6, 0x9a, 0x37, 0xa9, 0x09, 0xcd, 0xb4, + 0x39, 0x73, 0xf8, 0x49, 0xb6, 0x2e, 0x2b, 0x63, 0xbe, 0xc7, 0x7d, 0x19, 0x15, 0x95, 0x41, 0x50, + 0xa0, 0x77, 0x67, 0xeb, 0xf1, 0xf0, 0x77, 0x24, 0xbb, 0x97, 0xd7, 0xd9, 0xfd, 0x9d, 0xbd, 0xc8, + 0xed, 0xc5, 0x3c, 0x46, 0xd9, 0xfe, 0xb2, 0xb4, 0x77, 0xdf, 0x46, 0xcd, 0x26, 0x98, 0x8a, 0xd9, + 0xbf, 0xcc, 0x92, 0xe0, 0x96, 0x02, 0xbd, 0xc5, 0x92, 0xb0, 0xa4, 0x18, 0x29, 0xd0, 0x2d, 0x96, + 0x94, 0x65, 0x8c, 0xdb, 0x0a, 0x74, 0xc4, 0x32, 0x66, 0x99, 0x60, 0x4b, 0x81, 0xde, 0x63, 0x99, + 0xb0, 0x1c, 0x63, 0x5b, 0x81, 0xde, 0x66, 0x39, 0x66, 0x39, 0xc1, 0x8e, 0x02, 0xfd, 0x91, 0xe5, + 0x84, 0xe5, 0x14, 0x77, 0x14, 0xe8, 0x98, 0xe5, 0x94, 0xe5, 0x0c, 0x77, 0x15, 0xe8, 0x0e, 0xcb, + 0x59, 0x7c, 0x20, 0x3b, 0x9b, 0x9b, 0x7d, 0x46, 0xa9, 0x40, 0xef, 0x4f, 0xc5, 0xec, 0xff, 0x42, + 0xb0, 0x11, 0x76, 0x15, 0xe8, 0x76, 0xb0, 0x51, 0xb0, 0x04, 0x7b, 0x0a, 0x74, 0x3f, 0x58, 0x12, + 0x2c, 0xc5, 0x3d, 0x05, 0x7a, 0x27, 0x58, 0x1a, 0x6c, 0x8c, 0x1f, 0xd6, 0xef, 0x1f, 0x6c, 0x1c, + 0x6c, 0x82, 0xfb, 0x0a, 0x74, 0x2f, 0xd8, 0x24, 0x3e, 0x92, 0xdd, 0xa2, 0x32, 0x57, 0x99, 0x2d, + 0x8a, 0xeb, 0x85, 0xc5, 0xbe, 0x02, 0xdd, 0x4d, 0xe4, 0x60, 0xdd, 0x88, 0xe6, 0x53, 0xa7, 0x62, + 0x26, 0x8b, 0xca, 0x7c, 0xdd, 0xf8, 0x79, 0x4f, 0xca, 0xd2, 0x16, 0xe5, 0x95, 0xcb, 0xad, 0x9b, + 0x9f, 0x4f, 0x9f, 0x6b, 0x12, 0x2f, 0x35, 0x89, 0x5f, 0x35, 0x89, 0xd7, 0x9a, 0xe0, 0xbd, 0x26, + 0x58, 0xd5, 0x04, 0x8f, 0x9e, 0xe0, 0xc9, 0x13, 0xfc, 0xf0, 0x04, 0x3f, 0x3d, 0xc1, 0xb3, 0x27, + 0xf1, 0xe2, 0x49, 0xbc, 0x7a, 0x82, 0x3f, 0x9e, 0xc4, 0xbb, 0x27, 0x58, 0x79, 0x12, 0x8f, 0x6f, + 0x24, 0x9e, 0xde, 0x08, 0x4c, 0xbb, 0xa9, 0x52, 0xfa, 0x37, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xd9, + 0xfd, 0xb1, 0x9a, 0x02, 0x00, 0x00, +} + +func (this *Subby) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 } - return nil + + that1, ok := that.(*Subby) + if !ok { + that2, ok := that.(Subby) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Sub != that1.Sub { + if this.Sub < that1.Sub { + return -1 + } + return 1 + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 } +func (this *SampleOneOf) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func _SampleOneOf_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*SampleOneOf) - switch tag { - case 1: // test_oneof.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field1{math.Float64frombits(x)} - return true, err - case 2: // test_oneof.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // test_oneof.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field3{int32(x)} - return true, err - case 4: // test_oneof.Field4 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field4{int64(x)} - return true, err - case 5: // test_oneof.Field5 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field5{uint32(x)} - return true, err - case 6: // test_oneof.Field6 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field6{x} - return true, err - case 7: // test_oneof.Field7 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag32() - m.TestOneof = &SampleOneOf_Field7{int32(x)} - return true, err - case 8: // test_oneof.Field8 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag64() - m.TestOneof = &SampleOneOf_Field8{int64(x)} - return true, err - case 9: // test_oneof.Field9 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field9{uint32(x)} - return true, err - case 10: // test_oneof.Field10 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field10{int32(x)} - return true, err - case 11: // test_oneof.Field11 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field11{x} - return true, err - case 12: // test_oneof.Field12 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field12{int64(x)} - return true, err - case 13: // test_oneof.Field13 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field13{x != 0} - return true, err - case 14: // test_oneof.Field14 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.TestOneof = &SampleOneOf_Field14{x} - return true, err - case 15: // test_oneof.Field15 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.TestOneof = &SampleOneOf_Field15{x} - return true, err - case 16: // test_oneof.sub_message - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.TestOneof = &SampleOneOf_SubMessage{msg} - return true, err - default: - return false, nil - } -} - -func _SampleOneOf_OneofSizer(msg proto.Message) (n int) { - m := msg.(*SampleOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *SampleOneOf_Field1: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field2: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case *SampleOneOf_Field4: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field4)) - case *SampleOneOf_Field5: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field5)) - case *SampleOneOf_Field6: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field6)) - case *SampleOneOf_Field7: - n += 1 // tag and wire - n += proto.SizeVarint(uint64((uint32(x.Field7) << 1) ^ uint32((int32(x.Field7) >> 31)))) - case *SampleOneOf_Field8: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(uint64(x.Field8<<1) ^ uint64((int64(x.Field8) >> 63)))) - case *SampleOneOf_Field9: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field10: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field11: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field12: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field13: - n += 1 // tag and wire - n += 1 - case *SampleOneOf_Field14: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field14))) - n += len(x.Field14) - case *SampleOneOf_Field15: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field15))) - n += len(x.Field15) - case *SampleOneOf_SubMessage: - s := proto.Size(x.SubMessage) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + that1, ok := that.(*SampleOneOf) + if !ok { + that2, ok := that.(SampleOneOf) + if ok { + that1 = &that2 + } else { + return 1 + } } - return n + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.TestOneof == nil { + if this.TestOneof != nil { + return 1 + } + } else if this.TestOneof == nil { + return -1 + } else { + thisType := -1 + switch this.TestOneof.(type) { + case *SampleOneOf_Field1: + thisType = 0 + case *SampleOneOf_Field2: + thisType = 1 + case *SampleOneOf_Field3: + thisType = 2 + case *SampleOneOf_Field4: + thisType = 3 + case *SampleOneOf_Field5: + thisType = 4 + case *SampleOneOf_Field6: + thisType = 5 + case *SampleOneOf_Field7: + thisType = 6 + case *SampleOneOf_Field8: + thisType = 7 + case *SampleOneOf_Field9: + thisType = 8 + case *SampleOneOf_Field10: + thisType = 9 + case *SampleOneOf_Field11: + thisType = 10 + case *SampleOneOf_Field12: + thisType = 11 + case *SampleOneOf_Field13: + thisType = 12 + case *SampleOneOf_Field14: + thisType = 13 + case *SampleOneOf_Field15: + thisType = 14 + case *SampleOneOf_SubMessage: + thisType = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.TestOneof)) + } + that1Type := -1 + switch that1.TestOneof.(type) { + case *SampleOneOf_Field1: + that1Type = 0 + case *SampleOneOf_Field2: + that1Type = 1 + case *SampleOneOf_Field3: + that1Type = 2 + case *SampleOneOf_Field4: + that1Type = 3 + case *SampleOneOf_Field5: + that1Type = 4 + case *SampleOneOf_Field6: + that1Type = 5 + case *SampleOneOf_Field7: + that1Type = 6 + case *SampleOneOf_Field8: + that1Type = 7 + case *SampleOneOf_Field9: + that1Type = 8 + case *SampleOneOf_Field10: + that1Type = 9 + case *SampleOneOf_Field11: + that1Type = 10 + case *SampleOneOf_Field12: + that1Type = 11 + case *SampleOneOf_Field13: + that1Type = 12 + case *SampleOneOf_Field14: + that1Type = 13 + case *SampleOneOf_Field15: + that1Type = 14 + case *SampleOneOf_SubMessage: + that1Type = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.TestOneof)) + } + if thisType == that1Type { + if c := this.TestOneof.Compare(that1.TestOneof); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 } +func (this *SampleOneOf_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func init() { - proto.RegisterType((*Subby)(nil), "one.Subby") - proto.RegisterType((*SampleOneOf)(nil), "one.SampleOneOf") + that1, ok := that.(*SampleOneOf_Field1) + if !ok { + that2, ok := that.(SampleOneOf_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 } +func (this *SampleOneOf_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func init() { proto.RegisterFile("combos/neither/one.proto", fileDescriptor_e4ee9759a7520144) } + that1, ok := that.(*SampleOneOf_Field2) + if !ok { + that2, ok := that.(SampleOneOf_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -var fileDescriptor_e4ee9759a7520144 = []byte{ - // 405 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0xd2, 0xbf, 0x4f, 0x1b, 0x31, - 0x14, 0x07, 0x70, 0x3f, 0x8e, 0x24, 0xe0, 0x84, 0x92, 0xde, 0xf4, 0xca, 0xf0, 0x64, 0x31, 0x79, - 0x21, 0x69, 0xee, 0x12, 0x7e, 0xac, 0xa8, 0xaa, 0xb2, 0x54, 0x48, 0xe1, 0x0f, 0x40, 0x98, 0x3a, - 0x21, 0x12, 0x77, 0x46, 0xdc, 0xdd, 0xd0, 0x8d, 0x3f, 0xa7, 0x63, 0xc7, 0xfe, 0x09, 0x8c, 0x8c, - 0x1d, 0x3a, 0x70, 0xee, 0xd2, 0x91, 0x31, 0x63, 0x95, 0x4b, 0x79, 0xde, 0xde, 0xd7, 0x1f, 0x7b, - 0xb0, 0xfd, 0x95, 0x78, 0xe3, 0x32, 0xe3, 0x8a, 0x61, 0x6e, 0x97, 0xe5, 0xad, 0x7d, 0x18, 0xba, - 0xdc, 0x0e, 0xee, 0x1f, 0x5c, 0xe9, 0xe2, 0xc8, 0xe5, 0xf6, 0xe0, 0x68, 0xb1, 0x2c, 0x6f, 0x2b, - 0x33, 0xb8, 0x71, 0xd9, 0x70, 0xe1, 0x16, 0x6e, 0xd8, 0x98, 0xa9, 0xe6, 0x4d, 0x6a, 0x42, 0x33, - 0x6d, 0xce, 0x1c, 0x7e, 0x90, 0xad, 0xcb, 0xca, 0x98, 0x6f, 0x71, 0x5f, 0x46, 0x45, 0x65, 0x10, - 0x14, 0xe8, 0xdd, 0xd9, 0x7a, 0x3c, 0xfc, 0x1d, 0xc9, 0xee, 0xe5, 0x75, 0x76, 0x7f, 0x67, 0x2f, - 0x72, 0x7b, 0x31, 0x8f, 0x51, 0xb6, 0x3f, 0x2f, 0xed, 0xdd, 0xd7, 0x51, 0xb3, 0x09, 0xa6, 0x62, - 0xf6, 0x3f, 0xb3, 0x24, 0xb8, 0xa5, 0x40, 0x6f, 0xb1, 0x24, 0x2c, 0x29, 0x46, 0x0a, 0x74, 0x8b, - 0x25, 0x65, 0x19, 0xe3, 0xb6, 0x02, 0x1d, 0xb1, 0x8c, 0x59, 0x26, 0xd8, 0x52, 0xa0, 0xf7, 0x58, - 0x26, 0x2c, 0xc7, 0xd8, 0x56, 0xa0, 0xb7, 0x59, 0x8e, 0x59, 0x4e, 0xb0, 0xa3, 0x40, 0xbf, 0x67, - 0x39, 0x61, 0x39, 0xc5, 0x1d, 0x05, 0x3a, 0x66, 0x39, 0x65, 0x39, 0xc3, 0x5d, 0x05, 0xba, 0xc3, - 0x72, 0x16, 0x1f, 0xc8, 0xce, 0xe6, 0x66, 0x1f, 0x51, 0x2a, 0xd0, 0xfb, 0x53, 0x31, 0x7b, 0x5b, - 0x08, 0x36, 0xc2, 0xae, 0x02, 0xdd, 0x0e, 0x36, 0x0a, 0x96, 0x60, 0x4f, 0x81, 0xee, 0x07, 0x4b, - 0x82, 0xa5, 0xb8, 0xa7, 0x40, 0xef, 0x04, 0x4b, 0x83, 0x8d, 0xf1, 0xdd, 0xfa, 0xfd, 0x83, 0x8d, - 0x83, 0x4d, 0x70, 0x5f, 0x81, 0xee, 0x05, 0x9b, 0xc4, 0x47, 0xb2, 0x5b, 0x54, 0xe6, 0x2a, 0xb3, - 0x45, 0x71, 0xbd, 0xb0, 0xd8, 0x57, 0xa0, 0xbb, 0x89, 0x1c, 0xac, 0x1b, 0xd1, 0x7c, 0xea, 0x54, - 0xcc, 0x64, 0x51, 0x99, 0x2f, 0x1b, 0x3f, 0xef, 0x49, 0x59, 0xda, 0xa2, 0xbc, 0x72, 0xb9, 0x75, - 0xf3, 0xf3, 0x4f, 0x4f, 0x35, 0x89, 0xe7, 0x9a, 0xc4, 0xaf, 0x9a, 0xc4, 0x4b, 0x4d, 0xf0, 0x5a, - 0x13, 0xac, 0x6a, 0x82, 0x47, 0x4f, 0xf0, 0xdd, 0x13, 0xfc, 0xf0, 0x04, 0x3f, 0x3d, 0xc1, 0x93, - 0x27, 0xf1, 0xec, 0x49, 0xbc, 0x78, 0x82, 0xbf, 0x9e, 0xc4, 0xab, 0x27, 0x58, 0x79, 0x12, 0x8f, - 0x7f, 0x48, 0x98, 0x76, 0x53, 0xa3, 0xf4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x04, 0xd2, - 0x98, 0x96, 0x02, 0x00, 0x00, + that1, ok := that.(*SampleOneOf_Field3) + if !ok { + that2, ok := that.(SampleOneOf_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field4) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field4) + if !ok { + that2, ok := that.(SampleOneOf_Field4) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field4 != that1.Field4 { + if this.Field4 < that1.Field4 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field5) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field5) + if !ok { + that2, ok := that.(SampleOneOf_Field5) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field5 != that1.Field5 { + if this.Field5 < that1.Field5 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field6) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field6) + if !ok { + that2, ok := that.(SampleOneOf_Field6) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field6 != that1.Field6 { + if this.Field6 < that1.Field6 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field7) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field7) + if !ok { + that2, ok := that.(SampleOneOf_Field7) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field7 != that1.Field7 { + if this.Field7 < that1.Field7 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field8) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field8) + if !ok { + that2, ok := that.(SampleOneOf_Field8) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field8 != that1.Field8 { + if this.Field8 < that1.Field8 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field9) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field9) + if !ok { + that2, ok := that.(SampleOneOf_Field9) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field9 != that1.Field9 { + if this.Field9 < that1.Field9 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field10) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field10) + if !ok { + that2, ok := that.(SampleOneOf_Field10) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field10 != that1.Field10 { + if this.Field10 < that1.Field10 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field11) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field11) + if !ok { + that2, ok := that.(SampleOneOf_Field11) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field11 != that1.Field11 { + if this.Field11 < that1.Field11 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field12) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field12) + if !ok { + that2, ok := that.(SampleOneOf_Field12) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field12 != that1.Field12 { + if this.Field12 < that1.Field12 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field13) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field13) + if !ok { + that2, ok := that.(SampleOneOf_Field13) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field13 != that1.Field13 { + if !this.Field13 { + return -1 + } + return 1 + } + return 0 } +func (this *SampleOneOf_Field14) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + that1, ok := that.(*SampleOneOf_Field14) + if !ok { + that2, ok := that.(SampleOneOf_Field14) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field14 != that1.Field14 { + if this.Field14 < that1.Field14 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field15) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field15) + if !ok { + that2, ok := that.(SampleOneOf_Field15) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field15, that1.Field15); c != 0 { + return c + } + return 0 +} +func (this *SampleOneOf_SubMessage) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_SubMessage) + if !ok { + that2, ok := that.(SampleOneOf_SubMessage) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage.Compare(that1.SubMessage); c != 0 { + return c + } + return 0 +} func (this *Subby) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { return OneDescription() } @@ -615,265 +1046,265 @@ func OneDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 4118 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0x1b, 0xe7, - 0x75, 0x26, 0xae, 0x04, 0x0e, 0x40, 0x70, 0xb9, 0xa4, 0x25, 0x88, 0x8e, 0x21, 0x89, 0xb6, 0x63, - 0xda, 0x8e, 0x29, 0x9b, 0x22, 0x75, 0x81, 0x9a, 0xb8, 0x20, 0x09, 0x51, 0x74, 0x49, 0x82, 0x59, - 0x90, 0xf1, 0x25, 0xd3, 0xd9, 0x59, 0x2c, 0x7e, 0x80, 0x2b, 0x2d, 0x76, 0x37, 0xbb, 0x0b, 0xc9, - 0xd4, 0xf4, 0x41, 0x1d, 0xf7, 0x32, 0x99, 0xde, 0x2f, 0xd3, 0x26, 0xae, 0xe3, 0x36, 0xe9, 0x34, - 0x4e, 0xd3, 0x5b, 0xd2, 0x4b, 0x9a, 0xa4, 0x2f, 0x7d, 0x49, 0xeb, 0xa7, 0x4e, 0xf2, 0xd6, 0x87, - 0x3c, 0x58, 0x8c, 0x67, 0x9a, 0xb6, 0x6e, 0xeb, 0xb6, 0x7a, 0xf0, 0x8c, 0x5f, 0x32, 0xff, 0x6d, - 0x6f, 0x00, 0xb5, 0x60, 0x66, 0xec, 0x3c, 0x89, 0x7b, 0xce, 0xf9, 0xbe, 0x3d, 0xff, 0xf9, 0xcf, - 0xff, 0x9f, 0xf3, 0xff, 0x0b, 0xc1, 0x9b, 0x55, 0x38, 0xd3, 0x35, 0xcd, 0xae, 0x8e, 0xce, 0x59, - 0xb6, 0xe9, 0x9a, 0xad, 0x7e, 0xe7, 0x5c, 0x1b, 0x39, 0xaa, 0xad, 0x59, 0xae, 0x69, 0x2f, 0x10, - 0x99, 0x38, 0x49, 0x2d, 0x16, 0xb8, 0xc5, 0xdc, 0x16, 0x4c, 0x5d, 0xd5, 0x74, 0xb4, 0xe6, 0x19, - 0x36, 0x91, 0x2b, 0x5e, 0x82, 0x74, 0x47, 0xd3, 0x51, 0x39, 0x71, 0x26, 0x35, 0x5f, 0x58, 0x7c, - 0x64, 0x21, 0x02, 0x5a, 0x08, 0x23, 0x76, 0xb0, 0x58, 0x22, 0x88, 0xb9, 0xb7, 0xd3, 0x30, 0x3d, - 0x44, 0x2b, 0x8a, 0x90, 0x36, 0x94, 0x1e, 0x66, 0x4c, 0xcc, 0xe7, 0x25, 0xf2, 0xb7, 0x58, 0x86, - 0x71, 0x4b, 0x51, 0x6f, 0x28, 0x5d, 0x54, 0x4e, 0x12, 0x31, 0x7f, 0x14, 0x2b, 0x00, 0x6d, 0x64, - 0x21, 0xa3, 0x8d, 0x0c, 0xf5, 0xa0, 0x9c, 0x3a, 0x93, 0x9a, 0xcf, 0x4b, 0x01, 0x89, 0xf8, 0x24, - 0x4c, 0x59, 0xfd, 0x96, 0xae, 0xa9, 0x72, 0xc0, 0x0c, 0xce, 0xa4, 0xe6, 0x33, 0x92, 0x40, 0x15, - 0x6b, 0xbe, 0xf1, 0x63, 0x30, 0x79, 0x0b, 0x29, 0x37, 0x82, 0xa6, 0x05, 0x62, 0x5a, 0xc2, 0xe2, - 0x80, 0xe1, 0x2a, 0x14, 0x7b, 0xc8, 0x71, 0x94, 0x2e, 0x92, 0xdd, 0x03, 0x0b, 0x95, 0xd3, 0x64, - 0xf4, 0x67, 0x06, 0x46, 0x1f, 0x1d, 0x79, 0x81, 0xa1, 0x76, 0x0f, 0x2c, 0x24, 0xd6, 0x20, 0x8f, - 0x8c, 0x7e, 0x8f, 0x32, 0x64, 0x8e, 0x88, 0x5f, 0xdd, 0xe8, 0xf7, 0xa2, 0x2c, 0x39, 0x0c, 0x63, - 0x14, 0xe3, 0x0e, 0xb2, 0x6f, 0x6a, 0x2a, 0x2a, 0x67, 0x09, 0xc1, 0x63, 0x03, 0x04, 0x4d, 0xaa, - 0x8f, 0x72, 0x70, 0x9c, 0xb8, 0x0a, 0x79, 0xf4, 0xb2, 0x8b, 0x0c, 0x47, 0x33, 0x8d, 0xf2, 0x38, - 0x21, 0x79, 0x74, 0xc8, 0x2c, 0x22, 0xbd, 0x1d, 0xa5, 0xf0, 0x71, 0xe2, 0x05, 0x18, 0x37, 0x2d, - 0x57, 0x33, 0x0d, 0xa7, 0x9c, 0x3b, 0x93, 0x98, 0x2f, 0x2c, 0x7e, 0x64, 0x68, 0x22, 0x34, 0xa8, - 0x8d, 0xc4, 0x8d, 0xc5, 0x0d, 0x10, 0x1c, 0xb3, 0x6f, 0xab, 0x48, 0x56, 0xcd, 0x36, 0x92, 0x35, - 0xa3, 0x63, 0x96, 0xf3, 0x84, 0xe0, 0xf4, 0xe0, 0x40, 0x88, 0xe1, 0xaa, 0xd9, 0x46, 0x1b, 0x46, - 0xc7, 0x94, 0x4a, 0x4e, 0xe8, 0x59, 0x3c, 0x01, 0x59, 0xe7, 0xc0, 0x70, 0x95, 0x97, 0xcb, 0x45, - 0x92, 0x21, 0xec, 0x69, 0xee, 0x5b, 0x59, 0x98, 0x1c, 0x25, 0xc5, 0xae, 0x40, 0xa6, 0x83, 0x47, - 0x59, 0x4e, 0x1e, 0x27, 0x06, 0x14, 0x13, 0x0e, 0x62, 0xf6, 0xc7, 0x0c, 0x62, 0x0d, 0x0a, 0x06, - 0x72, 0x5c, 0xd4, 0xa6, 0x19, 0x91, 0x1a, 0x31, 0xa7, 0x80, 0x82, 0x06, 0x53, 0x2a, 0xfd, 0x63, - 0xa5, 0xd4, 0x0b, 0x30, 0xe9, 0xb9, 0x24, 0xdb, 0x8a, 0xd1, 0xe5, 0xb9, 0x79, 0x2e, 0xce, 0x93, - 0x85, 0x3a, 0xc7, 0x49, 0x18, 0x26, 0x95, 0x50, 0xe8, 0x59, 0x5c, 0x03, 0x30, 0x0d, 0x64, 0x76, - 0xe4, 0x36, 0x52, 0xf5, 0x72, 0xee, 0x88, 0x28, 0x35, 0xb0, 0xc9, 0x40, 0x94, 0x4c, 0x2a, 0x55, - 0x75, 0xf1, 0xb2, 0x9f, 0x6a, 0xe3, 0x47, 0x64, 0xca, 0x16, 0x5d, 0x64, 0x03, 0xd9, 0xb6, 0x07, - 0x25, 0x1b, 0xe1, 0xbc, 0x47, 0x6d, 0x36, 0xb2, 0x3c, 0x71, 0x62, 0x21, 0x76, 0x64, 0x12, 0x83, - 0xd1, 0x81, 0x4d, 0xd8, 0xc1, 0x47, 0xf1, 0x61, 0xf0, 0x04, 0x32, 0x49, 0x2b, 0x20, 0xbb, 0x50, - 0x91, 0x0b, 0xb7, 0x95, 0x1e, 0x9a, 0xbd, 0x0d, 0xa5, 0x70, 0x78, 0xc4, 0x19, 0xc8, 0x38, 0xae, - 0x62, 0xbb, 0x24, 0x0b, 0x33, 0x12, 0x7d, 0x10, 0x05, 0x48, 0x21, 0xa3, 0x4d, 0x76, 0xb9, 0x8c, - 0x84, 0xff, 0x14, 0x7f, 0xda, 0x1f, 0x70, 0x8a, 0x0c, 0xf8, 0xa3, 0x83, 0x33, 0x1a, 0x62, 0x8e, - 0x8e, 0x7b, 0xf6, 0x22, 0x4c, 0x84, 0x06, 0x30, 0xea, 0xab, 0xe7, 0x7e, 0x0e, 0x1e, 0x18, 0x4a, - 0x2d, 0xbe, 0x00, 0x33, 0x7d, 0x43, 0x33, 0x5c, 0x64, 0x5b, 0x36, 0xc2, 0x19, 0x4b, 0x5f, 0x55, - 0xfe, 0xb7, 0xf1, 0x23, 0x72, 0x6e, 0x2f, 0x68, 0x4d, 0x59, 0xa4, 0xe9, 0xfe, 0xa0, 0xf0, 0x89, - 0x7c, 0xee, 0x87, 0xe3, 0xc2, 0x9d, 0x3b, 0x77, 0xee, 0x24, 0xe7, 0x3e, 0x97, 0x85, 0x99, 0x61, - 0x6b, 0x66, 0xe8, 0xf2, 0x3d, 0x01, 0x59, 0xa3, 0xdf, 0x6b, 0x21, 0x9b, 0x04, 0x29, 0x23, 0xb1, - 0x27, 0xb1, 0x06, 0x19, 0x5d, 0x69, 0x21, 0xbd, 0x9c, 0x3e, 0x93, 0x98, 0x2f, 0x2d, 0x3e, 0x39, - 0xd2, 0xaa, 0x5c, 0xd8, 0xc4, 0x10, 0x89, 0x22, 0xc5, 0x4f, 0x40, 0x9a, 0x6d, 0xd1, 0x98, 0xe1, - 0x89, 0xd1, 0x18, 0xf0, 0x5a, 0x92, 0x08, 0x4e, 0x7c, 0x10, 0xf2, 0xf8, 0x5f, 0x9a, 0x1b, 0x59, - 0xe2, 0x73, 0x0e, 0x0b, 0x70, 0x5e, 0x88, 0xb3, 0x90, 0x23, 0xcb, 0xa4, 0x8d, 0x78, 0x69, 0xf3, - 0x9e, 0x71, 0x62, 0xb5, 0x51, 0x47, 0xe9, 0xeb, 0xae, 0x7c, 0x53, 0xd1, 0xfb, 0x88, 0x24, 0x7c, - 0x5e, 0x2a, 0x32, 0xe1, 0xa7, 0xb0, 0x4c, 0x3c, 0x0d, 0x05, 0xba, 0xaa, 0x34, 0xa3, 0x8d, 0x5e, - 0x26, 0xbb, 0x67, 0x46, 0xa2, 0x0b, 0x6d, 0x03, 0x4b, 0xf0, 0xeb, 0xaf, 0x3b, 0xa6, 0xc1, 0x53, - 0x93, 0xbc, 0x02, 0x0b, 0xc8, 0xeb, 0x2f, 0x46, 0x37, 0xee, 0x87, 0x86, 0x0f, 0x2f, 0x9a, 0x53, - 0x73, 0xdf, 0x48, 0x42, 0x9a, 0xec, 0x17, 0x93, 0x50, 0xd8, 0x7d, 0x71, 0xa7, 0x2e, 0xaf, 0x35, - 0xf6, 0x56, 0x36, 0xeb, 0x42, 0x42, 0x2c, 0x01, 0x10, 0xc1, 0xd5, 0xcd, 0x46, 0x6d, 0x57, 0x48, - 0x7a, 0xcf, 0x1b, 0xdb, 0xbb, 0x17, 0x96, 0x84, 0x94, 0x07, 0xd8, 0xa3, 0x82, 0x74, 0xd0, 0xe0, - 0xfc, 0xa2, 0x90, 0x11, 0x05, 0x28, 0x52, 0x82, 0x8d, 0x17, 0xea, 0x6b, 0x17, 0x96, 0x84, 0x6c, - 0x58, 0x72, 0x7e, 0x51, 0x18, 0x17, 0x27, 0x20, 0x4f, 0x24, 0x2b, 0x8d, 0xc6, 0xa6, 0x90, 0xf3, - 0x38, 0x9b, 0xbb, 0xd2, 0xc6, 0xf6, 0xba, 0x90, 0xf7, 0x38, 0xd7, 0xa5, 0xc6, 0xde, 0x8e, 0x00, - 0x1e, 0xc3, 0x56, 0xbd, 0xd9, 0xac, 0xad, 0xd7, 0x85, 0x82, 0x67, 0xb1, 0xf2, 0xe2, 0x6e, 0xbd, - 0x29, 0x14, 0x43, 0x6e, 0x9d, 0x5f, 0x14, 0x26, 0xbc, 0x57, 0xd4, 0xb7, 0xf7, 0xb6, 0x84, 0x92, - 0x38, 0x05, 0x13, 0xf4, 0x15, 0xdc, 0x89, 0xc9, 0x88, 0xe8, 0xc2, 0x92, 0x20, 0xf8, 0x8e, 0x50, - 0x96, 0xa9, 0x90, 0xe0, 0xc2, 0x92, 0x20, 0xce, 0xad, 0x42, 0x86, 0x64, 0x97, 0x28, 0x42, 0x69, - 0xb3, 0xb6, 0x52, 0xdf, 0x94, 0x1b, 0x3b, 0xbb, 0x1b, 0x8d, 0xed, 0xda, 0xa6, 0x90, 0xf0, 0x65, - 0x52, 0xfd, 0x93, 0x7b, 0x1b, 0x52, 0x7d, 0x4d, 0x48, 0x06, 0x65, 0x3b, 0xf5, 0xda, 0x6e, 0x7d, - 0x4d, 0x48, 0xcd, 0xa9, 0x30, 0x33, 0x6c, 0x9f, 0x1c, 0xba, 0x32, 0x02, 0x53, 0x9c, 0x3c, 0x62, - 0x8a, 0x09, 0xd7, 0xc0, 0x14, 0xff, 0x20, 0x09, 0xd3, 0x43, 0x6a, 0xc5, 0xd0, 0x97, 0x3c, 0x0b, - 0x19, 0x9a, 0xa2, 0xb4, 0x7a, 0x3e, 0x3e, 0xb4, 0xe8, 0x90, 0x84, 0x1d, 0xa8, 0xa0, 0x04, 0x17, - 0xec, 0x20, 0x52, 0x47, 0x74, 0x10, 0x98, 0x62, 0x60, 0x4f, 0xff, 0xd9, 0x81, 0x3d, 0x9d, 0x96, - 0xbd, 0x0b, 0xa3, 0x94, 0x3d, 0x22, 0x3b, 0xde, 0xde, 0x9e, 0x19, 0xb2, 0xb7, 0x5f, 0x81, 0xa9, - 0x01, 0xa2, 0x91, 0xf7, 0xd8, 0x57, 0x12, 0x50, 0x3e, 0x2a, 0x38, 0x31, 0x3b, 0x5d, 0x32, 0xb4, - 0xd3, 0x5d, 0x89, 0x46, 0xf0, 0xec, 0xd1, 0x93, 0x30, 0x30, 0xd7, 0x6f, 0x24, 0xe0, 0xc4, 0xf0, - 0x4e, 0x71, 0xa8, 0x0f, 0x9f, 0x80, 0x6c, 0x0f, 0xb9, 0xfb, 0x26, 0xef, 0x96, 0x3e, 0x3a, 0xa4, - 0x06, 0x63, 0x75, 0x74, 0xb2, 0x19, 0x2a, 0x58, 0xc4, 0x53, 0x47, 0xb5, 0x7b, 0xd4, 0x9b, 0x01, - 0x4f, 0x3f, 0x9b, 0x84, 0x07, 0x86, 0x92, 0x0f, 0x75, 0xf4, 0x21, 0x00, 0xcd, 0xb0, 0xfa, 0x2e, - 0xed, 0x88, 0xe8, 0x06, 0x9b, 0x27, 0x12, 0xb2, 0x79, 0xe1, 0xcd, 0xb3, 0xef, 0x7a, 0xfa, 0x14, - 0xd1, 0x03, 0x15, 0x11, 0x83, 0x4b, 0xbe, 0xa3, 0x69, 0xe2, 0x68, 0xe5, 0x88, 0x91, 0x0e, 0x24, - 0xe6, 0xd3, 0x20, 0xa8, 0xba, 0x86, 0x0c, 0x57, 0x76, 0x5c, 0x1b, 0x29, 0x3d, 0xcd, 0xe8, 0x92, - 0x0a, 0x92, 0xab, 0x66, 0x3a, 0x8a, 0xee, 0x20, 0x69, 0x92, 0xaa, 0x9b, 0x5c, 0x8b, 0x11, 0x24, - 0x81, 0xec, 0x00, 0x22, 0x1b, 0x42, 0x50, 0xb5, 0x87, 0x98, 0xfb, 0xd5, 0x3c, 0x14, 0x02, 0x7d, - 0xb5, 0x78, 0x16, 0x8a, 0xd7, 0x95, 0x9b, 0x8a, 0xcc, 0xcf, 0x4a, 0x34, 0x12, 0x05, 0x2c, 0xdb, - 0x61, 0xe7, 0xa5, 0xa7, 0x61, 0x86, 0x98, 0x98, 0x7d, 0x17, 0xd9, 0xb2, 0xaa, 0x2b, 0x8e, 0x43, - 0x82, 0x96, 0x23, 0xa6, 0x22, 0xd6, 0x35, 0xb0, 0x6a, 0x95, 0x6b, 0xc4, 0x65, 0x98, 0x26, 0x88, - 0x5e, 0x5f, 0x77, 0x35, 0x4b, 0x47, 0x32, 0x3e, 0xbd, 0x39, 0xa4, 0x92, 0x78, 0x9e, 0x4d, 0x61, - 0x8b, 0x2d, 0x66, 0x80, 0x3d, 0x72, 0xc4, 0x35, 0x78, 0x88, 0xc0, 0xba, 0xc8, 0x40, 0xb6, 0xe2, - 0x22, 0x19, 0x7d, 0xa6, 0xaf, 0xe8, 0x8e, 0xac, 0x18, 0x6d, 0x79, 0x5f, 0x71, 0xf6, 0xcb, 0x33, - 0x98, 0x60, 0x25, 0x59, 0x4e, 0x48, 0xa7, 0xb0, 0xe1, 0x3a, 0xb3, 0xab, 0x13, 0xb3, 0x9a, 0xd1, - 0xbe, 0xa6, 0x38, 0xfb, 0x62, 0x15, 0x4e, 0x10, 0x16, 0xc7, 0xb5, 0x35, 0xa3, 0x2b, 0xab, 0xfb, - 0x48, 0xbd, 0x21, 0xf7, 0xdd, 0xce, 0xa5, 0xf2, 0x83, 0xc1, 0xf7, 0x13, 0x0f, 0x9b, 0xc4, 0x66, - 0x15, 0x9b, 0xec, 0xb9, 0x9d, 0x4b, 0x62, 0x13, 0x8a, 0x78, 0x32, 0x7a, 0xda, 0x6d, 0x24, 0x77, - 0x4c, 0x9b, 0x94, 0xc6, 0xd2, 0x90, 0xad, 0x29, 0x10, 0xc1, 0x85, 0x06, 0x03, 0x6c, 0x99, 0x6d, - 0x54, 0xcd, 0x34, 0x77, 0xea, 0xf5, 0x35, 0xa9, 0xc0, 0x59, 0xae, 0x9a, 0x36, 0x4e, 0xa8, 0xae, - 0xe9, 0x05, 0xb8, 0x40, 0x13, 0xaa, 0x6b, 0xf2, 0xf0, 0x2e, 0xc3, 0xb4, 0xaa, 0xd2, 0x31, 0x6b, - 0xaa, 0xcc, 0xce, 0x58, 0x4e, 0x59, 0x08, 0x05, 0x4b, 0x55, 0xd7, 0xa9, 0x01, 0xcb, 0x71, 0x47, - 0xbc, 0x0c, 0x0f, 0xf8, 0xc1, 0x0a, 0x02, 0xa7, 0x06, 0x46, 0x19, 0x85, 0x2e, 0xc3, 0xb4, 0x75, - 0x30, 0x08, 0x14, 0x43, 0x6f, 0xb4, 0x0e, 0xa2, 0xb0, 0x8b, 0x30, 0x63, 0xed, 0x5b, 0x83, 0xb8, - 0x27, 0x82, 0x38, 0xd1, 0xda, 0xb7, 0xa2, 0xc0, 0x47, 0xc9, 0x81, 0xdb, 0x46, 0xaa, 0xe2, 0xa2, - 0x76, 0xf9, 0x64, 0xd0, 0x3c, 0xa0, 0x10, 0xcf, 0x81, 0xa0, 0xaa, 0x32, 0x32, 0x94, 0x96, 0x8e, - 0x64, 0xc5, 0x46, 0x86, 0xe2, 0x94, 0x4f, 0x07, 0x8d, 0x4b, 0xaa, 0x5a, 0x27, 0xda, 0x1a, 0x51, - 0x8a, 0x4f, 0xc0, 0x94, 0xd9, 0xba, 0xae, 0xd2, 0x94, 0x94, 0x2d, 0x1b, 0x75, 0xb4, 0x97, 0xcb, - 0x8f, 0x90, 0xf8, 0x4e, 0x62, 0x05, 0x49, 0xc8, 0x1d, 0x22, 0x16, 0x1f, 0x07, 0x41, 0x75, 0xf6, - 0x15, 0xdb, 0x22, 0x7b, 0xb2, 0x63, 0x29, 0x2a, 0x2a, 0x3f, 0x4a, 0x4d, 0xa9, 0x7c, 0x9b, 0x8b, - 0xf1, 0x92, 0x70, 0x6e, 0x69, 0x1d, 0x97, 0x33, 0x3e, 0x46, 0x97, 0x04, 0x91, 0x31, 0xb6, 0x79, - 0x10, 0x70, 0x28, 0x42, 0x2f, 0x9e, 0x27, 0x66, 0x25, 0x6b, 0xdf, 0x0a, 0xbe, 0xf7, 0x61, 0x98, - 0xc0, 0x96, 0xfe, 0x4b, 0x1f, 0xa7, 0x0d, 0x99, 0xb5, 0x1f, 0x78, 0xe3, 0x12, 0x9c, 0xc0, 0x46, - 0x3d, 0xe4, 0x2a, 0x6d, 0xc5, 0x55, 0x02, 0xd6, 0x1f, 0x23, 0xd6, 0x38, 0xee, 0x5b, 0x4c, 0x19, - 0xf2, 0xd3, 0xee, 0xb7, 0x0e, 0xbc, 0xcc, 0x7a, 0x8a, 0xfa, 0x89, 0x65, 0x3c, 0xb7, 0x3e, 0xb0, - 0xa6, 0x7b, 0xae, 0x0a, 0xc5, 0x60, 0xe2, 0x8b, 0x79, 0xa0, 0xa9, 0x2f, 0x24, 0x70, 0x17, 0xb4, - 0xda, 0x58, 0xc3, 0xfd, 0xcb, 0x4b, 0x75, 0x21, 0x89, 0xfb, 0xa8, 0xcd, 0x8d, 0xdd, 0xba, 0x2c, - 0xed, 0x6d, 0xef, 0x6e, 0x6c, 0xd5, 0x85, 0x54, 0xb0, 0x61, 0xff, 0x4e, 0x12, 0x4a, 0xe1, 0xb3, - 0x97, 0xf8, 0x53, 0x70, 0x92, 0x5f, 0x94, 0x38, 0xc8, 0x95, 0x6f, 0x69, 0x36, 0x59, 0x8b, 0x3d, - 0x85, 0xd6, 0x45, 0x2f, 0x1b, 0x66, 0x98, 0x55, 0x13, 0xb9, 0xcf, 0x6b, 0x36, 0x5e, 0x69, 0x3d, - 0xc5, 0x15, 0x37, 0xe1, 0xb4, 0x61, 0xca, 0x8e, 0xab, 0x18, 0x6d, 0xc5, 0x6e, 0xcb, 0xfe, 0x15, - 0x95, 0xac, 0xa8, 0x2a, 0x72, 0x1c, 0x93, 0xd6, 0x40, 0x8f, 0xe5, 0x23, 0x86, 0xd9, 0x64, 0xc6, - 0x7e, 0x71, 0xa8, 0x31, 0xd3, 0x48, 0xe6, 0xa6, 0x8e, 0xca, 0xdc, 0x07, 0x21, 0xdf, 0x53, 0x2c, - 0x19, 0x19, 0xae, 0x7d, 0x40, 0x3a, 0xee, 0x9c, 0x94, 0xeb, 0x29, 0x56, 0x1d, 0x3f, 0x7f, 0x38, - 0x07, 0x9f, 0xef, 0xa7, 0xa0, 0x18, 0xec, 0xba, 0xf1, 0x21, 0x46, 0x25, 0x05, 0x2a, 0x41, 0xb6, - 0xb0, 0x87, 0xef, 0xdb, 0xa3, 0x2f, 0xac, 0xe2, 0xca, 0x55, 0xcd, 0xd2, 0x5e, 0x58, 0xa2, 0x48, - 0xdc, 0x35, 0xe0, 0xd4, 0x42, 0xb4, 0xf7, 0xc8, 0x49, 0xec, 0x49, 0x5c, 0x87, 0xec, 0x75, 0x87, - 0x70, 0x67, 0x09, 0xf7, 0x23, 0xf7, 0xe7, 0x7e, 0xae, 0x49, 0xc8, 0xf3, 0xcf, 0x35, 0xe5, 0xed, - 0x86, 0xb4, 0x55, 0xdb, 0x94, 0x18, 0x5c, 0x3c, 0x05, 0x69, 0x5d, 0xb9, 0x7d, 0x10, 0xae, 0x71, - 0x44, 0x34, 0x6a, 0xe0, 0x4f, 0x41, 0xfa, 0x16, 0x52, 0x6e, 0x84, 0x2b, 0x0b, 0x11, 0x7d, 0x80, - 0xa9, 0x7f, 0x0e, 0x32, 0x24, 0x5e, 0x22, 0x00, 0x8b, 0x98, 0x30, 0x26, 0xe6, 0x20, 0xbd, 0xda, - 0x90, 0x70, 0xfa, 0x0b, 0x50, 0xa4, 0x52, 0x79, 0x67, 0xa3, 0xbe, 0x5a, 0x17, 0x92, 0x73, 0xcb, - 0x90, 0xa5, 0x41, 0xc0, 0x4b, 0xc3, 0x0b, 0x83, 0x30, 0xc6, 0x1e, 0x19, 0x47, 0x82, 0x6b, 0xf7, - 0xb6, 0x56, 0xea, 0x92, 0x90, 0x0c, 0x4e, 0xaf, 0x03, 0xc5, 0x60, 0xc3, 0xfd, 0xe1, 0xe4, 0xd4, - 0xb7, 0x13, 0x50, 0x08, 0x34, 0xd0, 0xb8, 0xf3, 0x51, 0x74, 0xdd, 0xbc, 0x25, 0x2b, 0xba, 0xa6, - 0x38, 0x2c, 0x29, 0x80, 0x88, 0x6a, 0x58, 0x32, 0xea, 0xa4, 0x7d, 0x28, 0xce, 0xbf, 0x9e, 0x00, - 0x21, 0xda, 0xbb, 0x46, 0x1c, 0x4c, 0xfc, 0x44, 0x1d, 0x7c, 0x2d, 0x01, 0xa5, 0x70, 0xc3, 0x1a, - 0x71, 0xef, 0xec, 0x4f, 0xd4, 0xbd, 0xb7, 0x92, 0x30, 0x11, 0x6a, 0x53, 0x47, 0xf5, 0xee, 0x33, - 0x30, 0xa5, 0xb5, 0x51, 0xcf, 0x32, 0x5d, 0x64, 0xa8, 0x07, 0xb2, 0x8e, 0x6e, 0x22, 0xbd, 0x3c, - 0x47, 0x36, 0x8a, 0x73, 0xf7, 0x6f, 0x84, 0x17, 0x36, 0x7c, 0xdc, 0x26, 0x86, 0x55, 0xa7, 0x37, - 0xd6, 0xea, 0x5b, 0x3b, 0x8d, 0xdd, 0xfa, 0xf6, 0xea, 0x8b, 0xf2, 0xde, 0xf6, 0xcf, 0x6c, 0x37, - 0x9e, 0xdf, 0x96, 0x04, 0x2d, 0x62, 0xf6, 0x01, 0x2e, 0xf5, 0x1d, 0x10, 0xa2, 0x4e, 0x89, 0x27, - 0x61, 0x98, 0x5b, 0xc2, 0x98, 0x38, 0x0d, 0x93, 0xdb, 0x0d, 0xb9, 0xb9, 0xb1, 0x56, 0x97, 0xeb, - 0x57, 0xaf, 0xd6, 0x57, 0x77, 0x9b, 0xf4, 0x6a, 0xc3, 0xb3, 0xde, 0x0d, 0x2f, 0xea, 0x57, 0x53, - 0x30, 0x3d, 0xc4, 0x13, 0xb1, 0xc6, 0x0e, 0x25, 0xf4, 0x9c, 0xf4, 0xd4, 0x28, 0xde, 0x2f, 0xe0, - 0xae, 0x60, 0x47, 0xb1, 0x5d, 0x76, 0x86, 0x79, 0x1c, 0x70, 0x94, 0x0c, 0x57, 0xeb, 0x68, 0xc8, - 0x66, 0x37, 0x41, 0xf4, 0xa4, 0x32, 0xe9, 0xcb, 0xe9, 0x65, 0xd0, 0xc7, 0x40, 0xb4, 0x4c, 0x47, - 0x73, 0xb5, 0x9b, 0x48, 0xd6, 0x0c, 0x7e, 0x6d, 0x84, 0x4f, 0x2e, 0x69, 0x49, 0xe0, 0x9a, 0x0d, - 0xc3, 0xf5, 0xac, 0x0d, 0xd4, 0x55, 0x22, 0xd6, 0x78, 0x03, 0x4f, 0x49, 0x02, 0xd7, 0x78, 0xd6, - 0x67, 0xa1, 0xd8, 0x36, 0xfb, 0xb8, 0x9d, 0xa3, 0x76, 0xb8, 0x5e, 0x24, 0xa4, 0x02, 0x95, 0x79, - 0x26, 0xac, 0x51, 0xf7, 0xef, 0xab, 0x8a, 0x52, 0x81, 0xca, 0xa8, 0xc9, 0x63, 0x30, 0xa9, 0x74, - 0xbb, 0x36, 0x26, 0xe7, 0x44, 0xf4, 0xe8, 0x51, 0xf2, 0xc4, 0xc4, 0x70, 0xf6, 0x39, 0xc8, 0xf1, - 0x38, 0xe0, 0x92, 0x8c, 0x23, 0x21, 0x5b, 0xf4, 0x3c, 0x9d, 0x9c, 0xcf, 0x4b, 0x39, 0x83, 0x2b, - 0xcf, 0x42, 0x51, 0x73, 0x64, 0xff, 0xfa, 0x3d, 0x79, 0x26, 0x39, 0x9f, 0x93, 0x0a, 0x9a, 0xe3, - 0x5d, 0x5d, 0xce, 0xbd, 0x91, 0x84, 0x52, 0xf8, 0xf3, 0x81, 0xb8, 0x06, 0x39, 0xdd, 0x54, 0x15, - 0x92, 0x5a, 0xf4, 0xdb, 0xd5, 0x7c, 0xcc, 0x17, 0x87, 0x85, 0x4d, 0x66, 0x2f, 0x79, 0xc8, 0xd9, - 0x7f, 0x49, 0x40, 0x8e, 0x8b, 0xc5, 0x13, 0x90, 0xb6, 0x14, 0x77, 0x9f, 0xd0, 0x65, 0x56, 0x92, - 0x42, 0x42, 0x22, 0xcf, 0x58, 0xee, 0x58, 0x8a, 0x41, 0x52, 0x80, 0xc9, 0xf1, 0x33, 0x9e, 0x57, - 0x1d, 0x29, 0x6d, 0x72, 0xae, 0x31, 0x7b, 0x3d, 0x64, 0xb8, 0x0e, 0x9f, 0x57, 0x26, 0x5f, 0x65, - 0x62, 0xf1, 0x49, 0x98, 0x72, 0x6d, 0x45, 0xd3, 0x43, 0xb6, 0x69, 0x62, 0x2b, 0x70, 0x85, 0x67, - 0x5c, 0x85, 0x53, 0x9c, 0xb7, 0x8d, 0x5c, 0x45, 0xdd, 0x47, 0x6d, 0x1f, 0x94, 0x25, 0xf7, 0x17, - 0x27, 0x99, 0xc1, 0x1a, 0xd3, 0x73, 0xec, 0xdc, 0xf7, 0x12, 0x30, 0xc5, 0x4f, 0x62, 0x6d, 0x2f, - 0x58, 0x5b, 0x00, 0x8a, 0x61, 0x98, 0x6e, 0x30, 0x5c, 0x83, 0xa9, 0x3c, 0x80, 0x5b, 0xa8, 0x79, - 0x20, 0x29, 0x40, 0x30, 0xdb, 0x03, 0xf0, 0x35, 0x47, 0x86, 0xed, 0x34, 0x14, 0xd8, 0xb7, 0x21, - 0xf2, 0x81, 0x91, 0x9e, 0xdd, 0x81, 0x8a, 0xf0, 0x91, 0x4d, 0x9c, 0x81, 0x4c, 0x0b, 0x75, 0x35, - 0x83, 0xdd, 0xf8, 0xd2, 0x07, 0x7e, 0xc3, 0x92, 0xf6, 0x6e, 0x58, 0x56, 0x3e, 0x0d, 0xd3, 0xaa, - 0xd9, 0x8b, 0xba, 0xbb, 0x22, 0x44, 0xee, 0x0f, 0x9c, 0x6b, 0x89, 0x97, 0xc0, 0x6f, 0x31, 0xdf, - 0x4b, 0x24, 0xbe, 0x94, 0x4c, 0xad, 0xef, 0xac, 0x7c, 0x35, 0x39, 0xbb, 0x4e, 0xa1, 0x3b, 0x7c, - 0xa4, 0x12, 0xea, 0xe8, 0x48, 0xc5, 0xde, 0xc3, 0x97, 0x9f, 0x84, 0xa7, 0xba, 0x9a, 0xbb, 0xdf, - 0x6f, 0x2d, 0xa8, 0x66, 0xef, 0x5c, 0xd7, 0xec, 0x9a, 0xfe, 0x37, 0x55, 0xfc, 0x44, 0x1e, 0xc8, - 0x5f, 0xec, 0xbb, 0x6a, 0xde, 0x93, 0xce, 0xc6, 0x7e, 0x84, 0xad, 0x6e, 0xc3, 0x34, 0x33, 0x96, - 0xc9, 0x87, 0x1d, 0x7a, 0x3c, 0x11, 0xef, 0x7b, 0x39, 0x56, 0xfe, 0xfa, 0xdb, 0xa4, 0x5c, 0x4b, - 0x53, 0x0c, 0x8a, 0x75, 0xf4, 0x04, 0x53, 0x95, 0xe0, 0x81, 0x10, 0x1f, 0x5d, 0x9a, 0xc8, 0x8e, - 0x61, 0xfc, 0x0e, 0x63, 0x9c, 0x0e, 0x30, 0x36, 0x19, 0xb4, 0xba, 0x0a, 0x13, 0xc7, 0xe1, 0xfa, - 0x27, 0xc6, 0x55, 0x44, 0x41, 0x92, 0x75, 0x98, 0x24, 0x24, 0x6a, 0xdf, 0x71, 0xcd, 0x1e, 0xd9, - 0xf7, 0xee, 0x4f, 0xf3, 0xcf, 0x6f, 0xd3, 0xb5, 0x52, 0xc2, 0xb0, 0x55, 0x0f, 0x55, 0xad, 0x02, - 0xf9, 0x96, 0xd5, 0x46, 0xaa, 0x1e, 0xc3, 0xf0, 0x26, 0x73, 0xc4, 0xb3, 0xaf, 0x7e, 0x0a, 0x66, - 0xf0, 0xdf, 0x64, 0x5b, 0x0a, 0x7a, 0x12, 0x7f, 0x93, 0x56, 0xfe, 0xde, 0x2b, 0x74, 0x39, 0x4e, - 0x7b, 0x04, 0x01, 0x9f, 0x02, 0xb3, 0xd8, 0x45, 0xae, 0x8b, 0x6c, 0x47, 0x56, 0xf4, 0x61, 0xee, - 0x05, 0xae, 0x22, 0xca, 0x9f, 0x7f, 0x27, 0x3c, 0x8b, 0xeb, 0x14, 0x59, 0xd3, 0xf5, 0xea, 0x1e, - 0x9c, 0x1c, 0x92, 0x15, 0x23, 0x70, 0xbe, 0xca, 0x38, 0x67, 0x06, 0x32, 0x03, 0xd3, 0xee, 0x00, - 0x97, 0x7b, 0x73, 0x39, 0x02, 0xe7, 0x1f, 0x30, 0x4e, 0x91, 0x61, 0xf9, 0x94, 0x62, 0xc6, 0xe7, - 0x60, 0xea, 0x26, 0xb2, 0x5b, 0xa6, 0xc3, 0xae, 0x7f, 0x46, 0xa0, 0x7b, 0x8d, 0xd1, 0x4d, 0x32, - 0x20, 0xb9, 0x0f, 0xc2, 0x5c, 0x97, 0x21, 0xd7, 0x51, 0x54, 0x34, 0x02, 0xc5, 0x17, 0x18, 0xc5, - 0x38, 0xb6, 0xc7, 0xd0, 0x1a, 0x14, 0xbb, 0x26, 0xab, 0x4c, 0xf1, 0xf0, 0xd7, 0x19, 0xbc, 0xc0, - 0x31, 0x8c, 0xc2, 0x32, 0xad, 0xbe, 0x8e, 0xcb, 0x56, 0x3c, 0xc5, 0x1f, 0x72, 0x0a, 0x8e, 0x61, - 0x14, 0xc7, 0x08, 0xeb, 0x1f, 0x71, 0x0a, 0x27, 0x10, 0xcf, 0x67, 0xa1, 0x60, 0x1a, 0xfa, 0x81, - 0x69, 0x8c, 0xe2, 0xc4, 0x17, 0x19, 0x03, 0x30, 0x08, 0x26, 0xb8, 0x02, 0xf9, 0x51, 0x27, 0xe2, - 0x4f, 0xde, 0xe1, 0xcb, 0x83, 0xcf, 0xc0, 0x3a, 0x4c, 0xf2, 0x0d, 0x4a, 0x33, 0x8d, 0x11, 0x28, - 0xbe, 0xcc, 0x28, 0x4a, 0x01, 0x18, 0x1b, 0x86, 0x8b, 0x1c, 0xb7, 0x8b, 0x46, 0x21, 0x79, 0x83, - 0x0f, 0x83, 0x41, 0x58, 0x28, 0x5b, 0xc8, 0x50, 0xf7, 0x47, 0x63, 0xf8, 0x0a, 0x0f, 0x25, 0xc7, - 0x60, 0x8a, 0x55, 0x98, 0xe8, 0x29, 0xb6, 0xb3, 0xaf, 0xe8, 0x23, 0x4d, 0xc7, 0x9f, 0x32, 0x8e, - 0xa2, 0x07, 0x62, 0x11, 0xe9, 0x1b, 0xc7, 0xa1, 0xf9, 0x2a, 0x8f, 0x48, 0x00, 0xc6, 0x96, 0x9e, - 0xe3, 0x92, 0xbb, 0xb2, 0xe3, 0xb0, 0xfd, 0x19, 0x5f, 0x7a, 0x14, 0xbb, 0x15, 0x64, 0xbc, 0x02, - 0x79, 0x47, 0xbb, 0x3d, 0x12, 0xcd, 0x9f, 0xf3, 0x99, 0x26, 0x00, 0x0c, 0x7e, 0x11, 0x4e, 0x0d, - 0x2d, 0x13, 0x23, 0x90, 0xfd, 0x05, 0x23, 0x3b, 0x31, 0xa4, 0x54, 0xb0, 0x2d, 0xe1, 0xb8, 0x94, - 0x7f, 0xc9, 0xb7, 0x04, 0x14, 0xe1, 0xda, 0xc1, 0x67, 0x05, 0x47, 0xe9, 0x1c, 0x2f, 0x6a, 0x7f, - 0xc5, 0xa3, 0x46, 0xb1, 0xa1, 0xa8, 0xed, 0xc2, 0x09, 0xc6, 0x78, 0xbc, 0x79, 0xfd, 0x1a, 0xdf, - 0x58, 0x29, 0x7a, 0x2f, 0x3c, 0xbb, 0x9f, 0x86, 0x59, 0x2f, 0x9c, 0xbc, 0x29, 0x75, 0xe4, 0x9e, - 0x62, 0x8d, 0xc0, 0xfc, 0x75, 0xc6, 0xcc, 0x77, 0x7c, 0xaf, 0xab, 0x75, 0xb6, 0x14, 0x0b, 0x93, - 0xbf, 0x00, 0x65, 0x4e, 0xde, 0x37, 0x6c, 0xa4, 0x9a, 0x5d, 0x43, 0xbb, 0x8d, 0xda, 0x23, 0x50, - 0xff, 0x75, 0x64, 0xaa, 0xf6, 0x02, 0x70, 0xcc, 0xbc, 0x01, 0x82, 0xd7, 0xab, 0xc8, 0x5a, 0xcf, - 0x32, 0x6d, 0x37, 0x86, 0xf1, 0x6f, 0xf8, 0x4c, 0x79, 0xb8, 0x0d, 0x02, 0xab, 0xd6, 0xa1, 0x44, - 0x1e, 0x47, 0x4d, 0xc9, 0xbf, 0x65, 0x44, 0x13, 0x3e, 0x8a, 0x6d, 0x1c, 0xaa, 0xd9, 0xb3, 0x14, - 0x7b, 0x94, 0xfd, 0xef, 0xef, 0xf8, 0xc6, 0xc1, 0x20, 0x6c, 0xe3, 0x70, 0x0f, 0x2c, 0x84, 0xab, - 0xfd, 0x08, 0x0c, 0xdf, 0xe0, 0x1b, 0x07, 0xc7, 0x30, 0x0a, 0xde, 0x30, 0x8c, 0x40, 0xf1, 0xf7, - 0x9c, 0x82, 0x63, 0x30, 0xc5, 0x27, 0xfd, 0x42, 0x6b, 0xa3, 0xae, 0xe6, 0xb8, 0x36, 0x6d, 0x85, - 0xef, 0x4f, 0xf5, 0xcd, 0x77, 0xc2, 0x4d, 0x98, 0x14, 0x80, 0xe2, 0x9d, 0x88, 0x5d, 0xa1, 0x92, - 0x93, 0x52, 0xbc, 0x63, 0xdf, 0xe2, 0x3b, 0x51, 0x00, 0x86, 0x7d, 0x0b, 0x74, 0x88, 0x38, 0xec, - 0x2a, 0x3e, 0x1f, 0x8c, 0x40, 0xf7, 0xed, 0x88, 0x73, 0x4d, 0x8e, 0xc5, 0x9c, 0x81, 0xfe, 0xa7, - 0x6f, 0xdc, 0x40, 0x07, 0x23, 0x65, 0xe7, 0x3f, 0x44, 0xfa, 0x9f, 0x3d, 0x8a, 0xa4, 0x7b, 0xc8, - 0x64, 0xa4, 0x9f, 0x12, 0xe3, 0x7e, 0x05, 0x54, 0xfe, 0xf9, 0x7b, 0x6c, 0xbc, 0xe1, 0x76, 0xaa, - 0xba, 0x89, 0x93, 0x3c, 0xdc, 0xf4, 0xc4, 0x93, 0xbd, 0x72, 0xcf, 0xcb, 0xf3, 0x50, 0xcf, 0x53, - 0xbd, 0x0a, 0x13, 0xa1, 0x86, 0x27, 0x9e, 0xea, 0x17, 0x18, 0x55, 0x31, 0xd8, 0xef, 0x54, 0x97, - 0x21, 0x8d, 0x9b, 0x97, 0x78, 0xf8, 0x2f, 0x32, 0x38, 0x31, 0xaf, 0x7e, 0x1c, 0x72, 0xbc, 0x69, - 0x89, 0x87, 0xfe, 0x12, 0x83, 0x7a, 0x10, 0x0c, 0xe7, 0x0d, 0x4b, 0x3c, 0xfc, 0x97, 0x39, 0x9c, - 0x43, 0x30, 0x7c, 0xf4, 0x10, 0xfe, 0xe3, 0xaf, 0xa4, 0x59, 0xd1, 0xe1, 0xb1, 0xbb, 0x02, 0xe3, - 0xac, 0x53, 0x89, 0x47, 0x7f, 0x96, 0xbd, 0x9c, 0x23, 0xaa, 0x17, 0x21, 0x33, 0x62, 0xc0, 0x7f, - 0x8d, 0x41, 0xa9, 0x7d, 0x75, 0x15, 0x0a, 0x81, 0xee, 0x24, 0x1e, 0xfe, 0xeb, 0x0c, 0x1e, 0x44, - 0x61, 0xd7, 0x59, 0x77, 0x12, 0x4f, 0xf0, 0x1b, 0xdc, 0x75, 0x86, 0xc0, 0x61, 0xe3, 0x8d, 0x49, - 0x3c, 0xfa, 0x37, 0x79, 0xd4, 0x39, 0xa4, 0xfa, 0x2c, 0xe4, 0xbd, 0x62, 0x13, 0x8f, 0xff, 0x2d, - 0x86, 0xf7, 0x31, 0x38, 0x02, 0x81, 0x62, 0x17, 0x4f, 0xf1, 0xdb, 0x3c, 0x02, 0x01, 0x14, 0x5e, - 0x46, 0xd1, 0x06, 0x26, 0x9e, 0xe9, 0x77, 0xf8, 0x32, 0x8a, 0xf4, 0x2f, 0x78, 0x36, 0xc9, 0x9e, - 0x1f, 0x4f, 0xf1, 0xbb, 0x7c, 0x36, 0x89, 0x3d, 0x76, 0x23, 0xda, 0x11, 0xc4, 0x73, 0xfc, 0x3e, - 0x77, 0x23, 0xd2, 0x10, 0x54, 0x77, 0x40, 0x1c, 0xec, 0x06, 0xe2, 0xf9, 0x3e, 0xc7, 0xf8, 0xa6, - 0x06, 0x9a, 0x81, 0xea, 0xf3, 0x70, 0x62, 0x78, 0x27, 0x10, 0xcf, 0xfa, 0xf9, 0x7b, 0x91, 0xb3, - 0x5b, 0xb0, 0x11, 0xa8, 0xee, 0xfa, 0x25, 0x25, 0xd8, 0x05, 0xc4, 0xd3, 0xbe, 0x7a, 0x2f, 0xbc, - 0x71, 0x07, 0x9b, 0x80, 0x6a, 0x0d, 0xc0, 0x2f, 0xc0, 0xf1, 0x5c, 0xaf, 0x31, 0xae, 0x00, 0x08, - 0x2f, 0x0d, 0x56, 0x7f, 0xe3, 0xf1, 0x5f, 0xe0, 0x4b, 0x83, 0x21, 0xf0, 0xd2, 0xe0, 0xa5, 0x37, - 0x1e, 0xfd, 0x3a, 0x5f, 0x1a, 0x1c, 0x82, 0x33, 0x3b, 0x50, 0xdd, 0xe2, 0x19, 0xbe, 0xc8, 0x33, - 0x3b, 0x80, 0xaa, 0x6e, 0xc3, 0xd4, 0x40, 0x41, 0x8c, 0xa7, 0xfa, 0x12, 0xa3, 0x12, 0xa2, 0xf5, - 0x30, 0x58, 0xbc, 0x58, 0x31, 0x8c, 0x67, 0xfb, 0xe3, 0x48, 0xf1, 0x62, 0xb5, 0xb0, 0x7a, 0x05, - 0x72, 0x46, 0x5f, 0xd7, 0xf1, 0xe2, 0x11, 0xef, 0xff, 0xcb, 0xbd, 0xf2, 0xbf, 0xbf, 0xcf, 0xa2, - 0xc3, 0x01, 0xd5, 0x65, 0xc8, 0xa0, 0x5e, 0x0b, 0xb5, 0xe3, 0x90, 0xff, 0xf1, 0x3e, 0xdf, 0x30, - 0xb1, 0x75, 0xf5, 0x59, 0x00, 0x7a, 0x35, 0x42, 0x3e, 0xfb, 0xc5, 0x60, 0xff, 0xf3, 0x7d, 0xf6, - 0x9b, 0x1a, 0x1f, 0xe2, 0x13, 0xd0, 0x5f, 0xe8, 0xdc, 0x9f, 0xe0, 0x9d, 0x30, 0x01, 0x99, 0x91, - 0xcb, 0x30, 0x7e, 0xdd, 0x31, 0x0d, 0x57, 0xe9, 0xc6, 0xa1, 0xff, 0x8b, 0xa1, 0xb9, 0x3d, 0x0e, - 0x58, 0xcf, 0xb4, 0x91, 0xab, 0x74, 0x9d, 0x38, 0xec, 0x7f, 0x33, 0xac, 0x07, 0xc0, 0x60, 0x55, - 0x71, 0xdc, 0x51, 0xc6, 0xfd, 0x3f, 0x1c, 0xcc, 0x01, 0xd8, 0x69, 0xfc, 0xf7, 0x0d, 0x74, 0x10, - 0x87, 0x7d, 0x97, 0x3b, 0xcd, 0xec, 0xab, 0x1f, 0x87, 0x3c, 0xfe, 0x93, 0xfe, 0x50, 0x2e, 0x06, - 0xfc, 0xbf, 0x0c, 0xec, 0x23, 0xf0, 0x9b, 0x1d, 0xb7, 0xed, 0x6a, 0xf1, 0xc1, 0xfe, 0x3f, 0x36, - 0xd3, 0xdc, 0xbe, 0x5a, 0x83, 0x82, 0xe3, 0xb6, 0xdb, 0x7d, 0xd6, 0x9f, 0xc6, 0xc0, 0xff, 0xff, - 0x7d, 0xef, 0xca, 0xc2, 0xc3, 0xe0, 0xd9, 0xbe, 0x75, 0xc3, 0xb5, 0x4c, 0xf2, 0x99, 0x23, 0x8e, - 0xe1, 0x1e, 0x63, 0x08, 0x40, 0x56, 0xea, 0xc3, 0xaf, 0x6f, 0x61, 0xdd, 0x5c, 0x37, 0xe9, 0xc5, - 0xed, 0x4b, 0x73, 0xf1, 0x37, 0xb0, 0xf0, 0x7b, 0x19, 0x28, 0xab, 0x66, 0xaf, 0x65, 0x3a, 0xe7, - 0x0c, 0xa4, 0xb9, 0xfb, 0xc8, 0x3e, 0x67, 0x1a, 0x8c, 0x4f, 0x4c, 0x99, 0x06, 0x9a, 0x3d, 0xde, - 0x3d, 0xee, 0xdc, 0x29, 0xc8, 0x34, 0xfb, 0xad, 0xd6, 0x81, 0x28, 0x40, 0xca, 0xe9, 0xb7, 0xd8, - 0x8f, 0xad, 0xf0, 0x9f, 0x73, 0xdf, 0x4f, 0x41, 0xa1, 0xa9, 0xf4, 0x2c, 0x1d, 0x35, 0x0c, 0xd4, - 0xe8, 0x88, 0x65, 0xc8, 0x92, 0x61, 0x3e, 0x43, 0x8c, 0x12, 0xd7, 0xc6, 0x24, 0xf6, 0xec, 0x69, - 0x16, 0xc9, 0xfd, 0x76, 0xd2, 0xd3, 0x2c, 0x7a, 0x9a, 0xf3, 0xf4, 0x7a, 0xdb, 0xd3, 0x9c, 0xf7, - 0x34, 0x4b, 0xe4, 0x92, 0x3b, 0xe5, 0x69, 0x96, 0x3c, 0xcd, 0x32, 0xf9, 0x88, 0x33, 0xe1, 0x69, - 0x96, 0x3d, 0xcd, 0x05, 0xf2, 0xd9, 0x26, 0xed, 0x69, 0x2e, 0x78, 0x9a, 0x8b, 0xe4, 0x6b, 0xcd, - 0x94, 0xa7, 0xb9, 0xe8, 0x69, 0x2e, 0x91, 0x2f, 0x34, 0xa2, 0xa7, 0xb9, 0xe4, 0x69, 0x2e, 0x93, - 0xdf, 0x54, 0x8d, 0x7b, 0x9a, 0xcb, 0xe2, 0x2c, 0x8c, 0xd3, 0x91, 0x3d, 0x4d, 0x3e, 0xe3, 0x4f, - 0x5e, 0x1b, 0x93, 0xb8, 0xc0, 0xd7, 0x3d, 0x43, 0x7e, 0x37, 0x95, 0xf5, 0x75, 0xcf, 0xf8, 0xba, - 0x45, 0xf2, 0xdf, 0x37, 0x04, 0x5f, 0xb7, 0xe8, 0xeb, 0xce, 0x97, 0x27, 0x70, 0x76, 0xf8, 0xba, - 0xf3, 0xbe, 0x6e, 0xa9, 0x5c, 0xc2, 0xf1, 0xf7, 0x75, 0x4b, 0xbe, 0x6e, 0xb9, 0x3c, 0x79, 0x26, - 0x31, 0x5f, 0xf4, 0x75, 0xcb, 0xe2, 0x53, 0x50, 0x70, 0xfa, 0x2d, 0x99, 0xed, 0xf3, 0xe4, 0xf7, - 0x59, 0x85, 0x45, 0x58, 0xc0, 0x19, 0x41, 0x26, 0xf5, 0xda, 0x98, 0x04, 0x4e, 0xbf, 0xc5, 0xb6, - 0xe1, 0x95, 0x22, 0x90, 0xdb, 0x27, 0x99, 0xfc, 0xac, 0x7a, 0x65, 0xed, 0xcd, 0xbb, 0x95, 0xb1, - 0xef, 0xde, 0xad, 0x8c, 0xfd, 0xeb, 0xdd, 0xca, 0xd8, 0x5b, 0x77, 0x2b, 0x89, 0x77, 0xef, 0x56, - 0x12, 0xef, 0xdd, 0xad, 0x24, 0xee, 0x1c, 0x56, 0x12, 0x5f, 0x39, 0xac, 0x24, 0xbe, 0x76, 0x58, - 0x49, 0x7c, 0xf3, 0xb0, 0x92, 0x78, 0xf3, 0xb0, 0x32, 0xf6, 0xdd, 0xc3, 0xca, 0xd8, 0x5b, 0x87, - 0x95, 0xc4, 0x0f, 0x0f, 0x2b, 0x63, 0xef, 0x1e, 0x56, 0x12, 0xef, 0x1d, 0x56, 0xc6, 0xee, 0xfc, - 0xa0, 0x32, 0xd6, 0xca, 0x92, 0x34, 0x3a, 0xff, 0xa3, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb0, 0xc1, - 0x3e, 0xd9, 0x8d, 0x35, 0x00, 0x00, + // 4123 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0xe3, 0xe6, + 0x75, 0x16, 0xaf, 0x22, 0x0f, 0x29, 0x0a, 0x82, 0x64, 0x2d, 0x57, 0x8e, 0xb9, 0x5a, 0xd9, 0x8e, + 0x65, 0x3b, 0x96, 0x6c, 0xad, 0xb4, 0x17, 0x6e, 0x13, 0x97, 0x92, 0xb8, 0x5a, 0xb9, 0x92, 0xa8, + 0x80, 0x52, 0x7c, 0xc9, 0x74, 0x30, 0x20, 0xf8, 0x93, 0xc2, 0x2e, 0x08, 0x20, 0x00, 0xb8, 0x6b, + 0xed, 0xf4, 0x61, 0x3b, 0xee, 0x65, 0x32, 0xbd, 0x5f, 0x66, 0x9a, 0xb8, 0x8e, 0xdb, 0xa4, 0xd3, + 0xd8, 0x4d, 0x6f, 0x49, 0x2f, 0x69, 0x92, 0xbe, 0xf4, 0x25, 0xad, 0x9f, 0x3a, 0xc9, 0x5b, 0x1f, + 0xf2, 0xe0, 0x95, 0x3d, 0xd3, 0xb4, 0x75, 0x5b, 0xb7, 0xdd, 0x07, 0xcf, 0xec, 0x4b, 0xe7, 0xbf, + 0x01, 0x20, 0x48, 0x2d, 0xa8, 0xcc, 0xd8, 0x7e, 0x5a, 0xe1, 0x9c, 0xf3, 0x7d, 0x38, 0xff, 0xf9, + 0xcf, 0xff, 0x9f, 0xf3, 0xff, 0xe0, 0xc2, 0x5b, 0x65, 0x98, 0x6d, 0x9b, 0x66, 0x5b, 0x47, 0x8b, + 0x96, 0x6d, 0xba, 0x66, 0xa3, 0xdb, 0x5a, 0x6c, 0x22, 0x47, 0xb5, 0x35, 0xcb, 0x35, 0xed, 0x05, + 0x22, 0x13, 0xc7, 0xa9, 0xc5, 0x02, 0xb7, 0x98, 0xdb, 0x86, 0x89, 0x2b, 0x9a, 0x8e, 0xd6, 0x3d, + 0xc3, 0x3a, 0x72, 0xc5, 0x8b, 0x90, 0x6c, 0x69, 0x3a, 0x2a, 0xc6, 0x66, 0x13, 0xf3, 0xb9, 0xa5, + 0x47, 0x16, 0x42, 0xa0, 0x85, 0x5e, 0xc4, 0x2e, 0x16, 0x4b, 0x04, 0x31, 0xf7, 0x6e, 0x12, 0x26, + 0x07, 0x68, 0x45, 0x11, 0x92, 0x86, 0xd2, 0xc1, 0x8c, 0xb1, 0xf9, 0xac, 0x44, 0xfe, 0x16, 0x8b, + 0x30, 0x6a, 0x29, 0xea, 0x75, 0xa5, 0x8d, 0x8a, 0x71, 0x22, 0xe6, 0x8f, 0x62, 0x09, 0xa0, 0x89, + 0x2c, 0x64, 0x34, 0x91, 0xa1, 0x1e, 0x16, 0x13, 0xb3, 0x89, 0xf9, 0xac, 0x14, 0x90, 0x88, 0x4f, + 0xc2, 0x84, 0xd5, 0x6d, 0xe8, 0x9a, 0x2a, 0x07, 0xcc, 0x60, 0x36, 0x31, 0x9f, 0x92, 0x04, 0xaa, + 0x58, 0xf7, 0x8d, 0x1f, 0x83, 0xf1, 0x9b, 0x48, 0xb9, 0x1e, 0x34, 0xcd, 0x11, 0xd3, 0x02, 0x16, + 0x07, 0x0c, 0xd7, 0x20, 0xdf, 0x41, 0x8e, 0xa3, 0xb4, 0x91, 0xec, 0x1e, 0x5a, 0xa8, 0x98, 0x24, + 0xa3, 0x9f, 0xed, 0x1b, 0x7d, 0x78, 0xe4, 0x39, 0x86, 0xda, 0x3b, 0xb4, 0x90, 0x58, 0x81, 0x2c, + 0x32, 0xba, 0x1d, 0xca, 0x90, 0x3a, 0x26, 0x7e, 0x55, 0xa3, 0xdb, 0x09, 0xb3, 0x64, 0x30, 0x8c, + 0x51, 0x8c, 0x3a, 0xc8, 0xbe, 0xa1, 0xa9, 0xa8, 0x98, 0x26, 0x04, 0x8f, 0xf5, 0x11, 0xd4, 0xa9, + 0x3e, 0xcc, 0xc1, 0x71, 0xe2, 0x1a, 0x64, 0xd1, 0xcb, 0x2e, 0x32, 0x1c, 0xcd, 0x34, 0x8a, 0xa3, + 0x84, 0xe4, 0xd1, 0x01, 0xb3, 0x88, 0xf4, 0x66, 0x98, 0xc2, 0xc7, 0x89, 0xe7, 0x61, 0xd4, 0xb4, + 0x5c, 0xcd, 0x34, 0x9c, 0x62, 0x66, 0x36, 0x36, 0x9f, 0x5b, 0xfa, 0xc4, 0xc0, 0x44, 0xa8, 0x51, + 0x1b, 0x89, 0x1b, 0x8b, 0x9b, 0x20, 0x38, 0x66, 0xd7, 0x56, 0x91, 0xac, 0x9a, 0x4d, 0x24, 0x6b, + 0x46, 0xcb, 0x2c, 0x66, 0x09, 0xc1, 0x99, 0xfe, 0x81, 0x10, 0xc3, 0x35, 0xb3, 0x89, 0x36, 0x8d, + 0x96, 0x29, 0x15, 0x9c, 0x9e, 0x67, 0x71, 0x1a, 0xd2, 0xce, 0xa1, 0xe1, 0x2a, 0x2f, 0x17, 0xf3, + 0x24, 0x43, 0xd8, 0xd3, 0xdc, 0x77, 0xd3, 0x30, 0x3e, 0x4c, 0x8a, 0x5d, 0x86, 0x54, 0x0b, 0x8f, + 0xb2, 0x18, 0x3f, 0x49, 0x0c, 0x28, 0xa6, 0x37, 0x88, 0xe9, 0x9f, 0x30, 0x88, 0x15, 0xc8, 0x19, + 0xc8, 0x71, 0x51, 0x93, 0x66, 0x44, 0x62, 0xc8, 0x9c, 0x02, 0x0a, 0xea, 0x4f, 0xa9, 0xe4, 0x4f, + 0x94, 0x52, 0x2f, 0xc0, 0xb8, 0xe7, 0x92, 0x6c, 0x2b, 0x46, 0x9b, 0xe7, 0xe6, 0x62, 0x94, 0x27, + 0x0b, 0x55, 0x8e, 0x93, 0x30, 0x4c, 0x2a, 0xa0, 0x9e, 0x67, 0x71, 0x1d, 0xc0, 0x34, 0x90, 0xd9, + 0x92, 0x9b, 0x48, 0xd5, 0x8b, 0x99, 0x63, 0xa2, 0x54, 0xc3, 0x26, 0x7d, 0x51, 0x32, 0xa9, 0x54, + 0xd5, 0xc5, 0x4b, 0x7e, 0xaa, 0x8d, 0x1e, 0x93, 0x29, 0xdb, 0x74, 0x91, 0xf5, 0x65, 0xdb, 0x3e, + 0x14, 0x6c, 0x84, 0xf3, 0x1e, 0x35, 0xd9, 0xc8, 0xb2, 0xc4, 0x89, 0x85, 0xc8, 0x91, 0x49, 0x0c, + 0x46, 0x07, 0x36, 0x66, 0x07, 0x1f, 0xc5, 0x87, 0xc1, 0x13, 0xc8, 0x24, 0xad, 0x80, 0xec, 0x42, + 0x79, 0x2e, 0xdc, 0x51, 0x3a, 0x68, 0xe6, 0x16, 0x14, 0x7a, 0xc3, 0x23, 0x4e, 0x41, 0xca, 0x71, + 0x15, 0xdb, 0x25, 0x59, 0x98, 0x92, 0xe8, 0x83, 0x28, 0x40, 0x02, 0x19, 0x4d, 0xb2, 0xcb, 0xa5, + 0x24, 0xfc, 0xa7, 0xf8, 0xd3, 0xfe, 0x80, 0x13, 0x64, 0xc0, 0x9f, 0xec, 0x9f, 0xd1, 0x1e, 0xe6, + 0xf0, 0xb8, 0x67, 0x2e, 0xc0, 0x58, 0xcf, 0x00, 0x86, 0x7d, 0xf5, 0xdc, 0xcf, 0xc1, 0x03, 0x03, + 0xa9, 0xc5, 0x17, 0x60, 0xaa, 0x6b, 0x68, 0x86, 0x8b, 0x6c, 0xcb, 0x46, 0x38, 0x63, 0xe9, 0xab, + 0x8a, 0xff, 0x3a, 0x7a, 0x4c, 0xce, 0xed, 0x07, 0xad, 0x29, 0x8b, 0x34, 0xd9, 0xed, 0x17, 0x3e, + 0x91, 0xcd, 0xfc, 0x78, 0x54, 0xb8, 0x7d, 0xfb, 0xf6, 0xed, 0xf8, 0xdc, 0x97, 0xd2, 0x30, 0x35, + 0x68, 0xcd, 0x0c, 0x5c, 0xbe, 0xd3, 0x90, 0x36, 0xba, 0x9d, 0x06, 0xb2, 0x49, 0x90, 0x52, 0x12, + 0x7b, 0x12, 0x2b, 0x90, 0xd2, 0x95, 0x06, 0xd2, 0x8b, 0xc9, 0xd9, 0xd8, 0x7c, 0x61, 0xe9, 0xc9, + 0xa1, 0x56, 0xe5, 0xc2, 0x16, 0x86, 0x48, 0x14, 0x29, 0x7e, 0x06, 0x92, 0x6c, 0x8b, 0xc6, 0x0c, + 0x4f, 0x0c, 0xc7, 0x80, 0xd7, 0x92, 0x44, 0x70, 0xe2, 0x83, 0x90, 0xc5, 0xff, 0xd2, 0xdc, 0x48, + 0x13, 0x9f, 0x33, 0x58, 0x80, 0xf3, 0x42, 0x9c, 0x81, 0x0c, 0x59, 0x26, 0x4d, 0xc4, 0x4b, 0x9b, + 0xf7, 0x8c, 0x13, 0xab, 0x89, 0x5a, 0x4a, 0x57, 0x77, 0xe5, 0x1b, 0x8a, 0xde, 0x45, 0x24, 0xe1, + 0xb3, 0x52, 0x9e, 0x09, 0x3f, 0x87, 0x65, 0xe2, 0x19, 0xc8, 0xd1, 0x55, 0xa5, 0x19, 0x4d, 0xf4, + 0x32, 0xd9, 0x3d, 0x53, 0x12, 0x5d, 0x68, 0x9b, 0x58, 0x82, 0x5f, 0x7f, 0xcd, 0x31, 0x0d, 0x9e, + 0x9a, 0xe4, 0x15, 0x58, 0x40, 0x5e, 0x7f, 0x21, 0xbc, 0x71, 0x3f, 0x34, 0x78, 0x78, 0xe1, 0x9c, + 0x9a, 0xfb, 0x76, 0x1c, 0x92, 0x64, 0xbf, 0x18, 0x87, 0xdc, 0xde, 0x8b, 0xbb, 0x55, 0x79, 0xbd, + 0xb6, 0xbf, 0xba, 0x55, 0x15, 0x62, 0x62, 0x01, 0x80, 0x08, 0xae, 0x6c, 0xd5, 0x2a, 0x7b, 0x42, + 0xdc, 0x7b, 0xde, 0xdc, 0xd9, 0x3b, 0xbf, 0x2c, 0x24, 0x3c, 0xc0, 0x3e, 0x15, 0x24, 0x83, 0x06, + 0xe7, 0x96, 0x84, 0x94, 0x28, 0x40, 0x9e, 0x12, 0x6c, 0xbe, 0x50, 0x5d, 0x3f, 0xbf, 0x2c, 0xa4, + 0x7b, 0x25, 0xe7, 0x96, 0x84, 0x51, 0x71, 0x0c, 0xb2, 0x44, 0xb2, 0x5a, 0xab, 0x6d, 0x09, 0x19, + 0x8f, 0xb3, 0xbe, 0x27, 0x6d, 0xee, 0x6c, 0x08, 0x59, 0x8f, 0x73, 0x43, 0xaa, 0xed, 0xef, 0x0a, + 0xe0, 0x31, 0x6c, 0x57, 0xeb, 0xf5, 0xca, 0x46, 0x55, 0xc8, 0x79, 0x16, 0xab, 0x2f, 0xee, 0x55, + 0xeb, 0x42, 0xbe, 0xc7, 0xad, 0x73, 0x4b, 0xc2, 0x98, 0xf7, 0x8a, 0xea, 0xce, 0xfe, 0xb6, 0x50, + 0x10, 0x27, 0x60, 0x8c, 0xbe, 0x82, 0x3b, 0x31, 0x1e, 0x12, 0x9d, 0x5f, 0x16, 0x04, 0xdf, 0x11, + 0xca, 0x32, 0xd1, 0x23, 0x38, 0xbf, 0x2c, 0x88, 0x73, 0x6b, 0x90, 0x22, 0xd9, 0x25, 0x8a, 0x50, + 0xd8, 0xaa, 0xac, 0x56, 0xb7, 0xe4, 0xda, 0xee, 0xde, 0x66, 0x6d, 0xa7, 0xb2, 0x25, 0xc4, 0x7c, + 0x99, 0x54, 0xfd, 0xec, 0xfe, 0xa6, 0x54, 0x5d, 0x17, 0xe2, 0x41, 0xd9, 0x6e, 0xb5, 0xb2, 0x57, + 0x5d, 0x17, 0x12, 0x73, 0x2a, 0x4c, 0x0d, 0xda, 0x27, 0x07, 0xae, 0x8c, 0xc0, 0x14, 0xc7, 0x8f, + 0x99, 0x62, 0xc2, 0xd5, 0x37, 0xc5, 0xef, 0xc4, 0x61, 0x72, 0x40, 0xad, 0x18, 0xf8, 0x92, 0x67, + 0x21, 0x45, 0x53, 0x94, 0x56, 0xcf, 0xc7, 0x07, 0x16, 0x1d, 0x92, 0xb0, 0x7d, 0x15, 0x94, 0xe0, + 0x82, 0x1d, 0x44, 0xe2, 0x98, 0x0e, 0x02, 0x53, 0xf4, 0xed, 0xe9, 0x3f, 0xdb, 0xb7, 0xa7, 0xd3, + 0xb2, 0x77, 0x7e, 0x98, 0xb2, 0x47, 0x64, 0x27, 0xdb, 0xdb, 0x53, 0x03, 0xf6, 0xf6, 0xcb, 0x30, + 0xd1, 0x47, 0x34, 0xf4, 0x1e, 0xfb, 0x4a, 0x0c, 0x8a, 0xc7, 0x05, 0x27, 0x62, 0xa7, 0x8b, 0xf7, + 0xec, 0x74, 0x97, 0xc3, 0x11, 0x3c, 0x7b, 0xfc, 0x24, 0xf4, 0xcd, 0xf5, 0x1b, 0x31, 0x98, 0x1e, + 0xdc, 0x29, 0x0e, 0xf4, 0xe1, 0x33, 0x90, 0xee, 0x20, 0xf7, 0xc0, 0xe4, 0xdd, 0xd2, 0x27, 0x07, + 0xd4, 0x60, 0xac, 0x0e, 0x4f, 0x36, 0x43, 0x05, 0x8b, 0x78, 0xe2, 0xb8, 0x76, 0x8f, 0x7a, 0xd3, + 0xe7, 0xe9, 0x17, 0xe3, 0xf0, 0xc0, 0x40, 0xf2, 0x81, 0x8e, 0x3e, 0x04, 0xa0, 0x19, 0x56, 0xd7, + 0xa5, 0x1d, 0x11, 0xdd, 0x60, 0xb3, 0x44, 0x42, 0x36, 0x2f, 0xbc, 0x79, 0x76, 0x5d, 0x4f, 0x9f, + 0x20, 0x7a, 0xa0, 0x22, 0x62, 0x70, 0xd1, 0x77, 0x34, 0x49, 0x1c, 0x2d, 0x1d, 0x33, 0xd2, 0xbe, + 0xc4, 0x7c, 0x1a, 0x04, 0x55, 0xd7, 0x90, 0xe1, 0xca, 0x8e, 0x6b, 0x23, 0xa5, 0xa3, 0x19, 0x6d, + 0x52, 0x41, 0x32, 0xe5, 0x54, 0x4b, 0xd1, 0x1d, 0x24, 0x8d, 0x53, 0x75, 0x9d, 0x6b, 0x31, 0x82, + 0x24, 0x90, 0x1d, 0x40, 0xa4, 0x7b, 0x10, 0x54, 0xed, 0x21, 0xe6, 0x7e, 0x35, 0x0b, 0xb9, 0x40, + 0x5f, 0x2d, 0x9e, 0x85, 0xfc, 0x35, 0xe5, 0x86, 0x22, 0xf3, 0xb3, 0x12, 0x8d, 0x44, 0x0e, 0xcb, + 0x76, 0xd9, 0x79, 0xe9, 0x69, 0x98, 0x22, 0x26, 0x66, 0xd7, 0x45, 0xb6, 0xac, 0xea, 0x8a, 0xe3, + 0x90, 0xa0, 0x65, 0x88, 0xa9, 0x88, 0x75, 0x35, 0xac, 0x5a, 0xe3, 0x1a, 0x71, 0x05, 0x26, 0x09, + 0xa2, 0xd3, 0xd5, 0x5d, 0xcd, 0xd2, 0x91, 0x8c, 0x4f, 0x6f, 0x0e, 0xa9, 0x24, 0x9e, 0x67, 0x13, + 0xd8, 0x62, 0x9b, 0x19, 0x60, 0x8f, 0x1c, 0x71, 0x1d, 0x1e, 0x22, 0xb0, 0x36, 0x32, 0x90, 0xad, + 0xb8, 0x48, 0x46, 0x5f, 0xe8, 0x2a, 0xba, 0x23, 0x2b, 0x46, 0x53, 0x3e, 0x50, 0x9c, 0x83, 0xe2, + 0x14, 0x26, 0x58, 0x8d, 0x17, 0x63, 0xd2, 0x69, 0x6c, 0xb8, 0xc1, 0xec, 0xaa, 0xc4, 0xac, 0x62, + 0x34, 0xaf, 0x2a, 0xce, 0x81, 0x58, 0x86, 0x69, 0xc2, 0xe2, 0xb8, 0xb6, 0x66, 0xb4, 0x65, 0xf5, + 0x00, 0xa9, 0xd7, 0xe5, 0xae, 0xdb, 0xba, 0x58, 0x7c, 0x30, 0xf8, 0x7e, 0xe2, 0x61, 0x9d, 0xd8, + 0xac, 0x61, 0x93, 0x7d, 0xb7, 0x75, 0x51, 0xac, 0x43, 0x1e, 0x4f, 0x46, 0x47, 0xbb, 0x85, 0xe4, + 0x96, 0x69, 0x93, 0xd2, 0x58, 0x18, 0xb0, 0x35, 0x05, 0x22, 0xb8, 0x50, 0x63, 0x80, 0x6d, 0xb3, + 0x89, 0xca, 0xa9, 0xfa, 0x6e, 0xb5, 0xba, 0x2e, 0xe5, 0x38, 0xcb, 0x15, 0xd3, 0xc6, 0x09, 0xd5, + 0x36, 0xbd, 0x00, 0xe7, 0x68, 0x42, 0xb5, 0x4d, 0x1e, 0xde, 0x15, 0x98, 0x54, 0x55, 0x3a, 0x66, + 0x4d, 0x95, 0xd9, 0x19, 0xcb, 0x29, 0x0a, 0x3d, 0xc1, 0x52, 0xd5, 0x0d, 0x6a, 0xc0, 0x72, 0xdc, + 0x11, 0x2f, 0xc1, 0x03, 0x7e, 0xb0, 0x82, 0xc0, 0x89, 0xbe, 0x51, 0x86, 0xa1, 0x2b, 0x30, 0x69, + 0x1d, 0xf6, 0x03, 0xc5, 0x9e, 0x37, 0x5a, 0x87, 0x61, 0xd8, 0x05, 0x98, 0xb2, 0x0e, 0xac, 0x7e, + 0xdc, 0x13, 0x41, 0x9c, 0x68, 0x1d, 0x58, 0x61, 0xe0, 0xa3, 0xe4, 0xc0, 0x6d, 0x23, 0x55, 0x71, + 0x51, 0xb3, 0x78, 0x2a, 0x68, 0x1e, 0x50, 0x88, 0x8b, 0x20, 0xa8, 0xaa, 0x8c, 0x0c, 0xa5, 0xa1, + 0x23, 0x59, 0xb1, 0x91, 0xa1, 0x38, 0xc5, 0x33, 0x41, 0xe3, 0x82, 0xaa, 0x56, 0x89, 0xb6, 0x42, + 0x94, 0xe2, 0x13, 0x30, 0x61, 0x36, 0xae, 0xa9, 0x34, 0x25, 0x65, 0xcb, 0x46, 0x2d, 0xed, 0xe5, + 0xe2, 0x23, 0x24, 0xbe, 0xe3, 0x58, 0x41, 0x12, 0x72, 0x97, 0x88, 0xc5, 0xc7, 0x41, 0x50, 0x9d, + 0x03, 0xc5, 0xb6, 0xc8, 0x9e, 0xec, 0x58, 0x8a, 0x8a, 0x8a, 0x8f, 0x52, 0x53, 0x2a, 0xdf, 0xe1, + 0x62, 0xbc, 0x24, 0x9c, 0x9b, 0x5a, 0xcb, 0xe5, 0x8c, 0x8f, 0xd1, 0x25, 0x41, 0x64, 0x8c, 0x6d, + 0x1e, 0x04, 0x1c, 0x8a, 0x9e, 0x17, 0xcf, 0x13, 0xb3, 0x82, 0x75, 0x60, 0x05, 0xdf, 0xfb, 0x30, + 0x8c, 0x61, 0x4b, 0xff, 0xa5, 0x8f, 0xd3, 0x86, 0xcc, 0x3a, 0x08, 0xbc, 0x71, 0x19, 0xa6, 0xb1, + 0x51, 0x07, 0xb9, 0x4a, 0x53, 0x71, 0x95, 0x80, 0xf5, 0xa7, 0x88, 0x35, 0x8e, 0xfb, 0x36, 0x53, + 0xf6, 0xf8, 0x69, 0x77, 0x1b, 0x87, 0x5e, 0x66, 0x3d, 0x45, 0xfd, 0xc4, 0x32, 0x9e, 0x5b, 0x1f, + 0x5a, 0xd3, 0x3d, 0x57, 0x86, 0x7c, 0x30, 0xf1, 0xc5, 0x2c, 0xd0, 0xd4, 0x17, 0x62, 0xb8, 0x0b, + 0x5a, 0xab, 0xad, 0xe3, 0xfe, 0xe5, 0xa5, 0xaa, 0x10, 0xc7, 0x7d, 0xd4, 0xd6, 0xe6, 0x5e, 0x55, + 0x96, 0xf6, 0x77, 0xf6, 0x36, 0xb7, 0xab, 0x42, 0x22, 0xd8, 0xb0, 0x7f, 0x3f, 0x0e, 0x85, 0xde, + 0xb3, 0x97, 0xf8, 0x53, 0x70, 0x8a, 0x5f, 0x94, 0x38, 0xc8, 0x95, 0x6f, 0x6a, 0x36, 0x59, 0x8b, + 0x1d, 0x85, 0xd6, 0x45, 0x2f, 0x1b, 0xa6, 0x98, 0x55, 0x1d, 0xb9, 0xcf, 0x6b, 0x36, 0x5e, 0x69, + 0x1d, 0xc5, 0x15, 0xb7, 0xe0, 0x8c, 0x61, 0xca, 0x8e, 0xab, 0x18, 0x4d, 0xc5, 0x6e, 0xca, 0xfe, + 0x15, 0x95, 0xac, 0xa8, 0x2a, 0x72, 0x1c, 0x93, 0xd6, 0x40, 0x8f, 0xe5, 0x13, 0x86, 0x59, 0x67, + 0xc6, 0x7e, 0x71, 0xa8, 0x30, 0xd3, 0x50, 0xe6, 0x26, 0x8e, 0xcb, 0xdc, 0x07, 0x21, 0xdb, 0x51, + 0x2c, 0x19, 0x19, 0xae, 0x7d, 0x48, 0x3a, 0xee, 0x8c, 0x94, 0xe9, 0x28, 0x56, 0x15, 0x3f, 0x7f, + 0x34, 0x07, 0x9f, 0x1f, 0x25, 0x20, 0x1f, 0xec, 0xba, 0xf1, 0x21, 0x46, 0x25, 0x05, 0x2a, 0x46, + 0xb6, 0xb0, 0x87, 0xef, 0xdb, 0xa3, 0x2f, 0xac, 0xe1, 0xca, 0x55, 0x4e, 0xd3, 0x5e, 0x58, 0xa2, + 0x48, 0xdc, 0x35, 0xe0, 0xd4, 0x42, 0xb4, 0xf7, 0xc8, 0x48, 0xec, 0x49, 0xdc, 0x80, 0xf4, 0x35, + 0x87, 0x70, 0xa7, 0x09, 0xf7, 0x23, 0xf7, 0xe7, 0x7e, 0xae, 0x4e, 0xc8, 0xb3, 0xcf, 0xd5, 0xe5, + 0x9d, 0x9a, 0xb4, 0x5d, 0xd9, 0x92, 0x18, 0x5c, 0x3c, 0x0d, 0x49, 0x5d, 0xb9, 0x75, 0xd8, 0x5b, + 0xe3, 0x88, 0x68, 0xd8, 0xc0, 0x9f, 0x86, 0xe4, 0x4d, 0xa4, 0x5c, 0xef, 0xad, 0x2c, 0x44, 0xf4, + 0x21, 0xa6, 0xfe, 0x22, 0xa4, 0x48, 0xbc, 0x44, 0x00, 0x16, 0x31, 0x61, 0x44, 0xcc, 0x40, 0x72, + 0xad, 0x26, 0xe1, 0xf4, 0x17, 0x20, 0x4f, 0xa5, 0xf2, 0xee, 0x66, 0x75, 0xad, 0x2a, 0xc4, 0xe7, + 0x56, 0x20, 0x4d, 0x83, 0x80, 0x97, 0x86, 0x17, 0x06, 0x61, 0x84, 0x3d, 0x32, 0x8e, 0x18, 0xd7, + 0xee, 0x6f, 0xaf, 0x56, 0x25, 0x21, 0x1e, 0x9c, 0x5e, 0x07, 0xf2, 0xc1, 0x86, 0xfb, 0xa3, 0xc9, + 0xa9, 0xef, 0xc5, 0x20, 0x17, 0x68, 0xa0, 0x71, 0xe7, 0xa3, 0xe8, 0xba, 0x79, 0x53, 0x56, 0x74, + 0x4d, 0x71, 0x58, 0x52, 0x00, 0x11, 0x55, 0xb0, 0x64, 0xd8, 0x49, 0xfb, 0x48, 0x9c, 0x7f, 0x3d, + 0x06, 0x42, 0xb8, 0x77, 0x0d, 0x39, 0x18, 0xfb, 0x58, 0x1d, 0x7c, 0x2d, 0x06, 0x85, 0xde, 0x86, + 0x35, 0xe4, 0xde, 0xd9, 0x8f, 0xd5, 0xbd, 0xb7, 0xe3, 0x30, 0xd6, 0xd3, 0xa6, 0x0e, 0xeb, 0xdd, + 0x17, 0x60, 0x42, 0x6b, 0xa2, 0x8e, 0x65, 0xba, 0xc8, 0x50, 0x0f, 0x65, 0x1d, 0xdd, 0x40, 0x7a, + 0x71, 0x8e, 0x6c, 0x14, 0x8b, 0xf7, 0x6f, 0x84, 0x17, 0x36, 0x7d, 0xdc, 0x16, 0x86, 0x95, 0x27, + 0x37, 0xd7, 0xab, 0xdb, 0xbb, 0xb5, 0xbd, 0xea, 0xce, 0xda, 0x8b, 0xf2, 0xfe, 0xce, 0xcf, 0xec, + 0xd4, 0x9e, 0xdf, 0x91, 0x04, 0x2d, 0x64, 0xf6, 0x21, 0x2e, 0xf5, 0x5d, 0x10, 0xc2, 0x4e, 0x89, + 0xa7, 0x60, 0x90, 0x5b, 0xc2, 0x88, 0x38, 0x09, 0xe3, 0x3b, 0x35, 0xb9, 0xbe, 0xb9, 0x5e, 0x95, + 0xab, 0x57, 0xae, 0x54, 0xd7, 0xf6, 0xea, 0xf4, 0x6a, 0xc3, 0xb3, 0xde, 0xeb, 0x5d, 0xd4, 0xaf, + 0x26, 0x60, 0x72, 0x80, 0x27, 0x62, 0x85, 0x1d, 0x4a, 0xe8, 0x39, 0xe9, 0xa9, 0x61, 0xbc, 0x5f, + 0xc0, 0x5d, 0xc1, 0xae, 0x62, 0xbb, 0xec, 0x0c, 0xf3, 0x38, 0xe0, 0x28, 0x19, 0xae, 0xd6, 0xd2, + 0x90, 0xcd, 0x6e, 0x82, 0xe8, 0x49, 0x65, 0xdc, 0x97, 0xd3, 0xcb, 0xa0, 0x4f, 0x81, 0x68, 0x99, + 0x8e, 0xe6, 0x6a, 0x37, 0x90, 0xac, 0x19, 0xfc, 0xda, 0x08, 0x9f, 0x5c, 0x92, 0x92, 0xc0, 0x35, + 0x9b, 0x86, 0xeb, 0x59, 0x1b, 0xa8, 0xad, 0x84, 0xac, 0xf1, 0x06, 0x9e, 0x90, 0x04, 0xae, 0xf1, + 0xac, 0xcf, 0x42, 0xbe, 0x69, 0x76, 0x71, 0x3b, 0x47, 0xed, 0x70, 0xbd, 0x88, 0x49, 0x39, 0x2a, + 0xf3, 0x4c, 0x58, 0xa3, 0xee, 0xdf, 0x57, 0xe5, 0xa5, 0x1c, 0x95, 0x51, 0x93, 0xc7, 0x60, 0x5c, + 0x69, 0xb7, 0x6d, 0x4c, 0xce, 0x89, 0xe8, 0xd1, 0xa3, 0xe0, 0x89, 0x89, 0xe1, 0xcc, 0x73, 0x90, + 0xe1, 0x71, 0xc0, 0x25, 0x19, 0x47, 0x42, 0xb6, 0xe8, 0x79, 0x3a, 0x3e, 0x9f, 0x95, 0x32, 0x06, + 0x57, 0x9e, 0x85, 0xbc, 0xe6, 0xc8, 0xfe, 0xf5, 0x7b, 0x7c, 0x36, 0x3e, 0x9f, 0x91, 0x72, 0x9a, + 0xe3, 0x5d, 0x5d, 0xce, 0xbd, 0x11, 0x87, 0x42, 0xef, 0xe7, 0x03, 0x71, 0x1d, 0x32, 0xba, 0xa9, + 0x2a, 0x24, 0xb5, 0xe8, 0xb7, 0xab, 0xf9, 0x88, 0x2f, 0x0e, 0x0b, 0x5b, 0xcc, 0x5e, 0xf2, 0x90, + 0x33, 0xff, 0x1c, 0x83, 0x0c, 0x17, 0x8b, 0xd3, 0x90, 0xb4, 0x14, 0xf7, 0x80, 0xd0, 0xa5, 0x56, + 0xe3, 0x42, 0x4c, 0x22, 0xcf, 0x58, 0xee, 0x58, 0x8a, 0x41, 0x52, 0x80, 0xc9, 0xf1, 0x33, 0x9e, + 0x57, 0x1d, 0x29, 0x4d, 0x72, 0xae, 0x31, 0x3b, 0x1d, 0x64, 0xb8, 0x0e, 0x9f, 0x57, 0x26, 0x5f, + 0x63, 0x62, 0xf1, 0x49, 0x98, 0x70, 0x6d, 0x45, 0xd3, 0x7b, 0x6c, 0x93, 0xc4, 0x56, 0xe0, 0x0a, + 0xcf, 0xb8, 0x0c, 0xa7, 0x39, 0x6f, 0x13, 0xb9, 0x8a, 0x7a, 0x80, 0x9a, 0x3e, 0x28, 0x4d, 0xee, + 0x2f, 0x4e, 0x31, 0x83, 0x75, 0xa6, 0xe7, 0xd8, 0xb9, 0x1f, 0xc6, 0x60, 0x82, 0x9f, 0xc4, 0x9a, + 0x5e, 0xb0, 0xb6, 0x01, 0x14, 0xc3, 0x30, 0xdd, 0x60, 0xb8, 0xfa, 0x53, 0xb9, 0x0f, 0xb7, 0x50, + 0xf1, 0x40, 0x52, 0x80, 0x60, 0xa6, 0x03, 0xe0, 0x6b, 0x8e, 0x0d, 0xdb, 0x19, 0xc8, 0xb1, 0x6f, + 0x43, 0xe4, 0x03, 0x23, 0x3d, 0xbb, 0x03, 0x15, 0xe1, 0x23, 0x9b, 0x38, 0x05, 0xa9, 0x06, 0x6a, + 0x6b, 0x06, 0xbb, 0xf1, 0xa5, 0x0f, 0xfc, 0x86, 0x25, 0xe9, 0xdd, 0xb0, 0xac, 0x7e, 0x1e, 0x26, + 0x55, 0xb3, 0x13, 0x76, 0x77, 0x55, 0x08, 0xdd, 0x1f, 0x38, 0x57, 0x63, 0x2f, 0x81, 0xdf, 0x62, + 0x7e, 0x10, 0x8b, 0x7d, 0x2d, 0x9e, 0xd8, 0xd8, 0x5d, 0xfd, 0x46, 0x7c, 0x66, 0x83, 0x42, 0x77, + 0xf9, 0x48, 0x25, 0xd4, 0xd2, 0x91, 0x8a, 0xbd, 0x87, 0xaf, 0x3f, 0x09, 0x4f, 0xb5, 0x35, 0xf7, + 0xa0, 0xdb, 0x58, 0x50, 0xcd, 0xce, 0x62, 0xdb, 0x6c, 0x9b, 0xfe, 0x37, 0x55, 0xfc, 0x44, 0x1e, + 0xc8, 0x5f, 0xec, 0xbb, 0x6a, 0xd6, 0x93, 0xce, 0x44, 0x7e, 0x84, 0x2d, 0xef, 0xc0, 0x24, 0x33, + 0x96, 0xc9, 0x87, 0x1d, 0x7a, 0x3c, 0x11, 0xef, 0x7b, 0x39, 0x56, 0xfc, 0xd6, 0xbb, 0xa4, 0x5c, + 0x4b, 0x13, 0x0c, 0x8a, 0x75, 0xf4, 0x04, 0x53, 0x96, 0xe0, 0x81, 0x1e, 0x3e, 0xba, 0x34, 0x91, + 0x1d, 0xc1, 0xf8, 0x7d, 0xc6, 0x38, 0x19, 0x60, 0xac, 0x33, 0x68, 0x79, 0x0d, 0xc6, 0x4e, 0xc2, + 0xf5, 0x8f, 0x8c, 0x2b, 0x8f, 0x82, 0x24, 0x1b, 0x30, 0x4e, 0x48, 0xd4, 0xae, 0xe3, 0x9a, 0x1d, + 0xb2, 0xef, 0xdd, 0x9f, 0xe6, 0x9f, 0xde, 0xa5, 0x6b, 0xa5, 0x80, 0x61, 0x6b, 0x1e, 0xaa, 0x5c, + 0x06, 0xf2, 0x2d, 0xab, 0x89, 0x54, 0x3d, 0x82, 0xe1, 0x2d, 0xe6, 0x88, 0x67, 0x5f, 0xfe, 0x1c, + 0x4c, 0xe1, 0xbf, 0xc9, 0xb6, 0x14, 0xf4, 0x24, 0xfa, 0x26, 0xad, 0xf8, 0xc3, 0x57, 0xe8, 0x72, + 0x9c, 0xf4, 0x08, 0x02, 0x3e, 0x05, 0x66, 0xb1, 0x8d, 0x5c, 0x17, 0xd9, 0x8e, 0xac, 0xe8, 0x83, + 0xdc, 0x0b, 0x5c, 0x45, 0x14, 0xbf, 0xfc, 0x5e, 0xef, 0x2c, 0x6e, 0x50, 0x64, 0x45, 0xd7, 0xcb, + 0xfb, 0x70, 0x6a, 0x40, 0x56, 0x0c, 0xc1, 0xf9, 0x2a, 0xe3, 0x9c, 0xea, 0xcb, 0x0c, 0x4c, 0xbb, + 0x0b, 0x5c, 0xee, 0xcd, 0xe5, 0x10, 0x9c, 0xbf, 0xcf, 0x38, 0x45, 0x86, 0xe5, 0x53, 0x8a, 0x19, + 0x9f, 0x83, 0x89, 0x1b, 0xc8, 0x6e, 0x98, 0x0e, 0xbb, 0xfe, 0x19, 0x82, 0xee, 0x35, 0x46, 0x37, + 0xce, 0x80, 0xe4, 0x3e, 0x08, 0x73, 0x5d, 0x82, 0x4c, 0x4b, 0x51, 0xd1, 0x10, 0x14, 0x5f, 0x61, + 0x14, 0xa3, 0xd8, 0x1e, 0x43, 0x2b, 0x90, 0x6f, 0x9b, 0xac, 0x32, 0x45, 0xc3, 0x5f, 0x67, 0xf0, + 0x1c, 0xc7, 0x30, 0x0a, 0xcb, 0xb4, 0xba, 0x3a, 0x2e, 0x5b, 0xd1, 0x14, 0x7f, 0xc0, 0x29, 0x38, + 0x86, 0x51, 0x9c, 0x20, 0xac, 0x7f, 0xc8, 0x29, 0x9c, 0x40, 0x3c, 0x9f, 0x85, 0x9c, 0x69, 0xe8, + 0x87, 0xa6, 0x31, 0x8c, 0x13, 0x5f, 0x65, 0x0c, 0xc0, 0x20, 0x98, 0xe0, 0x32, 0x64, 0x87, 0x9d, + 0x88, 0x3f, 0x7e, 0x8f, 0x2f, 0x0f, 0x3e, 0x03, 0x1b, 0x30, 0xce, 0x37, 0x28, 0xcd, 0x34, 0x86, + 0xa0, 0xf8, 0x3a, 0xa3, 0x28, 0x04, 0x60, 0x6c, 0x18, 0x2e, 0x72, 0xdc, 0x36, 0x1a, 0x86, 0xe4, + 0x0d, 0x3e, 0x0c, 0x06, 0x61, 0xa1, 0x6c, 0x20, 0x43, 0x3d, 0x18, 0x8e, 0xe1, 0x4d, 0x1e, 0x4a, + 0x8e, 0xc1, 0x14, 0x6b, 0x30, 0xd6, 0x51, 0x6c, 0xe7, 0x40, 0xd1, 0x87, 0x9a, 0x8e, 0x3f, 0x61, + 0x1c, 0x79, 0x0f, 0xc4, 0x22, 0xd2, 0x35, 0x4e, 0x42, 0xf3, 0x0d, 0x1e, 0x91, 0x00, 0x8c, 0x2d, + 0x3d, 0xc7, 0x25, 0x77, 0x65, 0x27, 0x61, 0xfb, 0x53, 0xbe, 0xf4, 0x28, 0x76, 0x3b, 0xc8, 0x78, + 0x19, 0xb2, 0x8e, 0x76, 0x6b, 0x28, 0x9a, 0x3f, 0xe3, 0x33, 0x4d, 0x00, 0x18, 0xfc, 0x22, 0x9c, + 0x1e, 0x58, 0x26, 0x86, 0x20, 0xfb, 0x73, 0x46, 0x36, 0x3d, 0xa0, 0x54, 0xb0, 0x2d, 0xe1, 0xa4, + 0x94, 0x7f, 0xc1, 0xb7, 0x04, 0x14, 0xe2, 0xda, 0xc5, 0x67, 0x05, 0x47, 0x69, 0x9d, 0x2c, 0x6a, + 0x7f, 0xc9, 0xa3, 0x46, 0xb1, 0x3d, 0x51, 0xdb, 0x83, 0x69, 0xc6, 0x78, 0xb2, 0x79, 0xfd, 0x26, + 0xdf, 0x58, 0x29, 0x7a, 0xbf, 0x77, 0x76, 0x3f, 0x0f, 0x33, 0x5e, 0x38, 0x79, 0x53, 0xea, 0xc8, + 0x1d, 0xc5, 0x1a, 0x82, 0xf9, 0x5b, 0x8c, 0x99, 0xef, 0xf8, 0x5e, 0x57, 0xeb, 0x6c, 0x2b, 0x16, + 0x26, 0x7f, 0x01, 0x8a, 0x9c, 0xbc, 0x6b, 0xd8, 0x48, 0x35, 0xdb, 0x86, 0x76, 0x0b, 0x35, 0x87, + 0xa0, 0xfe, 0xab, 0xd0, 0x54, 0xed, 0x07, 0xe0, 0x98, 0x79, 0x13, 0x04, 0xaf, 0x57, 0x91, 0xb5, + 0x8e, 0x65, 0xda, 0x6e, 0x04, 0xe3, 0x5f, 0xf3, 0x99, 0xf2, 0x70, 0x9b, 0x04, 0x56, 0xae, 0x42, + 0x81, 0x3c, 0x0e, 0x9b, 0x92, 0x7f, 0xc3, 0x88, 0xc6, 0x7c, 0x14, 0xdb, 0x38, 0x54, 0xb3, 0x63, + 0x29, 0xf6, 0x30, 0xfb, 0xdf, 0xdf, 0xf2, 0x8d, 0x83, 0x41, 0xd8, 0xc6, 0xe1, 0x1e, 0x5a, 0x08, + 0x57, 0xfb, 0x21, 0x18, 0xbe, 0xcd, 0x37, 0x0e, 0x8e, 0x61, 0x14, 0xbc, 0x61, 0x18, 0x82, 0xe2, + 0xef, 0x38, 0x05, 0xc7, 0x60, 0x8a, 0xcf, 0xfa, 0x85, 0xd6, 0x46, 0x6d, 0xcd, 0x71, 0x6d, 0xda, + 0x0a, 0xdf, 0x9f, 0xea, 0x3b, 0xef, 0xf5, 0x36, 0x61, 0x52, 0x00, 0x8a, 0x77, 0x22, 0x76, 0x85, + 0x4a, 0x4e, 0x4a, 0xd1, 0x8e, 0x7d, 0x97, 0xef, 0x44, 0x01, 0x18, 0xf6, 0x2d, 0xd0, 0x21, 0xe2, + 0xb0, 0xab, 0xf8, 0x7c, 0x30, 0x04, 0xdd, 0xf7, 0x42, 0xce, 0xd5, 0x39, 0x16, 0x73, 0x06, 0xfa, + 0x9f, 0xae, 0x71, 0x1d, 0x1d, 0x0e, 0x95, 0x9d, 0x7f, 0x1f, 0xea, 0x7f, 0xf6, 0x29, 0x92, 0xee, + 0x21, 0xe3, 0xa1, 0x7e, 0x4a, 0x8c, 0xfa, 0x15, 0x50, 0xf1, 0xe7, 0xef, 0xb2, 0xf1, 0xf6, 0xb6, + 0x53, 0xe5, 0x2d, 0x9c, 0xe4, 0xbd, 0x4d, 0x4f, 0x34, 0xd9, 0x2b, 0x77, 0xbd, 0x3c, 0xef, 0xe9, + 0x79, 0xca, 0x57, 0x60, 0xac, 0xa7, 0xe1, 0x89, 0xa6, 0xfa, 0x05, 0x46, 0x95, 0x0f, 0xf6, 0x3b, + 0xe5, 0x15, 0x48, 0xe2, 0xe6, 0x25, 0x1a, 0xfe, 0x8b, 0x0c, 0x4e, 0xcc, 0xcb, 0x9f, 0x86, 0x0c, + 0x6f, 0x5a, 0xa2, 0xa1, 0xbf, 0xc4, 0xa0, 0x1e, 0x04, 0xc3, 0x79, 0xc3, 0x12, 0x0d, 0xff, 0x65, + 0x0e, 0xe7, 0x10, 0x0c, 0x1f, 0x3e, 0x84, 0xff, 0xf0, 0x2b, 0x49, 0x56, 0x74, 0x78, 0xec, 0x2e, + 0xc3, 0x28, 0xeb, 0x54, 0xa2, 0xd1, 0x5f, 0x64, 0x2f, 0xe7, 0x88, 0xf2, 0x05, 0x48, 0x0d, 0x19, + 0xf0, 0x5f, 0x63, 0x50, 0x6a, 0x5f, 0x5e, 0x83, 0x5c, 0xa0, 0x3b, 0x89, 0x86, 0xff, 0x3a, 0x83, + 0x07, 0x51, 0xd8, 0x75, 0xd6, 0x9d, 0x44, 0x13, 0xfc, 0x06, 0x77, 0x9d, 0x21, 0x70, 0xd8, 0x78, + 0x63, 0x12, 0x8d, 0xfe, 0x4d, 0x1e, 0x75, 0x0e, 0x29, 0x3f, 0x0b, 0x59, 0xaf, 0xd8, 0x44, 0xe3, + 0x7f, 0x8b, 0xe1, 0x7d, 0x0c, 0x8e, 0x40, 0xa0, 0xd8, 0x45, 0x53, 0xfc, 0x36, 0x8f, 0x40, 0x00, + 0x85, 0x97, 0x51, 0xb8, 0x81, 0x89, 0x66, 0xfa, 0x1d, 0xbe, 0x8c, 0x42, 0xfd, 0x0b, 0x9e, 0x4d, + 0xb2, 0xe7, 0x47, 0x53, 0xfc, 0x2e, 0x9f, 0x4d, 0x62, 0x8f, 0xdd, 0x08, 0x77, 0x04, 0xd1, 0x1c, + 0xbf, 0xc7, 0xdd, 0x08, 0x35, 0x04, 0xe5, 0x5d, 0x10, 0xfb, 0xbb, 0x81, 0x68, 0xbe, 0x2f, 0x31, + 0xbe, 0x89, 0xbe, 0x66, 0xa0, 0xfc, 0x3c, 0x4c, 0x0f, 0xee, 0x04, 0xa2, 0x59, 0xbf, 0x7c, 0x37, + 0x74, 0x76, 0x0b, 0x36, 0x02, 0xe5, 0x3d, 0xbf, 0xa4, 0x04, 0xbb, 0x80, 0x68, 0xda, 0x57, 0xef, + 0xf6, 0x6e, 0xdc, 0xc1, 0x26, 0xa0, 0x5c, 0x01, 0xf0, 0x0b, 0x70, 0x34, 0xd7, 0x6b, 0x8c, 0x2b, + 0x00, 0xc2, 0x4b, 0x83, 0xd5, 0xdf, 0x68, 0xfc, 0x57, 0xf8, 0xd2, 0x60, 0x08, 0xbc, 0x34, 0x78, + 0xe9, 0x8d, 0x46, 0xbf, 0xce, 0x97, 0x06, 0x87, 0xe0, 0xcc, 0x0e, 0x54, 0xb7, 0x68, 0x86, 0xaf, + 0xf2, 0xcc, 0x0e, 0xa0, 0xca, 0x3b, 0x30, 0xd1, 0x57, 0x10, 0xa3, 0xa9, 0xbe, 0xc6, 0xa8, 0x84, + 0x70, 0x3d, 0x0c, 0x16, 0x2f, 0x56, 0x0c, 0xa3, 0xd9, 0xfe, 0x28, 0x54, 0xbc, 0x58, 0x2d, 0x2c, + 0x5f, 0x86, 0x8c, 0xd1, 0xd5, 0x75, 0xbc, 0x78, 0xc4, 0xfb, 0xff, 0x72, 0xaf, 0xf8, 0x6f, 0xf7, + 0x58, 0x74, 0x38, 0xa0, 0xbc, 0x02, 0x29, 0xd4, 0x69, 0xa0, 0x66, 0x14, 0xf2, 0xdf, 0xef, 0xf1, + 0x0d, 0x13, 0x5b, 0x97, 0x9f, 0x05, 0xa0, 0x57, 0x23, 0xe4, 0xb3, 0x5f, 0x04, 0xf6, 0x3f, 0xee, + 0xb1, 0xdf, 0xd4, 0xf8, 0x10, 0x9f, 0x80, 0xfe, 0x42, 0xe7, 0xfe, 0x04, 0xef, 0xf5, 0x12, 0x90, + 0x19, 0xb9, 0x04, 0xa3, 0xd7, 0x1c, 0xd3, 0x70, 0x95, 0x76, 0x14, 0xfa, 0x3f, 0x19, 0x9a, 0xdb, + 0xe3, 0x80, 0x75, 0x4c, 0x1b, 0xb9, 0x4a, 0xdb, 0x89, 0xc2, 0xfe, 0x17, 0xc3, 0x7a, 0x00, 0x0c, + 0x56, 0x15, 0xc7, 0x1d, 0x66, 0xdc, 0xff, 0xcd, 0xc1, 0x1c, 0x80, 0x9d, 0xc6, 0x7f, 0x5f, 0x47, + 0x87, 0x51, 0xd8, 0xf7, 0xb9, 0xd3, 0xcc, 0xbe, 0xfc, 0x69, 0xc8, 0xe2, 0x3f, 0xe9, 0x0f, 0xe5, + 0x22, 0xc0, 0xff, 0xc3, 0xc0, 0x3e, 0x02, 0xbf, 0xd9, 0x71, 0x9b, 0xae, 0x16, 0x1d, 0xec, 0xff, + 0x65, 0x33, 0xcd, 0xed, 0xcb, 0x15, 0xc8, 0x39, 0x6e, 0xb3, 0xd9, 0x65, 0xfd, 0x69, 0x04, 0xfc, + 0xff, 0xee, 0x79, 0x57, 0x16, 0x1e, 0x06, 0xcf, 0xf6, 0xcd, 0xeb, 0xae, 0x65, 0x92, 0xcf, 0x1c, + 0x51, 0x0c, 0x77, 0x19, 0x43, 0x00, 0xb2, 0x5a, 0x1d, 0x7c, 0x7d, 0x0b, 0x1b, 0xe6, 0x86, 0x49, + 0x2f, 0x6e, 0x5f, 0x9a, 0x8b, 0xbe, 0x81, 0x85, 0x57, 0x53, 0x50, 0x54, 0xcd, 0x4e, 0xc3, 0x74, + 0x16, 0x0d, 0xa4, 0xb9, 0x07, 0xc8, 0x5e, 0x34, 0x0d, 0xc6, 0x27, 0x26, 0x4c, 0x03, 0xcd, 0x9c, + 0xec, 0x1e, 0x77, 0xee, 0x34, 0xa4, 0xea, 0xdd, 0x46, 0xe3, 0x50, 0x14, 0x20, 0xe1, 0x74, 0x1b, + 0xec, 0xc7, 0x56, 0xf8, 0xcf, 0xb9, 0x1f, 0x25, 0x20, 0x57, 0x57, 0x3a, 0x96, 0x8e, 0x6a, 0x06, + 0xaa, 0xb5, 0xc4, 0x22, 0xa4, 0xc9, 0x30, 0x9f, 0x21, 0x46, 0xb1, 0xab, 0x23, 0x12, 0x7b, 0xf6, + 0x34, 0x4b, 0xe4, 0x7e, 0x3b, 0xee, 0x69, 0x96, 0x3c, 0xcd, 0x39, 0x7a, 0xbd, 0xed, 0x69, 0xce, + 0x79, 0x9a, 0x65, 0x72, 0xc9, 0x9d, 0xf0, 0x34, 0xcb, 0x9e, 0x66, 0x85, 0x7c, 0xc4, 0x19, 0xf3, + 0x34, 0x2b, 0x9e, 0xe6, 0x3c, 0xf9, 0x6c, 0x93, 0xf4, 0x34, 0xe7, 0x3d, 0xcd, 0x05, 0xf2, 0xb5, + 0x66, 0xc2, 0xd3, 0x5c, 0xf0, 0x34, 0x17, 0xc9, 0x17, 0x1a, 0xd1, 0xd3, 0x5c, 0xf4, 0x34, 0x97, + 0xc8, 0x6f, 0xaa, 0x46, 0x3d, 0xcd, 0x25, 0x71, 0x06, 0x46, 0xe9, 0xc8, 0x9e, 0x26, 0x9f, 0xf1, + 0xc7, 0xaf, 0x8e, 0x48, 0x5c, 0xe0, 0xeb, 0x9e, 0x21, 0xbf, 0x9b, 0x4a, 0xfb, 0xba, 0x67, 0x7c, + 0xdd, 0x12, 0xf9, 0xef, 0x1b, 0x82, 0xaf, 0x5b, 0xf2, 0x75, 0xe7, 0x8a, 0x63, 0x38, 0x3b, 0x7c, + 0xdd, 0x39, 0x5f, 0xb7, 0x5c, 0x2c, 0xe0, 0xf8, 0xfb, 0xba, 0x65, 0x5f, 0xb7, 0x52, 0x1c, 0x9f, + 0x8d, 0xcd, 0xe7, 0x7d, 0xdd, 0x8a, 0xf8, 0x14, 0xe4, 0x9c, 0x6e, 0x43, 0x66, 0xfb, 0x3c, 0xf9, + 0x7d, 0x56, 0x6e, 0x09, 0x16, 0x70, 0x46, 0x90, 0x49, 0xbd, 0x3a, 0x22, 0x81, 0xd3, 0x6d, 0xb0, + 0x6d, 0x78, 0x35, 0x0f, 0xe4, 0xf6, 0x49, 0x26, 0x3f, 0xab, 0x5e, 0xbd, 0xfa, 0xd6, 0x9d, 0xd2, + 0xc8, 0x0f, 0xee, 0x94, 0x46, 0xfe, 0xe5, 0x4e, 0x69, 0xe4, 0xed, 0x3b, 0xa5, 0xd8, 0xfb, 0x77, + 0x4a, 0xb1, 0x0f, 0xee, 0x94, 0x62, 0xb7, 0x8f, 0x4a, 0xb1, 0x37, 0x8f, 0x4a, 0xb1, 0x6f, 0x1e, + 0x95, 0x62, 0xdf, 0x39, 0x2a, 0xc5, 0xde, 0x3a, 0x2a, 0x8d, 0xfc, 0xe0, 0xa8, 0x34, 0xf2, 0xf6, + 0x51, 0x29, 0xf6, 0xe3, 0xa3, 0xd2, 0xc8, 0xfb, 0x47, 0xa5, 0xd8, 0x07, 0x47, 0xa5, 0x91, 0xdb, + 0xef, 0x94, 0x46, 0xde, 0x7c, 0xa7, 0x14, 0x6b, 0xa4, 0x49, 0x2a, 0x9d, 0xfb, 0xff, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x05, 0x81, 0xd2, 0x46, 0x91, 0x35, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/neither/onepb_test.go golang-gogoprotobuf-1.3.1/test/oneof3/combos/neither/onepb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/neither/onepb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/neither/onepb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -199,6 +199,54 @@ } } +func TestSubbyCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSubby(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &Subby{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSubby(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestSampleOneOfCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSampleOneOf(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &SampleOneOf{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSampleOneOf(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} func TestOneDescription(t *testing.T) { OneDescription() } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/neither/one.proto golang-gogoprotobuf-1.3.1/test/oneof3/combos/neither/one.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/neither/one.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/neither/one.proto 2020-05-17 12:22:58.000000000 +0000 @@ -54,6 +54,8 @@ option (gogoproto.unsafe_marshaler_all) = false; option (gogoproto.unsafe_unmarshaler_all) = false; +option (gogoproto.compare_all) = true; + message Subby { string sub = 1; } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/unmarshaler/one.pb.go golang-gogoprotobuf-1.3.1/test/oneof3/combos/unmarshaler/one.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/unmarshaler/one.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/unmarshaler/one.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,7 +29,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Subby struct { Sub string `protobuf:"bytes,1,opt,name=sub,proto3" json:"sub,omitempty"` @@ -113,55 +113,56 @@ Equal(interface{}) bool VerboseEqual(interface{}) error Size() int + Compare(interface{}) int } type SampleOneOf_Field1 struct { - Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,proto3,oneof"` + Field1 float64 `protobuf:"fixed64,1,opt,name=Field1,proto3,oneof" json:"Field1,omitempty"` } type SampleOneOf_Field2 struct { - Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,proto3,oneof"` + Field2 float32 `protobuf:"fixed32,2,opt,name=Field2,proto3,oneof" json:"Field2,omitempty"` } type SampleOneOf_Field3 struct { - Field3 int32 `protobuf:"varint,3,opt,name=Field3,proto3,oneof"` + Field3 int32 `protobuf:"varint,3,opt,name=Field3,proto3,oneof" json:"Field3,omitempty"` } type SampleOneOf_Field4 struct { - Field4 int64 `protobuf:"varint,4,opt,name=Field4,proto3,oneof"` + Field4 int64 `protobuf:"varint,4,opt,name=Field4,proto3,oneof" json:"Field4,omitempty"` } type SampleOneOf_Field5 struct { - Field5 uint32 `protobuf:"varint,5,opt,name=Field5,proto3,oneof"` + Field5 uint32 `protobuf:"varint,5,opt,name=Field5,proto3,oneof" json:"Field5,omitempty"` } type SampleOneOf_Field6 struct { - Field6 uint64 `protobuf:"varint,6,opt,name=Field6,proto3,oneof"` + Field6 uint64 `protobuf:"varint,6,opt,name=Field6,proto3,oneof" json:"Field6,omitempty"` } type SampleOneOf_Field7 struct { - Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,proto3,oneof"` + Field7 int32 `protobuf:"zigzag32,7,opt,name=Field7,proto3,oneof" json:"Field7,omitempty"` } type SampleOneOf_Field8 struct { - Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,proto3,oneof"` + Field8 int64 `protobuf:"zigzag64,8,opt,name=Field8,proto3,oneof" json:"Field8,omitempty"` } type SampleOneOf_Field9 struct { - Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,proto3,oneof"` + Field9 uint32 `protobuf:"fixed32,9,opt,name=Field9,proto3,oneof" json:"Field9,omitempty"` } type SampleOneOf_Field10 struct { - Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,proto3,oneof"` + Field10 int32 `protobuf:"fixed32,10,opt,name=Field10,proto3,oneof" json:"Field10,omitempty"` } type SampleOneOf_Field11 struct { - Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,proto3,oneof"` + Field11 uint64 `protobuf:"fixed64,11,opt,name=Field11,proto3,oneof" json:"Field11,omitempty"` } type SampleOneOf_Field12 struct { - Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,proto3,oneof"` + Field12 int64 `protobuf:"fixed64,12,opt,name=Field12,proto3,oneof" json:"Field12,omitempty"` } type SampleOneOf_Field13 struct { - Field13 bool `protobuf:"varint,13,opt,name=Field13,proto3,oneof"` + Field13 bool `protobuf:"varint,13,opt,name=Field13,proto3,oneof" json:"Field13,omitempty"` } type SampleOneOf_Field14 struct { - Field14 string `protobuf:"bytes,14,opt,name=Field14,proto3,oneof"` + Field14 string `protobuf:"bytes,14,opt,name=Field14,proto3,oneof" json:"Field14,omitempty"` } type SampleOneOf_Field15 struct { - Field15 []byte `protobuf:"bytes,15,opt,name=Field15,proto3,oneof"` + Field15 []byte `protobuf:"bytes,15,opt,name=Field15,proto3,oneof" json:"Field15,omitempty"` } type SampleOneOf_SubMessage struct { - SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,proto3,oneof"` + SubMessage *Subby `protobuf:"bytes,16,opt,name=sub_message,json=subMessage,proto3,oneof" json:"sub_message,omitempty"` } func (*SampleOneOf_Field1) isSampleOneOf_TestOneof() {} @@ -300,9 +301,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*SampleOneOf) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _SampleOneOf_OneofMarshaler, _SampleOneOf_OneofUnmarshaler, _SampleOneOf_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*SampleOneOf) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*SampleOneOf_Field1)(nil), (*SampleOneOf_Field2)(nil), (*SampleOneOf_Field3)(nil), @@ -322,292 +323,722 @@ } } -func _SampleOneOf_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*SampleOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *SampleOneOf_Field1: - _ = b.EncodeVarint(1<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.Field1)) - case *SampleOneOf_Field2: - _ = b.EncodeVarint(2<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(math.Float32bits(x.Field2))) - case *SampleOneOf_Field3: - _ = b.EncodeVarint(3<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field3)) - case *SampleOneOf_Field4: - _ = b.EncodeVarint(4<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field4)) - case *SampleOneOf_Field5: - _ = b.EncodeVarint(5<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field5)) - case *SampleOneOf_Field6: - _ = b.EncodeVarint(6<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.Field6)) - case *SampleOneOf_Field7: - _ = b.EncodeVarint(7<<3 | proto.WireVarint) - _ = b.EncodeZigzag32(uint64(x.Field7)) - case *SampleOneOf_Field8: - _ = b.EncodeVarint(8<<3 | proto.WireVarint) - _ = b.EncodeZigzag64(uint64(x.Field8)) - case *SampleOneOf_Field9: - _ = b.EncodeVarint(9<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field9)) - case *SampleOneOf_Field10: - _ = b.EncodeVarint(10<<3 | proto.WireFixed32) - _ = b.EncodeFixed32(uint64(x.Field10)) - case *SampleOneOf_Field11: - _ = b.EncodeVarint(11<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field11)) - case *SampleOneOf_Field12: - _ = b.EncodeVarint(12<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(uint64(x.Field12)) - case *SampleOneOf_Field13: - t := uint64(0) - if x.Field13 { - t = 1 - } - _ = b.EncodeVarint(13<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *SampleOneOf_Field14: - _ = b.EncodeVarint(14<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.Field14) - case *SampleOneOf_Field15: - _ = b.EncodeVarint(15<<3 | proto.WireBytes) - _ = b.EncodeRawBytes(x.Field15) - case *SampleOneOf_SubMessage: - _ = b.EncodeVarint(16<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.SubMessage); err != nil { - return err +func init() { + proto.RegisterType((*Subby)(nil), "one.Subby") + proto.RegisterType((*SampleOneOf)(nil), "one.SampleOneOf") +} + +func init() { proto.RegisterFile("combos/unmarshaler/one.proto", fileDescriptor_9eef12518f7c4f58) } + +var fileDescriptor_9eef12518f7c4f58 = []byte{ + // 411 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0xd2, 0xbf, 0x4f, 0x1b, 0x31, + 0x14, 0x07, 0x70, 0x3f, 0x8e, 0x24, 0xe0, 0x84, 0x92, 0xde, 0xf4, 0x8a, 0xaa, 0x27, 0x8b, 0xc9, + 0x0b, 0x49, 0x73, 0x97, 0xf0, 0x63, 0x65, 0xa8, 0xb2, 0x54, 0x48, 0xe1, 0x0f, 0x40, 0x31, 0x75, + 0x02, 0x52, 0xee, 0x8c, 0x72, 0xb9, 0xa1, 0x1b, 0x7f, 0x0e, 0x63, 0xc7, 0xfe, 0x09, 0x8c, 0x8c, + 0x1d, 0x3a, 0x70, 0x66, 0xe9, 0xc8, 0xc8, 0x58, 0xe5, 0x52, 0x9e, 0xb7, 0xf7, 0xf5, 0xc7, 0x1e, + 0x6c, 0x7f, 0xe5, 0xe7, 0x6b, 0x97, 0x19, 0x57, 0xf4, 0xcb, 0x3c, 0x9b, 0x2e, 0x8b, 0x9b, 0xe9, + 0xc2, 0x2e, 0xfb, 0x2e, 0xb7, 0xbd, 0xbb, 0xa5, 0x5b, 0xb9, 0x38, 0x72, 0xb9, 0x3d, 0x38, 0x9a, + 0xdf, 0xae, 0x6e, 0x4a, 0xd3, 0xbb, 0x76, 0x59, 0x7f, 0xee, 0xe6, 0xae, 0x5f, 0x9b, 0x29, 0x67, + 0x75, 0xaa, 0x43, 0x3d, 0x6d, 0xce, 0x1c, 0x7e, 0x92, 0x8d, 0xcb, 0xd2, 0x98, 0x1f, 0x71, 0x57, + 0x46, 0x45, 0x69, 0x10, 0x14, 0xe8, 0xdd, 0xc9, 0x7a, 0x3c, 0xfc, 0x13, 0xc9, 0xf6, 0xe5, 0x34, + 0xbb, 0x5b, 0xd8, 0x8b, 0xdc, 0x5e, 0xcc, 0x62, 0x94, 0xcd, 0xaf, 0xb7, 0x76, 0xf1, 0x7d, 0x50, + 0x6f, 0x82, 0xb1, 0x98, 0xfc, 0xcf, 0x2c, 0x09, 0x6e, 0x29, 0xd0, 0x5b, 0x2c, 0x09, 0x4b, 0x8a, + 0x91, 0x02, 0xdd, 0x60, 0x49, 0x59, 0x86, 0xb8, 0xad, 0x40, 0x47, 0x2c, 0x43, 0x96, 0x11, 0x36, + 0x14, 0xe8, 0x3d, 0x96, 0x11, 0xcb, 0x31, 0x36, 0x15, 0xe8, 0x6d, 0x96, 0x63, 0x96, 0x13, 0x6c, + 0x29, 0xd0, 0x1f, 0x59, 0x4e, 0x58, 0x4e, 0x71, 0x47, 0x81, 0x8e, 0x59, 0x4e, 0x59, 0xce, 0x70, + 0x57, 0x81, 0x6e, 0xb1, 0x9c, 0xc5, 0x07, 0xb2, 0xb5, 0xb9, 0xd9, 0x17, 0x94, 0x0a, 0xf4, 0xfe, + 0x58, 0x4c, 0xde, 0x17, 0x82, 0x0d, 0xb0, 0xad, 0x40, 0x37, 0x83, 0x0d, 0x82, 0x25, 0xd8, 0x51, + 0xa0, 0xbb, 0xc1, 0x92, 0x60, 0x29, 0xee, 0x29, 0xd0, 0x3b, 0xc1, 0xd2, 0x60, 0x43, 0xfc, 0xb0, + 0x7e, 0xff, 0x60, 0xc3, 0x60, 0x23, 0xdc, 0x57, 0xa0, 0x3b, 0xc1, 0x46, 0xf1, 0x91, 0x6c, 0x17, + 0xa5, 0xb9, 0xca, 0x6c, 0x51, 0x4c, 0xe7, 0x16, 0xbb, 0x0a, 0x74, 0x3b, 0x91, 0xbd, 0x75, 0x23, + 0xea, 0x4f, 0x1d, 0x8b, 0x89, 0x2c, 0x4a, 0xf3, 0x6d, 0xe3, 0xe7, 0x1d, 0x29, 0x57, 0xb6, 0x58, + 0x5d, 0xb9, 0xdc, 0xba, 0xd9, 0xf9, 0xf8, 0xb1, 0x22, 0xf1, 0x54, 0x91, 0xf8, 0x5d, 0x91, 0x78, + 0xae, 0x08, 0x5e, 0x2b, 0x82, 0xb7, 0x8a, 0xe0, 0xde, 0x13, 0x3c, 0x78, 0x82, 0x9f, 0x9e, 0xe0, + 0x97, 0x27, 0x78, 0xf4, 0x24, 0x9e, 0x3c, 0xc1, 0xb3, 0x27, 0xf8, 0xeb, 0x49, 0xbc, 0x7a, 0x82, + 0x37, 0x4f, 0xe2, 0xfe, 0x85, 0xc4, 0xc3, 0x0b, 0x81, 0x69, 0xd6, 0x55, 0x4a, 0xff, 0x05, 0x00, + 0x00, 0xff, 0xff, 0xa2, 0x4d, 0xbb, 0xd8, 0x9e, 0x02, 0x00, 0x00, +} + +func (this *Subby) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 } - case nil: - default: - return fmt.Errorf("SampleOneOf.TestOneof has unexpected type %T", x) + return 1 } - return nil + + that1, ok := that.(*Subby) + if !ok { + that2, ok := that.(Subby) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Sub != that1.Sub { + if this.Sub < that1.Sub { + return -1 + } + return 1 + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 } +func (this *SampleOneOf) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func _SampleOneOf_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*SampleOneOf) - switch tag { - case 1: // test_oneof.Field1 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field1{math.Float64frombits(x)} - return true, err - case 2: // test_oneof.Field2 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field2{math.Float32frombits(uint32(x))} - return true, err - case 3: // test_oneof.Field3 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field3{int32(x)} - return true, err - case 4: // test_oneof.Field4 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field4{int64(x)} - return true, err - case 5: // test_oneof.Field5 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field5{uint32(x)} - return true, err - case 6: // test_oneof.Field6 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field6{x} - return true, err - case 7: // test_oneof.Field7 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag32() - m.TestOneof = &SampleOneOf_Field7{int32(x)} - return true, err - case 8: // test_oneof.Field8 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeZigzag64() - m.TestOneof = &SampleOneOf_Field8{int64(x)} - return true, err - case 9: // test_oneof.Field9 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field9{uint32(x)} - return true, err - case 10: // test_oneof.Field10 - if wire != proto.WireFixed32 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed32() - m.TestOneof = &SampleOneOf_Field10{int32(x)} - return true, err - case 11: // test_oneof.Field11 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field11{x} - return true, err - case 12: // test_oneof.Field12 - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.TestOneof = &SampleOneOf_Field12{int64(x)} - return true, err - case 13: // test_oneof.Field13 - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.TestOneof = &SampleOneOf_Field13{x != 0} - return true, err - case 14: // test_oneof.Field14 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.TestOneof = &SampleOneOf_Field14{x} - return true, err - case 15: // test_oneof.Field15 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - m.TestOneof = &SampleOneOf_Field15{x} - return true, err - case 16: // test_oneof.sub_message - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Subby) - err := b.DecodeMessage(msg) - m.TestOneof = &SampleOneOf_SubMessage{msg} - return true, err - default: - return false, nil + that1, ok := that.(*SampleOneOf) + if !ok { + that2, ok := that.(SampleOneOf) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.TestOneof == nil { + if this.TestOneof != nil { + return 1 + } + } else if this.TestOneof == nil { + return -1 + } else { + thisType := -1 + switch this.TestOneof.(type) { + case *SampleOneOf_Field1: + thisType = 0 + case *SampleOneOf_Field2: + thisType = 1 + case *SampleOneOf_Field3: + thisType = 2 + case *SampleOneOf_Field4: + thisType = 3 + case *SampleOneOf_Field5: + thisType = 4 + case *SampleOneOf_Field6: + thisType = 5 + case *SampleOneOf_Field7: + thisType = 6 + case *SampleOneOf_Field8: + thisType = 7 + case *SampleOneOf_Field9: + thisType = 8 + case *SampleOneOf_Field10: + thisType = 9 + case *SampleOneOf_Field11: + thisType = 10 + case *SampleOneOf_Field12: + thisType = 11 + case *SampleOneOf_Field13: + thisType = 12 + case *SampleOneOf_Field14: + thisType = 13 + case *SampleOneOf_Field15: + thisType = 14 + case *SampleOneOf_SubMessage: + thisType = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.TestOneof)) + } + that1Type := -1 + switch that1.TestOneof.(type) { + case *SampleOneOf_Field1: + that1Type = 0 + case *SampleOneOf_Field2: + that1Type = 1 + case *SampleOneOf_Field3: + that1Type = 2 + case *SampleOneOf_Field4: + that1Type = 3 + case *SampleOneOf_Field5: + that1Type = 4 + case *SampleOneOf_Field6: + that1Type = 5 + case *SampleOneOf_Field7: + that1Type = 6 + case *SampleOneOf_Field8: + that1Type = 7 + case *SampleOneOf_Field9: + that1Type = 8 + case *SampleOneOf_Field10: + that1Type = 9 + case *SampleOneOf_Field11: + that1Type = 10 + case *SampleOneOf_Field12: + that1Type = 11 + case *SampleOneOf_Field13: + that1Type = 12 + case *SampleOneOf_Field14: + that1Type = 13 + case *SampleOneOf_Field15: + that1Type = 14 + case *SampleOneOf_SubMessage: + that1Type = 15 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.TestOneof)) + } + if thisType == that1Type { + if c := this.TestOneof.Compare(that1.TestOneof); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 } +func (this *SampleOneOf_Field1) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func _SampleOneOf_OneofSizer(msg proto.Message) (n int) { - m := msg.(*SampleOneOf) - // test_oneof - switch x := m.TestOneof.(type) { - case *SampleOneOf_Field1: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field2: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field3: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field3)) - case *SampleOneOf_Field4: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field4)) - case *SampleOneOf_Field5: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field5)) - case *SampleOneOf_Field6: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.Field6)) - case *SampleOneOf_Field7: - n += 1 // tag and wire - n += proto.SizeVarint(uint64((uint32(x.Field7) << 1) ^ uint32((int32(x.Field7) >> 31)))) - case *SampleOneOf_Field8: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(uint64(x.Field8<<1) ^ uint64((int64(x.Field8) >> 63)))) - case *SampleOneOf_Field9: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field10: - n += 1 // tag and wire - n += 4 - case *SampleOneOf_Field11: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field12: - n += 1 // tag and wire - n += 8 - case *SampleOneOf_Field13: - n += 1 // tag and wire - n += 1 - case *SampleOneOf_Field14: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field14))) - n += len(x.Field14) - case *SampleOneOf_Field15: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.Field15))) - n += len(x.Field15) - case *SampleOneOf_SubMessage: - s := proto.Size(x.SubMessage) - n += 2 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) + that1, ok := that.(*SampleOneOf_Field1) + if !ok { + that2, ok := that.(SampleOneOf_Field1) + if ok { + that1 = &that2 + } else { + return 1 + } } - return n + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field1 != that1.Field1 { + if this.Field1 < that1.Field1 { + return -1 + } + return 1 + } + return 0 } +func (this *SampleOneOf_Field2) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func init() { - proto.RegisterType((*Subby)(nil), "one.Subby") - proto.RegisterType((*SampleOneOf)(nil), "one.SampleOneOf") + that1, ok := that.(*SampleOneOf_Field2) + if !ok { + that2, ok := that.(SampleOneOf_Field2) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field2 != that1.Field2 { + if this.Field2 < that1.Field2 { + return -1 + } + return 1 + } + return 0 } +func (this *SampleOneOf_Field3) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -func init() { proto.RegisterFile("combos/unmarshaler/one.proto", fileDescriptor_9eef12518f7c4f58) } + that1, ok := that.(*SampleOneOf_Field3) + if !ok { + that2, ok := that.(SampleOneOf_Field3) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field3 != that1.Field3 { + if this.Field3 < that1.Field3 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field4) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } -var fileDescriptor_9eef12518f7c4f58 = []byte{ - // 409 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0xd2, 0xbf, 0x4f, 0x1b, 0x31, - 0x14, 0x07, 0x70, 0x3f, 0x8e, 0x24, 0xe0, 0x84, 0x92, 0xde, 0xf4, 0x8a, 0xaa, 0x27, 0x8b, 0xc9, - 0x0b, 0x49, 0x73, 0x97, 0xf0, 0x63, 0x45, 0x55, 0x95, 0xa5, 0x42, 0x0a, 0x7f, 0x00, 0x8a, 0xa9, - 0x13, 0x90, 0x72, 0x67, 0x94, 0xcb, 0x0d, 0xdd, 0xf8, 0x73, 0x3a, 0x76, 0xec, 0x9f, 0xc0, 0xc8, - 0xd8, 0xa1, 0x03, 0xe7, 0x2e, 0x1d, 0x19, 0x33, 0x56, 0xb9, 0xb4, 0xcf, 0xdb, 0xfb, 0xfa, 0x63, - 0x0f, 0xb6, 0xbf, 0xf2, 0xfd, 0xad, 0xcb, 0x8c, 0x2b, 0xfa, 0x65, 0x9e, 0x4d, 0x97, 0xc5, 0xdd, - 0x74, 0x61, 0x97, 0x7d, 0x97, 0xdb, 0xde, 0xc3, 0xd2, 0xad, 0x5c, 0x1c, 0xb9, 0xdc, 0x1e, 0x9d, - 0xcc, 0xef, 0x57, 0x77, 0xa5, 0xe9, 0xdd, 0xba, 0xac, 0x3f, 0x77, 0x73, 0xd7, 0xaf, 0xcd, 0x94, - 0xb3, 0x3a, 0xd5, 0xa1, 0x9e, 0xb6, 0x67, 0x8e, 0xdf, 0xc9, 0xc6, 0x75, 0x69, 0xcc, 0xd7, 0xb8, - 0x2b, 0xa3, 0xa2, 0x34, 0x08, 0x0a, 0xf4, 0xfe, 0x64, 0x33, 0x1e, 0xff, 0x8a, 0x64, 0xfb, 0x7a, - 0x9a, 0x3d, 0x2c, 0xec, 0x55, 0x6e, 0xaf, 0x66, 0x31, 0xca, 0xe6, 0xa7, 0x7b, 0xbb, 0xf8, 0x32, - 0xa8, 0x37, 0xc1, 0x58, 0x4c, 0xfe, 0x65, 0x96, 0x04, 0x77, 0x14, 0xe8, 0x1d, 0x96, 0x84, 0x25, - 0xc5, 0x48, 0x81, 0x6e, 0xb0, 0xa4, 0x2c, 0x43, 0xdc, 0x55, 0xa0, 0x23, 0x96, 0x21, 0xcb, 0x08, - 0x1b, 0x0a, 0xf4, 0x01, 0xcb, 0x88, 0xe5, 0x14, 0x9b, 0x0a, 0xf4, 0x2e, 0xcb, 0x29, 0xcb, 0x19, - 0xb6, 0x14, 0xe8, 0xb7, 0x2c, 0x67, 0x2c, 0xe7, 0xb8, 0xa7, 0x40, 0xc7, 0x2c, 0xe7, 0x2c, 0x17, - 0xb8, 0xaf, 0x40, 0xb7, 0x58, 0x2e, 0xe2, 0x23, 0xd9, 0xda, 0xde, 0xec, 0x03, 0x4a, 0x05, 0xfa, - 0x70, 0x2c, 0x26, 0xff, 0x17, 0x82, 0x0d, 0xb0, 0xad, 0x40, 0x37, 0x83, 0x0d, 0x82, 0x25, 0xd8, - 0x51, 0xa0, 0xbb, 0xc1, 0x92, 0x60, 0x29, 0x1e, 0x28, 0xd0, 0x7b, 0xc1, 0xd2, 0x60, 0x43, 0x7c, - 0xb3, 0x79, 0xff, 0x60, 0xc3, 0x60, 0x23, 0x3c, 0x54, 0xa0, 0x3b, 0xc1, 0x46, 0xf1, 0x89, 0x6c, - 0x17, 0xa5, 0xb9, 0xc9, 0x6c, 0x51, 0x4c, 0xe7, 0x16, 0xbb, 0x0a, 0x74, 0x3b, 0x91, 0xbd, 0x4d, - 0x23, 0xea, 0x4f, 0x1d, 0x8b, 0x89, 0x2c, 0x4a, 0xf3, 0x79, 0xeb, 0x97, 0x1d, 0x29, 0x57, 0xb6, - 0x58, 0xdd, 0xb8, 0xdc, 0xba, 0xd9, 0xe5, 0xc7, 0xa7, 0x8a, 0xc4, 0x73, 0x45, 0xe2, 0x67, 0x45, - 0xe2, 0xa5, 0x22, 0x78, 0xad, 0x08, 0xd6, 0x15, 0xc1, 0xa3, 0x27, 0xf8, 0xe6, 0x09, 0xbe, 0x7b, - 0x82, 0x1f, 0x9e, 0xe0, 0xc9, 0x93, 0x78, 0xf6, 0x04, 0x2f, 0x9e, 0xe0, 0x8f, 0x27, 0xf1, 0xea, - 0x09, 0xd6, 0x9e, 0xc4, 0xe3, 0x6f, 0x12, 0xa6, 0x59, 0xd7, 0x28, 0xfd, 0x1b, 0x00, 0x00, 0xff, - 0xff, 0x3b, 0xfb, 0xd3, 0x99, 0x9a, 0x02, 0x00, 0x00, + that1, ok := that.(*SampleOneOf_Field4) + if !ok { + that2, ok := that.(SampleOneOf_Field4) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field4 != that1.Field4 { + if this.Field4 < that1.Field4 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field5) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field5) + if !ok { + that2, ok := that.(SampleOneOf_Field5) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field5 != that1.Field5 { + if this.Field5 < that1.Field5 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field6) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field6) + if !ok { + that2, ok := that.(SampleOneOf_Field6) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field6 != that1.Field6 { + if this.Field6 < that1.Field6 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field7) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field7) + if !ok { + that2, ok := that.(SampleOneOf_Field7) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field7 != that1.Field7 { + if this.Field7 < that1.Field7 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field8) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field8) + if !ok { + that2, ok := that.(SampleOneOf_Field8) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field8 != that1.Field8 { + if this.Field8 < that1.Field8 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field9) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field9) + if !ok { + that2, ok := that.(SampleOneOf_Field9) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field9 != that1.Field9 { + if this.Field9 < that1.Field9 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field10) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field10) + if !ok { + that2, ok := that.(SampleOneOf_Field10) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field10 != that1.Field10 { + if this.Field10 < that1.Field10 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field11) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field11) + if !ok { + that2, ok := that.(SampleOneOf_Field11) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field11 != that1.Field11 { + if this.Field11 < that1.Field11 { + return -1 + } + return 1 + } + return 0 } +func (this *SampleOneOf_Field12) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + that1, ok := that.(*SampleOneOf_Field12) + if !ok { + that2, ok := that.(SampleOneOf_Field12) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field12 != that1.Field12 { + if this.Field12 < that1.Field12 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field13) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field13) + if !ok { + that2, ok := that.(SampleOneOf_Field13) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field13 != that1.Field13 { + if !this.Field13 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field14) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field14) + if !ok { + that2, ok := that.(SampleOneOf_Field14) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.Field14 != that1.Field14 { + if this.Field14 < that1.Field14 { + return -1 + } + return 1 + } + return 0 +} +func (this *SampleOneOf_Field15) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_Field15) + if !ok { + that2, ok := that.(SampleOneOf_Field15) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := bytes.Compare(this.Field15, that1.Field15); c != 0 { + return c + } + return 0 +} +func (this *SampleOneOf_SubMessage) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*SampleOneOf_SubMessage) + if !ok { + that2, ok := that.(SampleOneOf_SubMessage) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.SubMessage.Compare(that1.SubMessage); c != 0 { + return c + } + return 0 +} func (this *Subby) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { return OneDescription() } @@ -617,265 +1048,265 @@ func OneDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 4115 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0x1b, 0xe7, - 0x75, 0x26, 0xae, 0x04, 0x0e, 0x40, 0x70, 0xb9, 0xa4, 0x25, 0x88, 0xb6, 0x21, 0x89, 0xb6, 0x63, - 0xda, 0x8e, 0x29, 0x9b, 0x22, 0x75, 0x81, 0x9a, 0xb8, 0x20, 0x09, 0x51, 0x74, 0x49, 0x82, 0x59, - 0x90, 0xf1, 0x25, 0xd3, 0xd9, 0x59, 0x2c, 0x7e, 0x80, 0x2b, 0x2d, 0x76, 0x37, 0xbb, 0x0b, 0xc9, - 0xd4, 0xf4, 0x41, 0x1d, 0xf7, 0x32, 0x99, 0xde, 0x2f, 0x33, 0x4d, 0x5c, 0xc7, 0x6d, 0xd2, 0x69, - 0x9c, 0xa6, 0xb7, 0xa4, 0x97, 0x34, 0x49, 0x5f, 0xfa, 0x92, 0xd6, 0x4f, 0x9d, 0xe4, 0xad, 0x0f, - 0x79, 0xb0, 0x18, 0xcf, 0x34, 0x6d, 0xdd, 0xd6, 0x6d, 0xf5, 0xe0, 0x19, 0xbf, 0x74, 0xfe, 0xdb, - 0xde, 0x00, 0x6a, 0xc1, 0xcc, 0xd8, 0x79, 0x12, 0xf7, 0x9c, 0xf3, 0x7d, 0x7b, 0xfe, 0xf3, 0x9f, - 0xff, 0xfc, 0xe7, 0xff, 0x17, 0x82, 0xb7, 0xaa, 0x70, 0xa6, 0x6b, 0x9a, 0x5d, 0x1d, 0x9d, 0xb3, - 0x6c, 0xd3, 0x35, 0x5b, 0xfd, 0xce, 0xb9, 0x36, 0x72, 0x54, 0x5b, 0xb3, 0x5c, 0xd3, 0x5e, 0x20, - 0x32, 0x71, 0x92, 0x5a, 0x2c, 0x70, 0x8b, 0xb9, 0x2d, 0x98, 0xba, 0xaa, 0xe9, 0x68, 0xcd, 0x33, - 0x6c, 0x22, 0x57, 0xbc, 0x04, 0xe9, 0x8e, 0xa6, 0xa3, 0x72, 0xe2, 0x4c, 0x6a, 0xbe, 0xb0, 0xf8, - 0xe8, 0x42, 0x04, 0xb4, 0x10, 0x46, 0xec, 0x60, 0xb1, 0x44, 0x10, 0x73, 0xef, 0xa4, 0x61, 0x7a, - 0x88, 0x56, 0x14, 0x21, 0x6d, 0x28, 0x3d, 0xcc, 0x98, 0x98, 0xcf, 0x4b, 0xe4, 0x6f, 0xb1, 0x0c, - 0xe3, 0x96, 0xa2, 0xde, 0x50, 0xba, 0xa8, 0x9c, 0x24, 0x62, 0xfe, 0x28, 0x56, 0x00, 0xda, 0xc8, - 0x42, 0x46, 0x1b, 0x19, 0xea, 0x41, 0x39, 0x75, 0x26, 0x35, 0x9f, 0x97, 0x02, 0x12, 0xf1, 0x29, - 0x98, 0xb2, 0xfa, 0x2d, 0x5d, 0x53, 0xe5, 0x80, 0x19, 0x9c, 0x49, 0xcd, 0x67, 0x24, 0x81, 0x2a, - 0xd6, 0x7c, 0xe3, 0xc7, 0x61, 0xf2, 0x16, 0x52, 0x6e, 0x04, 0x4d, 0x0b, 0xc4, 0xb4, 0x84, 0xc5, - 0x01, 0xc3, 0x55, 0x28, 0xf6, 0x90, 0xe3, 0x28, 0x5d, 0x24, 0xbb, 0x07, 0x16, 0x2a, 0xa7, 0xc9, - 0xe8, 0xcf, 0x0c, 0x8c, 0x3e, 0x3a, 0xf2, 0x02, 0x43, 0xed, 0x1e, 0x58, 0x48, 0xac, 0x41, 0x1e, - 0x19, 0xfd, 0x1e, 0x65, 0xc8, 0x1c, 0x11, 0xbf, 0xba, 0xd1, 0xef, 0x45, 0x59, 0x72, 0x18, 0xc6, - 0x28, 0xc6, 0x1d, 0x64, 0xdf, 0xd4, 0x54, 0x54, 0xce, 0x12, 0x82, 0xc7, 0x07, 0x08, 0x9a, 0x54, - 0x1f, 0xe5, 0xe0, 0x38, 0x71, 0x15, 0xf2, 0xe8, 0x15, 0x17, 0x19, 0x8e, 0x66, 0x1a, 0xe5, 0x71, - 0x42, 0xf2, 0xd8, 0x90, 0x59, 0x44, 0x7a, 0x3b, 0x4a, 0xe1, 0xe3, 0xc4, 0x0b, 0x30, 0x6e, 0x5a, - 0xae, 0x66, 0x1a, 0x4e, 0x39, 0x77, 0x26, 0x31, 0x5f, 0x58, 0x7c, 0x68, 0x68, 0x22, 0x34, 0xa8, - 0x8d, 0xc4, 0x8d, 0xc5, 0x0d, 0x10, 0x1c, 0xb3, 0x6f, 0xab, 0x48, 0x56, 0xcd, 0x36, 0x92, 0x35, - 0xa3, 0x63, 0x96, 0xf3, 0x84, 0xe0, 0xf4, 0xe0, 0x40, 0x88, 0xe1, 0xaa, 0xd9, 0x46, 0x1b, 0x46, - 0xc7, 0x94, 0x4a, 0x4e, 0xe8, 0x59, 0x3c, 0x01, 0x59, 0xe7, 0xc0, 0x70, 0x95, 0x57, 0xca, 0x45, - 0x92, 0x21, 0xec, 0x69, 0xee, 0xdb, 0x59, 0x98, 0x1c, 0x25, 0xc5, 0xae, 0x40, 0xa6, 0x83, 0x47, - 0x59, 0x4e, 0x1e, 0x27, 0x06, 0x14, 0x13, 0x0e, 0x62, 0xf6, 0xc7, 0x0c, 0x62, 0x0d, 0x0a, 0x06, - 0x72, 0x5c, 0xd4, 0xa6, 0x19, 0x91, 0x1a, 0x31, 0xa7, 0x80, 0x82, 0x06, 0x53, 0x2a, 0xfd, 0x63, - 0xa5, 0xd4, 0x8b, 0x30, 0xe9, 0xb9, 0x24, 0xdb, 0x8a, 0xd1, 0xe5, 0xb9, 0x79, 0x2e, 0xce, 0x93, - 0x85, 0x3a, 0xc7, 0x49, 0x18, 0x26, 0x95, 0x50, 0xe8, 0x59, 0x5c, 0x03, 0x30, 0x0d, 0x64, 0x76, - 0xe4, 0x36, 0x52, 0xf5, 0x72, 0xee, 0x88, 0x28, 0x35, 0xb0, 0xc9, 0x40, 0x94, 0x4c, 0x2a, 0x55, - 0x75, 0xf1, 0xb2, 0x9f, 0x6a, 0xe3, 0x47, 0x64, 0xca, 0x16, 0x5d, 0x64, 0x03, 0xd9, 0xb6, 0x07, - 0x25, 0x1b, 0xe1, 0xbc, 0x47, 0x6d, 0x36, 0xb2, 0x3c, 0x71, 0x62, 0x21, 0x76, 0x64, 0x12, 0x83, - 0xd1, 0x81, 0x4d, 0xd8, 0xc1, 0x47, 0xf1, 0x11, 0xf0, 0x04, 0x32, 0x49, 0x2b, 0x20, 0x55, 0xa8, - 0xc8, 0x85, 0xdb, 0x4a, 0x0f, 0xcd, 0xde, 0x86, 0x52, 0x38, 0x3c, 0xe2, 0x0c, 0x64, 0x1c, 0x57, - 0xb1, 0x5d, 0x92, 0x85, 0x19, 0x89, 0x3e, 0x88, 0x02, 0xa4, 0x90, 0xd1, 0x26, 0x55, 0x2e, 0x23, - 0xe1, 0x3f, 0xc5, 0x9f, 0xf6, 0x07, 0x9c, 0x22, 0x03, 0xfe, 0xd8, 0xe0, 0x8c, 0x86, 0x98, 0xa3, - 0xe3, 0x9e, 0xbd, 0x08, 0x13, 0xa1, 0x01, 0x8c, 0xfa, 0xea, 0xb9, 0x9f, 0x83, 0x07, 0x86, 0x52, - 0x8b, 0x2f, 0xc2, 0x4c, 0xdf, 0xd0, 0x0c, 0x17, 0xd9, 0x96, 0x8d, 0x70, 0xc6, 0xd2, 0x57, 0x95, - 0xff, 0x75, 0xfc, 0x88, 0x9c, 0xdb, 0x0b, 0x5a, 0x53, 0x16, 0x69, 0xba, 0x3f, 0x28, 0x7c, 0x32, - 0x9f, 0xfb, 0xd1, 0xb8, 0x70, 0xe7, 0xce, 0x9d, 0x3b, 0xc9, 0xb9, 0xcf, 0x67, 0x61, 0x66, 0xd8, - 0x9a, 0x19, 0xba, 0x7c, 0x4f, 0x40, 0xd6, 0xe8, 0xf7, 0x5a, 0xc8, 0x26, 0x41, 0xca, 0x48, 0xec, - 0x49, 0xac, 0x41, 0x46, 0x57, 0x5a, 0x48, 0x2f, 0xa7, 0xcf, 0x24, 0xe6, 0x4b, 0x8b, 0x4f, 0x8d, - 0xb4, 0x2a, 0x17, 0x36, 0x31, 0x44, 0xa2, 0x48, 0xf1, 0x93, 0x90, 0x66, 0x25, 0x1a, 0x33, 0x3c, - 0x39, 0x1a, 0x03, 0x5e, 0x4b, 0x12, 0xc1, 0x89, 0x0f, 0x42, 0x1e, 0xff, 0x4b, 0x73, 0x23, 0x4b, - 0x7c, 0xce, 0x61, 0x01, 0xce, 0x0b, 0x71, 0x16, 0x72, 0x64, 0x99, 0xb4, 0x11, 0xdf, 0xda, 0xbc, - 0x67, 0x9c, 0x58, 0x6d, 0xd4, 0x51, 0xfa, 0xba, 0x2b, 0xdf, 0x54, 0xf4, 0x3e, 0x22, 0x09, 0x9f, - 0x97, 0x8a, 0x4c, 0xf8, 0x69, 0x2c, 0x13, 0x4f, 0x43, 0x81, 0xae, 0x2a, 0xcd, 0x68, 0xa3, 0x57, - 0x48, 0xf5, 0xcc, 0x48, 0x74, 0xa1, 0x6d, 0x60, 0x09, 0x7e, 0xfd, 0x75, 0xc7, 0x34, 0x78, 0x6a, - 0x92, 0x57, 0x60, 0x01, 0x79, 0xfd, 0xc5, 0x68, 0xe1, 0x7e, 0x78, 0xf8, 0xf0, 0xa2, 0x39, 0x35, - 0xf7, 0xcd, 0x24, 0xa4, 0x49, 0xbd, 0x98, 0x84, 0xc2, 0xee, 0x4b, 0x3b, 0x75, 0x79, 0xad, 0xb1, - 0xb7, 0xb2, 0x59, 0x17, 0x12, 0x62, 0x09, 0x80, 0x08, 0xae, 0x6e, 0x36, 0x6a, 0xbb, 0x42, 0xd2, - 0x7b, 0xde, 0xd8, 0xde, 0xbd, 0xb0, 0x24, 0xa4, 0x3c, 0xc0, 0x1e, 0x15, 0xa4, 0x83, 0x06, 0xe7, - 0x17, 0x85, 0x8c, 0x28, 0x40, 0x91, 0x12, 0x6c, 0xbc, 0x58, 0x5f, 0xbb, 0xb0, 0x24, 0x64, 0xc3, - 0x92, 0xf3, 0x8b, 0xc2, 0xb8, 0x38, 0x01, 0x79, 0x22, 0x59, 0x69, 0x34, 0x36, 0x85, 0x9c, 0xc7, - 0xd9, 0xdc, 0x95, 0x36, 0xb6, 0xd7, 0x85, 0xbc, 0xc7, 0xb9, 0x2e, 0x35, 0xf6, 0x76, 0x04, 0xf0, - 0x18, 0xb6, 0xea, 0xcd, 0x66, 0x6d, 0xbd, 0x2e, 0x14, 0x3c, 0x8b, 0x95, 0x97, 0x76, 0xeb, 0x4d, - 0xa1, 0x18, 0x72, 0xeb, 0xfc, 0xa2, 0x30, 0xe1, 0xbd, 0xa2, 0xbe, 0xbd, 0xb7, 0x25, 0x94, 0xc4, - 0x29, 0x98, 0xa0, 0xaf, 0xe0, 0x4e, 0x4c, 0x46, 0x44, 0x17, 0x96, 0x04, 0xc1, 0x77, 0x84, 0xb2, - 0x4c, 0x85, 0x04, 0x17, 0x96, 0x04, 0x71, 0x6e, 0x15, 0x32, 0x24, 0xbb, 0x44, 0x11, 0x4a, 0x9b, - 0xb5, 0x95, 0xfa, 0xa6, 0xdc, 0xd8, 0xd9, 0xdd, 0x68, 0x6c, 0xd7, 0x36, 0x85, 0x84, 0x2f, 0x93, - 0xea, 0x9f, 0xda, 0xdb, 0x90, 0xea, 0x6b, 0x42, 0x32, 0x28, 0xdb, 0xa9, 0xd7, 0x76, 0xeb, 0x6b, - 0x42, 0x6a, 0x4e, 0x85, 0x99, 0x61, 0x75, 0x72, 0xe8, 0xca, 0x08, 0x4c, 0x71, 0xf2, 0x88, 0x29, - 0x26, 0x5c, 0x03, 0x53, 0xfc, 0xc3, 0x24, 0x4c, 0x0f, 0xd9, 0x2b, 0x86, 0xbe, 0xe4, 0x39, 0xc8, - 0xd0, 0x14, 0xa5, 0xbb, 0xe7, 0x13, 0x43, 0x37, 0x1d, 0x92, 0xb0, 0x03, 0x3b, 0x28, 0xc1, 0x05, - 0x3b, 0x88, 0xd4, 0x11, 0x1d, 0x04, 0xa6, 0x18, 0xa8, 0xe9, 0x3f, 0x3b, 0x50, 0xd3, 0xe9, 0xb6, - 0x77, 0x61, 0x94, 0x6d, 0x8f, 0xc8, 0x8e, 0x57, 0xdb, 0x33, 0x43, 0x6a, 0xfb, 0x15, 0x98, 0x1a, - 0x20, 0x1a, 0xb9, 0xc6, 0xbe, 0x9a, 0x80, 0xf2, 0x51, 0xc1, 0x89, 0xa9, 0x74, 0xc9, 0x50, 0xa5, - 0xbb, 0x12, 0x8d, 0xe0, 0xd9, 0xa3, 0x27, 0x61, 0x60, 0xae, 0xdf, 0x4c, 0xc0, 0x89, 0xe1, 0x9d, - 0xe2, 0x50, 0x1f, 0x3e, 0x09, 0xd9, 0x1e, 0x72, 0xf7, 0x4d, 0xde, 0x2d, 0x7d, 0x6c, 0xc8, 0x1e, - 0x8c, 0xd5, 0xd1, 0xc9, 0x66, 0xa8, 0xe0, 0x26, 0x9e, 0x3a, 0xaa, 0xdd, 0xa3, 0xde, 0x0c, 0x78, - 0xfa, 0xb9, 0x24, 0x3c, 0x30, 0x94, 0x7c, 0xa8, 0xa3, 0x0f, 0x03, 0x68, 0x86, 0xd5, 0x77, 0x69, - 0x47, 0x44, 0x0b, 0x6c, 0x9e, 0x48, 0x48, 0xf1, 0xc2, 0xc5, 0xb3, 0xef, 0x7a, 0xfa, 0x14, 0xd1, - 0x03, 0x15, 0x11, 0x83, 0x4b, 0xbe, 0xa3, 0x69, 0xe2, 0x68, 0xe5, 0x88, 0x91, 0x0e, 0x24, 0xe6, - 0x33, 0x20, 0xa8, 0xba, 0x86, 0x0c, 0x57, 0x76, 0x5c, 0x1b, 0x29, 0x3d, 0xcd, 0xe8, 0x92, 0x1d, - 0x24, 0x57, 0xcd, 0x74, 0x14, 0xdd, 0x41, 0xd2, 0x24, 0x55, 0x37, 0xb9, 0x16, 0x23, 0x48, 0x02, - 0xd9, 0x01, 0x44, 0x36, 0x84, 0xa0, 0x6a, 0x0f, 0x31, 0xf7, 0xab, 0x79, 0x28, 0x04, 0xfa, 0x6a, - 0xf1, 0x2c, 0x14, 0xaf, 0x2b, 0x37, 0x15, 0x99, 0x9f, 0x95, 0x68, 0x24, 0x0a, 0x58, 0xb6, 0xc3, - 0xce, 0x4b, 0xcf, 0xc0, 0x0c, 0x31, 0x31, 0xfb, 0x2e, 0xb2, 0x65, 0x55, 0x57, 0x1c, 0x87, 0x04, - 0x2d, 0x47, 0x4c, 0x45, 0xac, 0x6b, 0x60, 0xd5, 0x2a, 0xd7, 0x88, 0xcb, 0x30, 0x4d, 0x10, 0xbd, - 0xbe, 0xee, 0x6a, 0x96, 0x8e, 0x64, 0x7c, 0x7a, 0x73, 0xc8, 0x4e, 0xe2, 0x79, 0x36, 0x85, 0x2d, - 0xb6, 0x98, 0x01, 0xf6, 0xc8, 0x11, 0xd7, 0xe0, 0x61, 0x02, 0xeb, 0x22, 0x03, 0xd9, 0x8a, 0x8b, - 0x64, 0xf4, 0xd9, 0xbe, 0xa2, 0x3b, 0xb2, 0x62, 0xb4, 0xe5, 0x7d, 0xc5, 0xd9, 0x2f, 0xcf, 0x60, - 0x82, 0x95, 0x64, 0x39, 0x21, 0x9d, 0xc2, 0x86, 0xeb, 0xcc, 0xae, 0x4e, 0xcc, 0x6a, 0x46, 0xfb, - 0x9a, 0xe2, 0xec, 0x8b, 0x55, 0x38, 0x41, 0x58, 0x1c, 0xd7, 0xd6, 0x8c, 0xae, 0xac, 0xee, 0x23, - 0xf5, 0x86, 0xdc, 0x77, 0x3b, 0x97, 0xca, 0x0f, 0x06, 0xdf, 0x4f, 0x3c, 0x6c, 0x12, 0x9b, 0x55, - 0x6c, 0xb2, 0xe7, 0x76, 0x2e, 0x89, 0x4d, 0x28, 0xe2, 0xc9, 0xe8, 0x69, 0xb7, 0x91, 0xdc, 0x31, - 0x6d, 0xb2, 0x35, 0x96, 0x86, 0x94, 0xa6, 0x40, 0x04, 0x17, 0x1a, 0x0c, 0xb0, 0x65, 0xb6, 0x51, - 0x35, 0xd3, 0xdc, 0xa9, 0xd7, 0xd7, 0xa4, 0x02, 0x67, 0xb9, 0x6a, 0xda, 0x38, 0xa1, 0xba, 0xa6, - 0x17, 0xe0, 0x02, 0x4d, 0xa8, 0xae, 0xc9, 0xc3, 0xbb, 0x0c, 0xd3, 0xaa, 0x4a, 0xc7, 0xac, 0xa9, - 0x32, 0x3b, 0x63, 0x39, 0x65, 0x21, 0x14, 0x2c, 0x55, 0x5d, 0xa7, 0x06, 0x2c, 0xc7, 0x1d, 0xf1, - 0x32, 0x3c, 0xe0, 0x07, 0x2b, 0x08, 0x9c, 0x1a, 0x18, 0x65, 0x14, 0xba, 0x0c, 0xd3, 0xd6, 0xc1, - 0x20, 0x50, 0x0c, 0xbd, 0xd1, 0x3a, 0x88, 0xc2, 0x2e, 0xc2, 0x8c, 0xb5, 0x6f, 0x0d, 0xe2, 0x9e, - 0x0c, 0xe2, 0x44, 0x6b, 0xdf, 0x8a, 0x02, 0x1f, 0x23, 0x07, 0x6e, 0x1b, 0xa9, 0x8a, 0x8b, 0xda, - 0xe5, 0x93, 0x41, 0xf3, 0x80, 0x42, 0x3c, 0x07, 0x82, 0xaa, 0xca, 0xc8, 0x50, 0x5a, 0x3a, 0x92, - 0x15, 0x1b, 0x19, 0x8a, 0x53, 0x3e, 0x1d, 0x34, 0x2e, 0xa9, 0x6a, 0x9d, 0x68, 0x6b, 0x44, 0x29, - 0x3e, 0x09, 0x53, 0x66, 0xeb, 0xba, 0x4a, 0x53, 0x52, 0xb6, 0x6c, 0xd4, 0xd1, 0x5e, 0x29, 0x3f, - 0x4a, 0xe2, 0x3b, 0x89, 0x15, 0x24, 0x21, 0x77, 0x88, 0x58, 0x7c, 0x02, 0x04, 0xd5, 0xd9, 0x57, - 0x6c, 0x8b, 0xd4, 0x64, 0xc7, 0x52, 0x54, 0x54, 0x7e, 0x8c, 0x9a, 0x52, 0xf9, 0x36, 0x17, 0xe3, - 0x25, 0xe1, 0xdc, 0xd2, 0x3a, 0x2e, 0x67, 0x7c, 0x9c, 0x2e, 0x09, 0x22, 0x63, 0x6c, 0xf3, 0x20, - 0xe0, 0x50, 0x84, 0x5e, 0x3c, 0x4f, 0xcc, 0x4a, 0xd6, 0xbe, 0x15, 0x7c, 0xef, 0x23, 0x30, 0x81, - 0x2d, 0xfd, 0x97, 0x3e, 0x41, 0x1b, 0x32, 0x6b, 0x3f, 0xf0, 0xc6, 0x25, 0x38, 0x81, 0x8d, 0x7a, - 0xc8, 0x55, 0xda, 0x8a, 0xab, 0x04, 0xac, 0x3f, 0x4e, 0xac, 0x71, 0xdc, 0xb7, 0x98, 0x32, 0xe4, - 0xa7, 0xdd, 0x6f, 0x1d, 0x78, 0x99, 0xf5, 0x34, 0xf5, 0x13, 0xcb, 0x78, 0x6e, 0x7d, 0x68, 0x4d, - 0xf7, 0x5c, 0x15, 0x8a, 0xc1, 0xc4, 0x17, 0xf3, 0x40, 0x53, 0x5f, 0x48, 0xe0, 0x2e, 0x68, 0xb5, - 0xb1, 0x86, 0xfb, 0x97, 0x97, 0xeb, 0x42, 0x12, 0xf7, 0x51, 0x9b, 0x1b, 0xbb, 0x75, 0x59, 0xda, - 0xdb, 0xde, 0xdd, 0xd8, 0xaa, 0x0b, 0xa9, 0x60, 0xc3, 0xfe, 0xdd, 0x24, 0x94, 0xc2, 0x67, 0x2f, - 0xf1, 0xa7, 0xe0, 0x24, 0xbf, 0x28, 0x71, 0x90, 0x2b, 0xdf, 0xd2, 0x6c, 0xb2, 0x16, 0x7b, 0x0a, - 0xdd, 0x17, 0xbd, 0x6c, 0x98, 0x61, 0x56, 0x4d, 0xe4, 0xbe, 0xa0, 0xd9, 0x78, 0xa5, 0xf5, 0x14, - 0x57, 0xdc, 0x84, 0xd3, 0x86, 0x29, 0x3b, 0xae, 0x62, 0xb4, 0x15, 0xbb, 0x2d, 0xfb, 0x57, 0x54, - 0xb2, 0xa2, 0xaa, 0xc8, 0x71, 0x4c, 0xba, 0x07, 0x7a, 0x2c, 0x0f, 0x19, 0x66, 0x93, 0x19, 0xfb, - 0x9b, 0x43, 0x8d, 0x99, 0x46, 0x32, 0x37, 0x75, 0x54, 0xe6, 0x3e, 0x08, 0xf9, 0x9e, 0x62, 0xc9, - 0xc8, 0x70, 0xed, 0x03, 0xd2, 0x71, 0xe7, 0xa4, 0x5c, 0x4f, 0xb1, 0xea, 0xf8, 0xf9, 0xa3, 0x39, - 0xf8, 0xfc, 0x20, 0x05, 0xc5, 0x60, 0xd7, 0x8d, 0x0f, 0x31, 0x2a, 0xd9, 0xa0, 0x12, 0xa4, 0x84, - 0x3d, 0x72, 0xdf, 0x1e, 0x7d, 0x61, 0x15, 0xef, 0x5c, 0xd5, 0x2c, 0xed, 0x85, 0x25, 0x8a, 0xc4, - 0x5d, 0x03, 0x4e, 0x2d, 0x44, 0x7b, 0x8f, 0x9c, 0xc4, 0x9e, 0xc4, 0x75, 0xc8, 0x5e, 0x77, 0x08, - 0x77, 0x96, 0x70, 0x3f, 0x7a, 0x7f, 0xee, 0xe7, 0x9b, 0x84, 0x3c, 0xff, 0x7c, 0x53, 0xde, 0x6e, - 0x48, 0x5b, 0xb5, 0x4d, 0x89, 0xc1, 0xc5, 0x53, 0x90, 0xd6, 0x95, 0xdb, 0x07, 0xe1, 0x3d, 0x8e, - 0x88, 0x46, 0x0d, 0xfc, 0x29, 0x48, 0xdf, 0x42, 0xca, 0x8d, 0xf0, 0xce, 0x42, 0x44, 0x1f, 0x62, - 0xea, 0x9f, 0x83, 0x0c, 0x89, 0x97, 0x08, 0xc0, 0x22, 0x26, 0x8c, 0x89, 0x39, 0x48, 0xaf, 0x36, - 0x24, 0x9c, 0xfe, 0x02, 0x14, 0xa9, 0x54, 0xde, 0xd9, 0xa8, 0xaf, 0xd6, 0x85, 0xe4, 0xdc, 0x32, - 0x64, 0x69, 0x10, 0xf0, 0xd2, 0xf0, 0xc2, 0x20, 0x8c, 0xb1, 0x47, 0xc6, 0x91, 0xe0, 0xda, 0xbd, - 0xad, 0x95, 0xba, 0x24, 0x24, 0x83, 0xd3, 0xeb, 0x40, 0x31, 0xd8, 0x70, 0x7f, 0x34, 0x39, 0xf5, - 0x9d, 0x04, 0x14, 0x02, 0x0d, 0x34, 0xee, 0x7c, 0x14, 0x5d, 0x37, 0x6f, 0xc9, 0x8a, 0xae, 0x29, - 0x0e, 0x4b, 0x0a, 0x20, 0xa2, 0x1a, 0x96, 0x8c, 0x3a, 0x69, 0x1f, 0x89, 0xf3, 0x6f, 0x24, 0x40, - 0x88, 0xf6, 0xae, 0x11, 0x07, 0x13, 0x3f, 0x51, 0x07, 0x5f, 0x4f, 0x40, 0x29, 0xdc, 0xb0, 0x46, - 0xdc, 0x3b, 0xfb, 0x13, 0x75, 0xef, 0xed, 0x24, 0x4c, 0x84, 0xda, 0xd4, 0x51, 0xbd, 0xfb, 0x2c, - 0x4c, 0x69, 0x6d, 0xd4, 0xb3, 0x4c, 0x17, 0x19, 0xea, 0x81, 0xac, 0xa3, 0x9b, 0x48, 0x2f, 0xcf, - 0x91, 0x42, 0x71, 0xee, 0xfe, 0x8d, 0xf0, 0xc2, 0x86, 0x8f, 0xdb, 0xc4, 0xb0, 0xea, 0xf4, 0xc6, - 0x5a, 0x7d, 0x6b, 0xa7, 0xb1, 0x5b, 0xdf, 0x5e, 0x7d, 0x49, 0xde, 0xdb, 0xfe, 0x99, 0xed, 0xc6, - 0x0b, 0xdb, 0x92, 0xa0, 0x45, 0xcc, 0x3e, 0xc4, 0xa5, 0xbe, 0x03, 0x42, 0xd4, 0x29, 0xf1, 0x24, - 0x0c, 0x73, 0x4b, 0x18, 0x13, 0xa7, 0x61, 0x72, 0xbb, 0x21, 0x37, 0x37, 0xd6, 0xea, 0x72, 0xfd, - 0xea, 0xd5, 0xfa, 0xea, 0x6e, 0x93, 0x5e, 0x6d, 0x78, 0xd6, 0xbb, 0xe1, 0x45, 0xfd, 0x5a, 0x0a, - 0xa6, 0x87, 0x78, 0x22, 0xd6, 0xd8, 0xa1, 0x84, 0x9e, 0x93, 0x9e, 0x1e, 0xc5, 0xfb, 0x05, 0xdc, - 0x15, 0xec, 0x28, 0xb6, 0xcb, 0xce, 0x30, 0x4f, 0x00, 0x8e, 0x92, 0xe1, 0x6a, 0x1d, 0x0d, 0xd9, - 0xec, 0x26, 0x88, 0x9e, 0x54, 0x26, 0x7d, 0x39, 0xbd, 0x0c, 0xfa, 0x38, 0x88, 0x96, 0xe9, 0x68, - 0xae, 0x76, 0x13, 0xc9, 0x9a, 0xc1, 0xaf, 0x8d, 0xf0, 0xc9, 0x25, 0x2d, 0x09, 0x5c, 0xb3, 0x61, - 0xb8, 0x9e, 0xb5, 0x81, 0xba, 0x4a, 0xc4, 0x1a, 0x17, 0xf0, 0x94, 0x24, 0x70, 0x8d, 0x67, 0x7d, - 0x16, 0x8a, 0x6d, 0xb3, 0x8f, 0xdb, 0x39, 0x6a, 0x87, 0xf7, 0x8b, 0x84, 0x54, 0xa0, 0x32, 0xcf, - 0x84, 0x35, 0xea, 0xfe, 0x7d, 0x55, 0x51, 0x2a, 0x50, 0x19, 0x35, 0x79, 0x1c, 0x26, 0x95, 0x6e, - 0xd7, 0xc6, 0xe4, 0x9c, 0x88, 0x1e, 0x3d, 0x4a, 0x9e, 0x98, 0x18, 0xce, 0x3e, 0x0f, 0x39, 0x1e, - 0x07, 0xbc, 0x25, 0xe3, 0x48, 0xc8, 0x16, 0x3d, 0x4f, 0x27, 0xe7, 0xf3, 0x52, 0xce, 0xe0, 0xca, - 0xb3, 0x50, 0xd4, 0x1c, 0xd9, 0xbf, 0x7e, 0x4f, 0x9e, 0x49, 0xce, 0xe7, 0xa4, 0x82, 0xe6, 0x78, - 0x57, 0x97, 0x73, 0x6f, 0x26, 0xa1, 0x14, 0xfe, 0x7c, 0x20, 0xae, 0x41, 0x4e, 0x37, 0x55, 0x85, - 0xa4, 0x16, 0xfd, 0x76, 0x35, 0x1f, 0xf3, 0xc5, 0x61, 0x61, 0x93, 0xd9, 0x4b, 0x1e, 0x72, 0xf6, - 0x9f, 0x13, 0x90, 0xe3, 0x62, 0xf1, 0x04, 0xa4, 0x2d, 0xc5, 0xdd, 0x27, 0x74, 0x99, 0x95, 0xa4, - 0x90, 0x90, 0xc8, 0x33, 0x96, 0x3b, 0x96, 0x62, 0x90, 0x14, 0x60, 0x72, 0xfc, 0x8c, 0xe7, 0x55, - 0x47, 0x4a, 0x9b, 0x9c, 0x6b, 0xcc, 0x5e, 0x0f, 0x19, 0xae, 0xc3, 0xe7, 0x95, 0xc9, 0x57, 0x99, - 0x58, 0x7c, 0x0a, 0xa6, 0x5c, 0x5b, 0xd1, 0xf4, 0x90, 0x6d, 0x9a, 0xd8, 0x0a, 0x5c, 0xe1, 0x19, - 0x57, 0xe1, 0x14, 0xe7, 0x6d, 0x23, 0x57, 0x51, 0xf7, 0x51, 0xdb, 0x07, 0x65, 0xc9, 0xfd, 0xc5, - 0x49, 0x66, 0xb0, 0xc6, 0xf4, 0x1c, 0x3b, 0xf7, 0xfd, 0x04, 0x4c, 0xf1, 0x93, 0x58, 0xdb, 0x0b, - 0xd6, 0x16, 0x80, 0x62, 0x18, 0xa6, 0x1b, 0x0c, 0xd7, 0x60, 0x2a, 0x0f, 0xe0, 0x16, 0x6a, 0x1e, - 0x48, 0x0a, 0x10, 0xcc, 0xf6, 0x00, 0x7c, 0xcd, 0x91, 0x61, 0x3b, 0x0d, 0x05, 0xf6, 0x6d, 0x88, - 0x7c, 0x60, 0xa4, 0x67, 0x77, 0xa0, 0x22, 0x7c, 0x64, 0x13, 0x67, 0x20, 0xd3, 0x42, 0x5d, 0xcd, - 0x60, 0x37, 0xbe, 0xf4, 0x81, 0xdf, 0xb0, 0xa4, 0xbd, 0x1b, 0x96, 0x95, 0xcf, 0xc0, 0xb4, 0x6a, - 0xf6, 0xa2, 0xee, 0xae, 0x08, 0x91, 0xfb, 0x03, 0xe7, 0x5a, 0xe2, 0x65, 0xf0, 0x5b, 0xcc, 0xf7, - 0x13, 0x89, 0x2f, 0x27, 0x53, 0xeb, 0x3b, 0x2b, 0x5f, 0x4b, 0xce, 0xae, 0x53, 0xe8, 0x0e, 0x1f, - 0xa9, 0x84, 0x3a, 0x3a, 0x52, 0xb1, 0xf7, 0xf0, 0x95, 0xa7, 0xe0, 0xe9, 0xae, 0xe6, 0xee, 0xf7, - 0x5b, 0x0b, 0xaa, 0xd9, 0x3b, 0xd7, 0x35, 0xbb, 0xa6, 0xff, 0x4d, 0x15, 0x3f, 0x91, 0x07, 0xf2, - 0x17, 0xfb, 0xae, 0x9a, 0xf7, 0xa4, 0xb3, 0xb1, 0x1f, 0x61, 0xab, 0xdb, 0x30, 0xcd, 0x8c, 0x65, - 0xf2, 0x61, 0x87, 0x1e, 0x4f, 0xc4, 0xfb, 0x5e, 0x8e, 0x95, 0xbf, 0xf1, 0x0e, 0xd9, 0xae, 0xa5, - 0x29, 0x06, 0xc5, 0x3a, 0x7a, 0x82, 0xa9, 0x4a, 0xf0, 0x40, 0x88, 0x8f, 0x2e, 0x4d, 0x64, 0xc7, - 0x30, 0x7e, 0x97, 0x31, 0x4e, 0x07, 0x18, 0x9b, 0x0c, 0x5a, 0x5d, 0x85, 0x89, 0xe3, 0x70, 0xfd, - 0x23, 0xe3, 0x2a, 0xa2, 0x20, 0xc9, 0x3a, 0x4c, 0x12, 0x12, 0xb5, 0xef, 0xb8, 0x66, 0x8f, 0xd4, - 0xbd, 0xfb, 0xd3, 0xfc, 0xd3, 0x3b, 0x74, 0xad, 0x94, 0x30, 0x6c, 0xd5, 0x43, 0x55, 0xab, 0x40, - 0xbe, 0x65, 0xb5, 0x91, 0xaa, 0xc7, 0x30, 0xbc, 0xc5, 0x1c, 0xf1, 0xec, 0xab, 0x9f, 0x86, 0x19, - 0xfc, 0x37, 0x29, 0x4b, 0x41, 0x4f, 0xe2, 0x6f, 0xd2, 0xca, 0xdf, 0x7f, 0x95, 0x2e, 0xc7, 0x69, - 0x8f, 0x20, 0xe0, 0x53, 0x60, 0x16, 0xbb, 0xc8, 0x75, 0x91, 0xed, 0xc8, 0x8a, 0x3e, 0xcc, 0xbd, - 0xc0, 0x55, 0x44, 0xf9, 0x0b, 0xef, 0x86, 0x67, 0x71, 0x9d, 0x22, 0x6b, 0xba, 0x5e, 0xdd, 0x83, - 0x93, 0x43, 0xb2, 0x62, 0x04, 0xce, 0xd7, 0x18, 0xe7, 0xcc, 0x40, 0x66, 0x60, 0xda, 0x1d, 0xe0, - 0x72, 0x6f, 0x2e, 0x47, 0xe0, 0xfc, 0x7d, 0xc6, 0x29, 0x32, 0x2c, 0x9f, 0x52, 0xcc, 0xf8, 0x3c, - 0x4c, 0xdd, 0x44, 0x76, 0xcb, 0x74, 0xd8, 0xf5, 0xcf, 0x08, 0x74, 0xaf, 0x33, 0xba, 0x49, 0x06, - 0x24, 0xf7, 0x41, 0x98, 0xeb, 0x32, 0xe4, 0x3a, 0x8a, 0x8a, 0x46, 0xa0, 0xf8, 0x22, 0xa3, 0x18, - 0xc7, 0xf6, 0x18, 0x5a, 0x83, 0x62, 0xd7, 0x64, 0x3b, 0x53, 0x3c, 0xfc, 0x0d, 0x06, 0x2f, 0x70, - 0x0c, 0xa3, 0xb0, 0x4c, 0xab, 0xaf, 0xe3, 0x6d, 0x2b, 0x9e, 0xe2, 0x0f, 0x38, 0x05, 0xc7, 0x30, - 0x8a, 0x63, 0x84, 0xf5, 0x0f, 0x39, 0x85, 0x13, 0x88, 0xe7, 0x73, 0x50, 0x30, 0x0d, 0xfd, 0xc0, - 0x34, 0x46, 0x71, 0xe2, 0x4b, 0x8c, 0x01, 0x18, 0x04, 0x13, 0x5c, 0x81, 0xfc, 0xa8, 0x13, 0xf1, - 0xc7, 0xef, 0xf2, 0xe5, 0xc1, 0x67, 0x60, 0x1d, 0x26, 0x79, 0x81, 0xd2, 0x4c, 0x63, 0x04, 0x8a, - 0xaf, 0x30, 0x8a, 0x52, 0x00, 0xc6, 0x86, 0xe1, 0x22, 0xc7, 0xed, 0xa2, 0x51, 0x48, 0xde, 0xe4, - 0xc3, 0x60, 0x10, 0x16, 0xca, 0x16, 0x32, 0xd4, 0xfd, 0xd1, 0x18, 0xbe, 0xca, 0x43, 0xc9, 0x31, - 0x98, 0x62, 0x15, 0x26, 0x7a, 0x8a, 0xed, 0xec, 0x2b, 0xfa, 0x48, 0xd3, 0xf1, 0x27, 0x8c, 0xa3, - 0xe8, 0x81, 0x58, 0x44, 0xfa, 0xc6, 0x71, 0x68, 0xbe, 0xc6, 0x23, 0x12, 0x80, 0xb1, 0xa5, 0xe7, - 0xb8, 0xe4, 0xae, 0xec, 0x38, 0x6c, 0x7f, 0xca, 0x97, 0x1e, 0xc5, 0x6e, 0x05, 0x19, 0xaf, 0x40, - 0xde, 0xd1, 0x6e, 0x8f, 0x44, 0xf3, 0x67, 0x7c, 0xa6, 0x09, 0x00, 0x83, 0x5f, 0x82, 0x53, 0x43, - 0xb7, 0x89, 0x11, 0xc8, 0xfe, 0x9c, 0x91, 0x9d, 0x18, 0xb2, 0x55, 0xb0, 0x92, 0x70, 0x5c, 0xca, - 0xbf, 0xe0, 0x25, 0x01, 0x45, 0xb8, 0x76, 0xf0, 0x59, 0xc1, 0x51, 0x3a, 0xc7, 0x8b, 0xda, 0x5f, - 0xf2, 0xa8, 0x51, 0x6c, 0x28, 0x6a, 0xbb, 0x70, 0x82, 0x31, 0x1e, 0x6f, 0x5e, 0xbf, 0xce, 0x0b, - 0x2b, 0x45, 0xef, 0x85, 0x67, 0xf7, 0x33, 0x30, 0xeb, 0x85, 0x93, 0x37, 0xa5, 0x8e, 0xdc, 0x53, - 0xac, 0x11, 0x98, 0xbf, 0xc1, 0x98, 0x79, 0xc5, 0xf7, 0xba, 0x5a, 0x67, 0x4b, 0xb1, 0x30, 0xf9, - 0x8b, 0x50, 0xe6, 0xe4, 0x7d, 0xc3, 0x46, 0xaa, 0xd9, 0x35, 0xb4, 0xdb, 0xa8, 0x3d, 0x02, 0xf5, - 0x5f, 0x45, 0xa6, 0x6a, 0x2f, 0x00, 0xc7, 0xcc, 0x1b, 0x20, 0x78, 0xbd, 0x8a, 0xac, 0xf5, 0x2c, - 0xd3, 0x76, 0x63, 0x18, 0xff, 0x9a, 0xcf, 0x94, 0x87, 0xdb, 0x20, 0xb0, 0x6a, 0x1d, 0x4a, 0xe4, - 0x71, 0xd4, 0x94, 0xfc, 0x1b, 0x46, 0x34, 0xe1, 0xa3, 0x58, 0xe1, 0x50, 0xcd, 0x9e, 0xa5, 0xd8, - 0xa3, 0xd4, 0xbf, 0xbf, 0xe5, 0x85, 0x83, 0x41, 0x58, 0xe1, 0x70, 0x0f, 0x2c, 0x84, 0x77, 0xfb, - 0x11, 0x18, 0xbe, 0xc9, 0x0b, 0x07, 0xc7, 0x30, 0x0a, 0xde, 0x30, 0x8c, 0x40, 0xf1, 0x77, 0x9c, - 0x82, 0x63, 0x30, 0xc5, 0xa7, 0xfc, 0x8d, 0xd6, 0x46, 0x5d, 0xcd, 0x71, 0x6d, 0xda, 0x0a, 0xdf, - 0x9f, 0xea, 0x5b, 0xef, 0x86, 0x9b, 0x30, 0x29, 0x00, 0xc5, 0x95, 0x88, 0x5d, 0xa1, 0x92, 0x93, - 0x52, 0xbc, 0x63, 0xdf, 0xe6, 0x95, 0x28, 0x00, 0xc3, 0xbe, 0x05, 0x3a, 0x44, 0x1c, 0x76, 0x15, - 0x9f, 0x0f, 0x46, 0xa0, 0xfb, 0x4e, 0xc4, 0xb9, 0x26, 0xc7, 0x62, 0xce, 0x40, 0xff, 0xd3, 0x37, - 0x6e, 0xa0, 0x83, 0x91, 0xb2, 0xf3, 0xef, 0x23, 0xfd, 0xcf, 0x1e, 0x45, 0xd2, 0x1a, 0x32, 0x19, - 0xe9, 0xa7, 0xc4, 0xb8, 0x5f, 0x01, 0x95, 0x7f, 0xfe, 0x1e, 0x1b, 0x6f, 0xb8, 0x9d, 0xaa, 0x6e, - 0xe2, 0x24, 0x0f, 0x37, 0x3d, 0xf1, 0x64, 0xaf, 0xde, 0xf3, 0xf2, 0x3c, 0xd4, 0xf3, 0x54, 0xaf, - 0xc2, 0x44, 0xa8, 0xe1, 0x89, 0xa7, 0xfa, 0x05, 0x46, 0x55, 0x0c, 0xf6, 0x3b, 0xd5, 0x65, 0x48, - 0xe3, 0xe6, 0x25, 0x1e, 0xfe, 0x8b, 0x0c, 0x4e, 0xcc, 0xab, 0x9f, 0x80, 0x1c, 0x6f, 0x5a, 0xe2, - 0xa1, 0xbf, 0xc4, 0xa0, 0x1e, 0x04, 0xc3, 0x79, 0xc3, 0x12, 0x0f, 0xff, 0x65, 0x0e, 0xe7, 0x10, - 0x0c, 0x1f, 0x3d, 0x84, 0xff, 0xf0, 0x2b, 0x69, 0xb6, 0xe9, 0xf0, 0xd8, 0x5d, 0x81, 0x71, 0xd6, - 0xa9, 0xc4, 0xa3, 0x3f, 0xc7, 0x5e, 0xce, 0x11, 0xd5, 0x8b, 0x90, 0x19, 0x31, 0xe0, 0xbf, 0xc6, - 0xa0, 0xd4, 0xbe, 0xba, 0x0a, 0x85, 0x40, 0x77, 0x12, 0x0f, 0xff, 0x75, 0x06, 0x0f, 0xa2, 0xb0, - 0xeb, 0xac, 0x3b, 0x89, 0x27, 0xf8, 0x0d, 0xee, 0x3a, 0x43, 0xe0, 0xb0, 0xf1, 0xc6, 0x24, 0x1e, - 0xfd, 0x9b, 0x3c, 0xea, 0x1c, 0x52, 0x7d, 0x0e, 0xf2, 0xde, 0x66, 0x13, 0x8f, 0xff, 0x2d, 0x86, - 0xf7, 0x31, 0x38, 0x02, 0x81, 0xcd, 0x2e, 0x9e, 0xe2, 0xb7, 0x79, 0x04, 0x02, 0x28, 0xbc, 0x8c, - 0xa2, 0x0d, 0x4c, 0x3c, 0xd3, 0xef, 0xf0, 0x65, 0x14, 0xe9, 0x5f, 0xf0, 0x6c, 0x92, 0x9a, 0x1f, - 0x4f, 0xf1, 0xbb, 0x7c, 0x36, 0x89, 0x3d, 0x76, 0x23, 0xda, 0x11, 0xc4, 0x73, 0xfc, 0x1e, 0x77, - 0x23, 0xd2, 0x10, 0x54, 0x77, 0x40, 0x1c, 0xec, 0x06, 0xe2, 0xf9, 0x3e, 0xcf, 0xf8, 0xa6, 0x06, - 0x9a, 0x81, 0xea, 0x0b, 0x70, 0x62, 0x78, 0x27, 0x10, 0xcf, 0xfa, 0x85, 0x7b, 0x91, 0xb3, 0x5b, - 0xb0, 0x11, 0xa8, 0xee, 0xfa, 0x5b, 0x4a, 0xb0, 0x0b, 0x88, 0xa7, 0x7d, 0xed, 0x5e, 0xb8, 0x70, - 0x07, 0x9b, 0x80, 0x6a, 0x0d, 0xc0, 0xdf, 0x80, 0xe3, 0xb9, 0x5e, 0x67, 0x5c, 0x01, 0x10, 0x5e, - 0x1a, 0x6c, 0xff, 0x8d, 0xc7, 0x7f, 0x91, 0x2f, 0x0d, 0x86, 0xc0, 0x4b, 0x83, 0x6f, 0xbd, 0xf1, - 0xe8, 0x37, 0xf8, 0xd2, 0xe0, 0x10, 0x9c, 0xd9, 0x81, 0xdd, 0x2d, 0x9e, 0xe1, 0x4b, 0x3c, 0xb3, - 0x03, 0xa8, 0xea, 0x36, 0x4c, 0x0d, 0x6c, 0x88, 0xf1, 0x54, 0x5f, 0x66, 0x54, 0x42, 0x74, 0x3f, - 0x0c, 0x6e, 0x5e, 0x6c, 0x33, 0x8c, 0x67, 0xfb, 0xa3, 0xc8, 0xe6, 0xc5, 0xf6, 0xc2, 0xea, 0x15, - 0xc8, 0x19, 0x7d, 0x5d, 0xc7, 0x8b, 0x47, 0xbc, 0xff, 0x2f, 0xf7, 0xca, 0xff, 0xf6, 0x01, 0x8b, - 0x0e, 0x07, 0x54, 0x97, 0x21, 0x83, 0x7a, 0x2d, 0xd4, 0x8e, 0x43, 0xfe, 0xfb, 0x07, 0xbc, 0x60, - 0x62, 0xeb, 0xea, 0x73, 0x00, 0xf4, 0x6a, 0x84, 0x7c, 0xf6, 0x8b, 0xc1, 0xfe, 0xc7, 0x07, 0xec, - 0x37, 0x35, 0x3e, 0xc4, 0x27, 0xa0, 0xbf, 0xd0, 0xb9, 0x3f, 0xc1, 0xbb, 0x61, 0x02, 0x32, 0x23, - 0x97, 0x61, 0xfc, 0xba, 0x63, 0x1a, 0xae, 0xd2, 0x8d, 0x43, 0xff, 0x27, 0x43, 0x73, 0x7b, 0x1c, - 0xb0, 0x9e, 0x69, 0x23, 0x57, 0xe9, 0x3a, 0x71, 0xd8, 0xff, 0x62, 0x58, 0x0f, 0x80, 0xc1, 0xaa, - 0xe2, 0xb8, 0xa3, 0x8c, 0xfb, 0xbf, 0x39, 0x98, 0x03, 0xb0, 0xd3, 0xf8, 0xef, 0x1b, 0xe8, 0x20, - 0x0e, 0xfb, 0x1e, 0x77, 0x9a, 0xd9, 0x57, 0x3f, 0x01, 0x79, 0xfc, 0x27, 0xfd, 0xa1, 0x5c, 0x0c, - 0xf8, 0x7f, 0x18, 0xd8, 0x47, 0xe0, 0x37, 0x3b, 0x6e, 0xdb, 0xd5, 0xe2, 0x83, 0xfd, 0xbf, 0x6c, - 0xa6, 0xb9, 0x7d, 0xb5, 0x06, 0x05, 0xc7, 0x6d, 0xb7, 0xfb, 0xac, 0x3f, 0x8d, 0x81, 0xff, 0xdf, - 0x07, 0xde, 0x95, 0x85, 0x87, 0xc1, 0xb3, 0x7d, 0xeb, 0x86, 0x6b, 0x99, 0xe4, 0x33, 0x47, 0x1c, - 0xc3, 0x3d, 0xc6, 0x10, 0x80, 0xac, 0xd4, 0x87, 0x5f, 0xdf, 0xc2, 0xba, 0xb9, 0x6e, 0xd2, 0x8b, - 0xdb, 0x97, 0xe7, 0xe2, 0x6f, 0x60, 0xe1, 0xb5, 0x0c, 0x3c, 0xa4, 0x9a, 0xbd, 0x96, 0xe9, 0x9c, - 0x0b, 0x14, 0xf3, 0x73, 0xa6, 0xc1, 0x38, 0xc5, 0x94, 0x69, 0xa0, 0xd9, 0xe3, 0xdd, 0xe5, 0xce, - 0x9d, 0x82, 0x4c, 0xb3, 0xdf, 0x6a, 0x1d, 0x88, 0x02, 0xa4, 0x9c, 0x7e, 0x8b, 0xfd, 0xe0, 0x0a, - 0xff, 0x39, 0xf7, 0x83, 0x14, 0x14, 0x9a, 0x4a, 0xcf, 0xd2, 0x51, 0xc3, 0x40, 0x8d, 0x8e, 0x58, - 0x86, 0x2c, 0x19, 0xea, 0xb3, 0xc4, 0x28, 0x71, 0x6d, 0x4c, 0x62, 0xcf, 0x9e, 0x66, 0x91, 0xdc, - 0x71, 0x27, 0x3d, 0xcd, 0xa2, 0xa7, 0x39, 0x4f, 0xaf, 0xb8, 0x3d, 0xcd, 0x79, 0x4f, 0xb3, 0x44, - 0x2e, 0xba, 0x53, 0x9e, 0x66, 0xc9, 0xd3, 0x2c, 0x93, 0x0f, 0x39, 0x13, 0x9e, 0x66, 0xd9, 0xd3, - 0x5c, 0x20, 0x9f, 0x6e, 0xd2, 0x9e, 0xe6, 0x82, 0xa7, 0xb9, 0x48, 0xbe, 0xd8, 0x4c, 0x79, 0x9a, - 0x8b, 0x9e, 0xe6, 0x12, 0xf9, 0x4a, 0x23, 0x7a, 0x9a, 0x4b, 0x9e, 0xe6, 0x32, 0xf9, 0x5d, 0xd5, - 0xb8, 0xa7, 0xb9, 0x2c, 0xce, 0xc2, 0x38, 0x1d, 0xd9, 0x33, 0xe4, 0x53, 0xfe, 0xe4, 0xb5, 0x31, - 0x89, 0x0b, 0x7c, 0xdd, 0xb3, 0xe4, 0xb7, 0x53, 0x59, 0x5f, 0xf7, 0xac, 0xaf, 0x5b, 0x24, 0xff, - 0x85, 0x43, 0xf0, 0x75, 0x8b, 0xbe, 0xee, 0x7c, 0x79, 0x02, 0x67, 0x88, 0xaf, 0x3b, 0xef, 0xeb, - 0x96, 0xca, 0x25, 0x1c, 0x7f, 0x5f, 0xb7, 0xe4, 0xeb, 0x96, 0xcb, 0x93, 0x67, 0x12, 0xf3, 0x45, - 0x5f, 0xb7, 0x2c, 0x3e, 0x0d, 0x05, 0xa7, 0xdf, 0x92, 0x59, 0xad, 0x27, 0xbf, 0xd1, 0x2a, 0x2c, - 0xc2, 0x02, 0xce, 0x08, 0x32, 0xa9, 0xd7, 0xc6, 0x24, 0x70, 0xfa, 0x2d, 0x56, 0x8a, 0x57, 0x8a, - 0x40, 0x6e, 0xa0, 0x64, 0xf2, 0xd3, 0xea, 0x95, 0xb5, 0xb7, 0xee, 0x56, 0xc6, 0xbe, 0x77, 0xb7, - 0x32, 0xf6, 0x2f, 0x77, 0x2b, 0x63, 0x6f, 0xdf, 0xad, 0x24, 0xde, 0xbb, 0x5b, 0x49, 0xbc, 0x7f, - 0xb7, 0x92, 0xb8, 0x73, 0x58, 0x49, 0x7c, 0xf5, 0xb0, 0x92, 0xf8, 0xfa, 0x61, 0x25, 0xf1, 0xad, - 0xc3, 0x4a, 0xe2, 0xad, 0xc3, 0xca, 0xd8, 0xf7, 0x0e, 0x2b, 0x89, 0xb7, 0x0f, 0x2b, 0x89, 0x1f, - 0x1d, 0x56, 0xc6, 0xde, 0x3b, 0xac, 0x24, 0xde, 0x3f, 0xac, 0x8c, 0xdd, 0xf9, 0x61, 0x65, 0xac, - 0x95, 0x25, 0x69, 0x74, 0xfe, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xa3, 0xfc, 0x6e, 0x91, - 0x35, 0x00, 0x00, + // 4120 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5b, 0x5b, 0x70, 0xe3, 0xe6, + 0x75, 0x16, 0x78, 0x13, 0x79, 0x48, 0x51, 0x10, 0x24, 0x6b, 0xb9, 0xb2, 0xcd, 0xd5, 0xca, 0x76, + 0x2c, 0xdb, 0xb1, 0x64, 0x6b, 0xa5, 0xbd, 0x70, 0x9b, 0xb8, 0x94, 0xc4, 0xd5, 0xca, 0x95, 0x44, + 0x05, 0x94, 0xe2, 0x4b, 0xa6, 0x83, 0x01, 0xc1, 0x9f, 0x14, 0x76, 0x41, 0x00, 0x01, 0xc0, 0x5d, + 0x6b, 0xa7, 0x0f, 0xdb, 0x71, 0x2f, 0x93, 0xe9, 0xfd, 0x32, 0xd3, 0xc4, 0x75, 0xdc, 0x26, 0x9d, + 0xc6, 0x6e, 0x7a, 0x4b, 0x7a, 0x49, 0x93, 0xf4, 0xa5, 0x2f, 0x69, 0xfd, 0xd4, 0x49, 0xde, 0xfa, + 0x90, 0x07, 0xaf, 0xec, 0x99, 0xa6, 0xad, 0xdb, 0xba, 0xed, 0x3e, 0x78, 0x66, 0x5f, 0x3a, 0xff, + 0x0d, 0x00, 0x2f, 0x5a, 0x50, 0x99, 0xb1, 0xf3, 0xb4, 0xc2, 0x39, 0xe7, 0xfb, 0x70, 0xfe, 0xf3, + 0x9f, 0xff, 0xfc, 0xe7, 0xff, 0xc1, 0x85, 0xb7, 0x4b, 0x30, 0xdb, 0xb2, 0xac, 0x96, 0x81, 0x16, + 0x6d, 0xc7, 0xf2, 0xac, 0x7a, 0xa7, 0xb9, 0xd8, 0x40, 0xae, 0xe6, 0xe8, 0xb6, 0x67, 0x39, 0x0b, + 0x44, 0x26, 0x8d, 0x53, 0x8b, 0x05, 0x6e, 0x31, 0xb7, 0x0d, 0x13, 0x57, 0x74, 0x03, 0xad, 0xfb, + 0x86, 0x35, 0xe4, 0x49, 0x17, 0x21, 0xd1, 0xd4, 0x0d, 0x54, 0x10, 0x66, 0xe3, 0xf3, 0xd9, 0xa5, + 0x47, 0x17, 0x7a, 0x40, 0x0b, 0xdd, 0x88, 0x5d, 0x2c, 0x96, 0x09, 0x62, 0xee, 0xbd, 0x04, 0x4c, + 0x0e, 0xd0, 0x4a, 0x12, 0x24, 0x4c, 0xb5, 0x8d, 0x19, 0x85, 0xf9, 0x8c, 0x4c, 0xfe, 0x96, 0x0a, + 0x30, 0x6a, 0xab, 0xda, 0x75, 0xb5, 0x85, 0x0a, 0x31, 0x22, 0xe6, 0x8f, 0x52, 0x11, 0xa0, 0x81, + 0x6c, 0x64, 0x36, 0x90, 0xa9, 0x1d, 0x16, 0xe2, 0xb3, 0xf1, 0xf9, 0x8c, 0x1c, 0x92, 0x48, 0x4f, + 0xc1, 0x84, 0xdd, 0xa9, 0x1b, 0xba, 0xa6, 0x84, 0xcc, 0x60, 0x36, 0x3e, 0x9f, 0x94, 0x45, 0xaa, + 0x58, 0x0f, 0x8c, 0x1f, 0x87, 0xf1, 0x9b, 0x48, 0xbd, 0x1e, 0x36, 0xcd, 0x12, 0xd3, 0x3c, 0x16, + 0x87, 0x0c, 0xd7, 0x20, 0xd7, 0x46, 0xae, 0xab, 0xb6, 0x90, 0xe2, 0x1d, 0xda, 0xa8, 0x90, 0x20, + 0xa3, 0x9f, 0xed, 0x1b, 0x7d, 0xef, 0xc8, 0xb3, 0x0c, 0xb5, 0x77, 0x68, 0x23, 0xa9, 0x0c, 0x19, + 0x64, 0x76, 0xda, 0x94, 0x21, 0x79, 0x4c, 0xfc, 0x2a, 0x66, 0xa7, 0xdd, 0xcb, 0x92, 0xc6, 0x30, + 0x46, 0x31, 0xea, 0x22, 0xe7, 0x86, 0xae, 0xa1, 0x42, 0x8a, 0x10, 0x3c, 0xde, 0x47, 0x50, 0xa3, + 0xfa, 0x5e, 0x0e, 0x8e, 0x93, 0xd6, 0x20, 0x83, 0x5e, 0xf1, 0x90, 0xe9, 0xea, 0x96, 0x59, 0x18, + 0x25, 0x24, 0x8f, 0x0d, 0x98, 0x45, 0x64, 0x34, 0x7a, 0x29, 0x02, 0x9c, 0x74, 0x1e, 0x46, 0x2d, + 0xdb, 0xd3, 0x2d, 0xd3, 0x2d, 0xa4, 0x67, 0x85, 0xf9, 0xec, 0xd2, 0x43, 0x03, 0x13, 0xa1, 0x4a, + 0x6d, 0x64, 0x6e, 0x2c, 0x6d, 0x82, 0xe8, 0x5a, 0x1d, 0x47, 0x43, 0x8a, 0x66, 0x35, 0x90, 0xa2, + 0x9b, 0x4d, 0xab, 0x90, 0x21, 0x04, 0x67, 0xfa, 0x07, 0x42, 0x0c, 0xd7, 0xac, 0x06, 0xda, 0x34, + 0x9b, 0x96, 0x9c, 0x77, 0xbb, 0x9e, 0xa5, 0x69, 0x48, 0xb9, 0x87, 0xa6, 0xa7, 0xbe, 0x52, 0xc8, + 0x91, 0x0c, 0x61, 0x4f, 0x73, 0xdf, 0x49, 0xc1, 0xf8, 0x30, 0x29, 0x76, 0x19, 0x92, 0x4d, 0x3c, + 0xca, 0x42, 0xec, 0x24, 0x31, 0xa0, 0x98, 0xee, 0x20, 0xa6, 0x7e, 0xcc, 0x20, 0x96, 0x21, 0x6b, + 0x22, 0xd7, 0x43, 0x0d, 0x9a, 0x11, 0xf1, 0x21, 0x73, 0x0a, 0x28, 0xa8, 0x3f, 0xa5, 0x12, 0x3f, + 0x56, 0x4a, 0xbd, 0x08, 0xe3, 0xbe, 0x4b, 0x8a, 0xa3, 0x9a, 0x2d, 0x9e, 0x9b, 0x8b, 0x51, 0x9e, + 0x2c, 0x54, 0x38, 0x4e, 0xc6, 0x30, 0x39, 0x8f, 0xba, 0x9e, 0xa5, 0x75, 0x00, 0xcb, 0x44, 0x56, + 0x53, 0x69, 0x20, 0xcd, 0x28, 0xa4, 0x8f, 0x89, 0x52, 0x15, 0x9b, 0xf4, 0x45, 0xc9, 0xa2, 0x52, + 0xcd, 0x90, 0x2e, 0x05, 0xa9, 0x36, 0x7a, 0x4c, 0xa6, 0x6c, 0xd3, 0x45, 0xd6, 0x97, 0x6d, 0xfb, + 0x90, 0x77, 0x10, 0xce, 0x7b, 0xd4, 0x60, 0x23, 0xcb, 0x10, 0x27, 0x16, 0x22, 0x47, 0x26, 0x33, + 0x18, 0x1d, 0xd8, 0x98, 0x13, 0x7e, 0x94, 0x1e, 0x01, 0x5f, 0xa0, 0x90, 0xb4, 0x02, 0x52, 0x85, + 0x72, 0x5c, 0xb8, 0xa3, 0xb6, 0xd1, 0xcc, 0x2d, 0xc8, 0x77, 0x87, 0x47, 0x9a, 0x82, 0xa4, 0xeb, + 0xa9, 0x8e, 0x47, 0xb2, 0x30, 0x29, 0xd3, 0x07, 0x49, 0x84, 0x38, 0x32, 0x1b, 0xa4, 0xca, 0x25, + 0x65, 0xfc, 0xa7, 0xf4, 0xd3, 0xc1, 0x80, 0xe3, 0x64, 0xc0, 0x9f, 0xe8, 0x9f, 0xd1, 0x2e, 0xe6, + 0xde, 0x71, 0xcf, 0x5c, 0x80, 0xb1, 0xae, 0x01, 0x0c, 0xfb, 0xea, 0xb9, 0x9f, 0x83, 0x07, 0x06, + 0x52, 0x4b, 0x2f, 0xc2, 0x54, 0xc7, 0xd4, 0x4d, 0x0f, 0x39, 0xb6, 0x83, 0x70, 0xc6, 0xd2, 0x57, + 0x15, 0xfe, 0x75, 0xf4, 0x98, 0x9c, 0xdb, 0x0f, 0x5b, 0x53, 0x16, 0x79, 0xb2, 0xd3, 0x2f, 0x7c, + 0x32, 0x93, 0xfe, 0xd1, 0xa8, 0x78, 0xfb, 0xf6, 0xed, 0xdb, 0xb1, 0xb9, 0x2f, 0xa6, 0x60, 0x6a, + 0xd0, 0x9a, 0x19, 0xb8, 0x7c, 0xa7, 0x21, 0x65, 0x76, 0xda, 0x75, 0xe4, 0x90, 0x20, 0x25, 0x65, + 0xf6, 0x24, 0x95, 0x21, 0x69, 0xa8, 0x75, 0x64, 0x14, 0x12, 0xb3, 0xc2, 0x7c, 0x7e, 0xe9, 0xa9, + 0xa1, 0x56, 0xe5, 0xc2, 0x16, 0x86, 0xc8, 0x14, 0x29, 0x7d, 0x1a, 0x12, 0xac, 0x44, 0x63, 0x86, + 0x27, 0x87, 0x63, 0xc0, 0x6b, 0x49, 0x26, 0x38, 0xe9, 0x41, 0xc8, 0xe0, 0x7f, 0x69, 0x6e, 0xa4, + 0x88, 0xcf, 0x69, 0x2c, 0xc0, 0x79, 0x21, 0xcd, 0x40, 0x9a, 0x2c, 0x93, 0x06, 0xe2, 0x5b, 0x9b, + 0xff, 0x8c, 0x13, 0xab, 0x81, 0x9a, 0x6a, 0xc7, 0xf0, 0x94, 0x1b, 0xaa, 0xd1, 0x41, 0x24, 0xe1, + 0x33, 0x72, 0x8e, 0x09, 0x3f, 0x8b, 0x65, 0xd2, 0x19, 0xc8, 0xd2, 0x55, 0xa5, 0x9b, 0x0d, 0xf4, + 0x0a, 0xa9, 0x9e, 0x49, 0x99, 0x2e, 0xb4, 0x4d, 0x2c, 0xc1, 0xaf, 0xbf, 0xe6, 0x5a, 0x26, 0x4f, + 0x4d, 0xf2, 0x0a, 0x2c, 0x20, 0xaf, 0xbf, 0xd0, 0x5b, 0xb8, 0x1f, 0x1e, 0x3c, 0xbc, 0xde, 0x9c, + 0x9a, 0xfb, 0x56, 0x0c, 0x12, 0xa4, 0x5e, 0x8c, 0x43, 0x76, 0xef, 0xa5, 0xdd, 0x8a, 0xb2, 0x5e, + 0xdd, 0x5f, 0xdd, 0xaa, 0x88, 0x82, 0x94, 0x07, 0x20, 0x82, 0x2b, 0x5b, 0xd5, 0xf2, 0x9e, 0x18, + 0xf3, 0x9f, 0x37, 0x77, 0xf6, 0xce, 0x2f, 0x8b, 0x71, 0x1f, 0xb0, 0x4f, 0x05, 0x89, 0xb0, 0xc1, + 0xb9, 0x25, 0x31, 0x29, 0x89, 0x90, 0xa3, 0x04, 0x9b, 0x2f, 0x56, 0xd6, 0xcf, 0x2f, 0x8b, 0xa9, + 0x6e, 0xc9, 0xb9, 0x25, 0x71, 0x54, 0x1a, 0x83, 0x0c, 0x91, 0xac, 0x56, 0xab, 0x5b, 0x62, 0xda, + 0xe7, 0xac, 0xed, 0xc9, 0x9b, 0x3b, 0x1b, 0x62, 0xc6, 0xe7, 0xdc, 0x90, 0xab, 0xfb, 0xbb, 0x22, + 0xf8, 0x0c, 0xdb, 0x95, 0x5a, 0xad, 0xbc, 0x51, 0x11, 0xb3, 0xbe, 0xc5, 0xea, 0x4b, 0x7b, 0x95, + 0x9a, 0x98, 0xeb, 0x72, 0xeb, 0xdc, 0x92, 0x38, 0xe6, 0xbf, 0xa2, 0xb2, 0xb3, 0xbf, 0x2d, 0xe6, + 0xa5, 0x09, 0x18, 0xa3, 0xaf, 0xe0, 0x4e, 0x8c, 0xf7, 0x88, 0xce, 0x2f, 0x8b, 0x62, 0xe0, 0x08, + 0x65, 0x99, 0xe8, 0x12, 0x9c, 0x5f, 0x16, 0xa5, 0xb9, 0x35, 0x48, 0x92, 0xec, 0x92, 0x24, 0xc8, + 0x6f, 0x95, 0x57, 0x2b, 0x5b, 0x4a, 0x75, 0x77, 0x6f, 0xb3, 0xba, 0x53, 0xde, 0x12, 0x85, 0x40, + 0x26, 0x57, 0x3e, 0xb3, 0xbf, 0x29, 0x57, 0xd6, 0xc5, 0x58, 0x58, 0xb6, 0x5b, 0x29, 0xef, 0x55, + 0xd6, 0xc5, 0xf8, 0x9c, 0x06, 0x53, 0x83, 0xea, 0xe4, 0xc0, 0x95, 0x11, 0x9a, 0xe2, 0xd8, 0x31, + 0x53, 0x4c, 0xb8, 0xfa, 0xa6, 0xf8, 0xdd, 0x18, 0x4c, 0x0e, 0xd8, 0x2b, 0x06, 0xbe, 0xe4, 0x39, + 0x48, 0xd2, 0x14, 0xa5, 0xbb, 0xe7, 0x13, 0x03, 0x37, 0x1d, 0x92, 0xb0, 0x7d, 0x3b, 0x28, 0xc1, + 0x85, 0x3b, 0x88, 0xf8, 0x31, 0x1d, 0x04, 0xa6, 0xe8, 0xab, 0xe9, 0x3f, 0xdb, 0x57, 0xd3, 0xe9, + 0xb6, 0x77, 0x7e, 0x98, 0x6d, 0x8f, 0xc8, 0x4e, 0x56, 0xdb, 0x93, 0x03, 0x6a, 0xfb, 0x65, 0x98, + 0xe8, 0x23, 0x1a, 0xba, 0xc6, 0xbe, 0x2a, 0x40, 0xe1, 0xb8, 0xe0, 0x44, 0x54, 0xba, 0x58, 0x57, + 0xa5, 0xbb, 0xdc, 0x1b, 0xc1, 0xb3, 0xc7, 0x4f, 0x42, 0xdf, 0x5c, 0xbf, 0x29, 0xc0, 0xf4, 0xe0, + 0x4e, 0x71, 0xa0, 0x0f, 0x9f, 0x86, 0x54, 0x1b, 0x79, 0x07, 0x16, 0xef, 0x96, 0x3e, 0x31, 0x60, + 0x0f, 0xc6, 0xea, 0xde, 0xc9, 0x66, 0xa8, 0xf0, 0x26, 0x1e, 0x3f, 0xae, 0xdd, 0xa3, 0xde, 0xf4, + 0x79, 0xfa, 0x85, 0x18, 0x3c, 0x30, 0x90, 0x7c, 0xa0, 0xa3, 0x0f, 0x03, 0xe8, 0xa6, 0xdd, 0xf1, + 0x68, 0x47, 0x44, 0x0b, 0x6c, 0x86, 0x48, 0x48, 0xf1, 0xc2, 0xc5, 0xb3, 0xe3, 0xf9, 0xfa, 0x38, + 0xd1, 0x03, 0x15, 0x11, 0x83, 0x8b, 0x81, 0xa3, 0x09, 0xe2, 0x68, 0xf1, 0x98, 0x91, 0xf6, 0x25, + 0xe6, 0x33, 0x20, 0x6a, 0x86, 0x8e, 0x4c, 0x4f, 0x71, 0x3d, 0x07, 0xa9, 0x6d, 0xdd, 0x6c, 0x91, + 0x1d, 0x24, 0x5d, 0x4a, 0x36, 0x55, 0xc3, 0x45, 0xf2, 0x38, 0x55, 0xd7, 0xb8, 0x16, 0x23, 0x48, + 0x02, 0x39, 0x21, 0x44, 0xaa, 0x0b, 0x41, 0xd5, 0x3e, 0x62, 0xee, 0x57, 0x33, 0x90, 0x0d, 0xf5, + 0xd5, 0xd2, 0x59, 0xc8, 0x5d, 0x53, 0x6f, 0xa8, 0x0a, 0x3f, 0x2b, 0xd1, 0x48, 0x64, 0xb1, 0x6c, + 0x97, 0x9d, 0x97, 0x9e, 0x81, 0x29, 0x62, 0x62, 0x75, 0x3c, 0xe4, 0x28, 0x9a, 0xa1, 0xba, 0x2e, + 0x09, 0x5a, 0x9a, 0x98, 0x4a, 0x58, 0x57, 0xc5, 0xaa, 0x35, 0xae, 0x91, 0x56, 0x60, 0x92, 0x20, + 0xda, 0x1d, 0xc3, 0xd3, 0x6d, 0x03, 0x29, 0xf8, 0xf4, 0xe6, 0x92, 0x9d, 0xc4, 0xf7, 0x6c, 0x02, + 0x5b, 0x6c, 0x33, 0x03, 0xec, 0x91, 0x2b, 0xad, 0xc3, 0xc3, 0x04, 0xd6, 0x42, 0x26, 0x72, 0x54, + 0x0f, 0x29, 0xe8, 0xf3, 0x1d, 0xd5, 0x70, 0x15, 0xd5, 0x6c, 0x28, 0x07, 0xaa, 0x7b, 0x50, 0x98, + 0xc2, 0x04, 0xab, 0xb1, 0x82, 0x20, 0x9f, 0xc6, 0x86, 0x1b, 0xcc, 0xae, 0x42, 0xcc, 0xca, 0x66, + 0xe3, 0xaa, 0xea, 0x1e, 0x48, 0x25, 0x98, 0x26, 0x2c, 0xae, 0xe7, 0xe8, 0x66, 0x4b, 0xd1, 0x0e, + 0x90, 0x76, 0x5d, 0xe9, 0x78, 0xcd, 0x8b, 0x85, 0x07, 0xc3, 0xef, 0x27, 0x1e, 0xd6, 0x88, 0xcd, + 0x1a, 0x36, 0xd9, 0xf7, 0x9a, 0x17, 0xa5, 0x1a, 0xe4, 0xf0, 0x64, 0xb4, 0xf5, 0x5b, 0x48, 0x69, + 0x5a, 0x0e, 0xd9, 0x1a, 0xf3, 0x03, 0x4a, 0x53, 0x28, 0x82, 0x0b, 0x55, 0x06, 0xd8, 0xb6, 0x1a, + 0xa8, 0x94, 0xac, 0xed, 0x56, 0x2a, 0xeb, 0x72, 0x96, 0xb3, 0x5c, 0xb1, 0x1c, 0x9c, 0x50, 0x2d, + 0xcb, 0x0f, 0x70, 0x96, 0x26, 0x54, 0xcb, 0xe2, 0xe1, 0x5d, 0x81, 0x49, 0x4d, 0xa3, 0x63, 0xd6, + 0x35, 0x85, 0x9d, 0xb1, 0xdc, 0x82, 0xd8, 0x15, 0x2c, 0x4d, 0xdb, 0xa0, 0x06, 0x2c, 0xc7, 0x5d, + 0xe9, 0x12, 0x3c, 0x10, 0x04, 0x2b, 0x0c, 0x9c, 0xe8, 0x1b, 0x65, 0x2f, 0x74, 0x05, 0x26, 0xed, + 0xc3, 0x7e, 0xa0, 0xd4, 0xf5, 0x46, 0xfb, 0xb0, 0x17, 0x76, 0x01, 0xa6, 0xec, 0x03, 0xbb, 0x1f, + 0xf7, 0x64, 0x18, 0x27, 0xd9, 0x07, 0x76, 0x2f, 0xf0, 0x31, 0x72, 0xe0, 0x76, 0x90, 0xa6, 0x7a, + 0xa8, 0x51, 0x38, 0x15, 0x36, 0x0f, 0x29, 0xa4, 0x45, 0x10, 0x35, 0x4d, 0x41, 0xa6, 0x5a, 0x37, + 0x90, 0xa2, 0x3a, 0xc8, 0x54, 0xdd, 0xc2, 0x99, 0xb0, 0x71, 0x5e, 0xd3, 0x2a, 0x44, 0x5b, 0x26, + 0x4a, 0xe9, 0x49, 0x98, 0xb0, 0xea, 0xd7, 0x34, 0x9a, 0x92, 0x8a, 0xed, 0xa0, 0xa6, 0xfe, 0x4a, + 0xe1, 0x51, 0x12, 0xdf, 0x71, 0xac, 0x20, 0x09, 0xb9, 0x4b, 0xc4, 0xd2, 0x13, 0x20, 0x6a, 0xee, + 0x81, 0xea, 0xd8, 0xa4, 0x26, 0xbb, 0xb6, 0xaa, 0xa1, 0xc2, 0x63, 0xd4, 0x94, 0xca, 0x77, 0xb8, + 0x18, 0x2f, 0x09, 0xf7, 0xa6, 0xde, 0xf4, 0x38, 0xe3, 0xe3, 0x74, 0x49, 0x10, 0x19, 0x63, 0x9b, + 0x07, 0x11, 0x87, 0xa2, 0xeb, 0xc5, 0xf3, 0xc4, 0x2c, 0x6f, 0x1f, 0xd8, 0xe1, 0xf7, 0x3e, 0x02, + 0x63, 0xd8, 0x32, 0x78, 0xe9, 0x13, 0xb4, 0x21, 0xb3, 0x0f, 0x42, 0x6f, 0x5c, 0x86, 0x69, 0x6c, + 0xd4, 0x46, 0x9e, 0xda, 0x50, 0x3d, 0x35, 0x64, 0xfd, 0x49, 0x62, 0x8d, 0xe3, 0xbe, 0xcd, 0x94, + 0x5d, 0x7e, 0x3a, 0x9d, 0xfa, 0xa1, 0x9f, 0x59, 0x4f, 0x53, 0x3f, 0xb1, 0x8c, 0xe7, 0xd6, 0x47, + 0xd6, 0x74, 0xcf, 0x95, 0x20, 0x17, 0x4e, 0x7c, 0x29, 0x03, 0x34, 0xf5, 0x45, 0x01, 0x77, 0x41, + 0x6b, 0xd5, 0x75, 0xdc, 0xbf, 0xbc, 0x5c, 0x11, 0x63, 0xb8, 0x8f, 0xda, 0xda, 0xdc, 0xab, 0x28, + 0xf2, 0xfe, 0xce, 0xde, 0xe6, 0x76, 0x45, 0x8c, 0x87, 0x1b, 0xf6, 0xef, 0xc5, 0x20, 0xdf, 0x7d, + 0xf6, 0x92, 0x7e, 0x0a, 0x4e, 0xf1, 0x8b, 0x12, 0x17, 0x79, 0xca, 0x4d, 0xdd, 0x21, 0x6b, 0xb1, + 0xad, 0xd2, 0x7d, 0xd1, 0xcf, 0x86, 0x29, 0x66, 0x55, 0x43, 0xde, 0x0b, 0xba, 0x83, 0x57, 0x5a, + 0x5b, 0xf5, 0xa4, 0x2d, 0x38, 0x63, 0x5a, 0x8a, 0xeb, 0xa9, 0x66, 0x43, 0x75, 0x1a, 0x4a, 0x70, + 0x45, 0xa5, 0xa8, 0x9a, 0x86, 0x5c, 0xd7, 0xa2, 0x7b, 0xa0, 0xcf, 0xf2, 0x90, 0x69, 0xd5, 0x98, + 0x71, 0xb0, 0x39, 0x94, 0x99, 0x69, 0x4f, 0xe6, 0xc6, 0x8f, 0xcb, 0xdc, 0x07, 0x21, 0xd3, 0x56, + 0x6d, 0x05, 0x99, 0x9e, 0x73, 0x48, 0x3a, 0xee, 0xb4, 0x9c, 0x6e, 0xab, 0x76, 0x05, 0x3f, 0x7f, + 0x3c, 0x07, 0x9f, 0x1f, 0xc6, 0x21, 0x17, 0xee, 0xba, 0xf1, 0x21, 0x46, 0x23, 0x1b, 0x94, 0x40, + 0x4a, 0xd8, 0x23, 0xf7, 0xed, 0xd1, 0x17, 0xd6, 0xf0, 0xce, 0x55, 0x4a, 0xd1, 0x5e, 0x58, 0xa6, + 0x48, 0xdc, 0x35, 0xe0, 0xd4, 0x42, 0xb4, 0xf7, 0x48, 0xcb, 0xec, 0x49, 0xda, 0x80, 0xd4, 0x35, + 0x97, 0x70, 0xa7, 0x08, 0xf7, 0xa3, 0xf7, 0xe7, 0x7e, 0xbe, 0x46, 0xc8, 0x33, 0xcf, 0xd7, 0x94, + 0x9d, 0xaa, 0xbc, 0x5d, 0xde, 0x92, 0x19, 0x5c, 0x3a, 0x0d, 0x09, 0x43, 0xbd, 0x75, 0xd8, 0xbd, + 0xc7, 0x11, 0xd1, 0xb0, 0x81, 0x3f, 0x0d, 0x89, 0x9b, 0x48, 0xbd, 0xde, 0xbd, 0xb3, 0x10, 0xd1, + 0x47, 0x98, 0xfa, 0x8b, 0x90, 0x24, 0xf1, 0x92, 0x00, 0x58, 0xc4, 0xc4, 0x11, 0x29, 0x0d, 0x89, + 0xb5, 0xaa, 0x8c, 0xd3, 0x5f, 0x84, 0x1c, 0x95, 0x2a, 0xbb, 0x9b, 0x95, 0xb5, 0x8a, 0x18, 0x9b, + 0x5b, 0x81, 0x14, 0x0d, 0x02, 0x5e, 0x1a, 0x7e, 0x18, 0xc4, 0x11, 0xf6, 0xc8, 0x38, 0x04, 0xae, + 0xdd, 0xdf, 0x5e, 0xad, 0xc8, 0x62, 0x2c, 0x3c, 0xbd, 0x2e, 0xe4, 0xc2, 0x0d, 0xf7, 0xc7, 0x93, + 0x53, 0xdf, 0x15, 0x20, 0x1b, 0x6a, 0xa0, 0x71, 0xe7, 0xa3, 0x1a, 0x86, 0x75, 0x53, 0x51, 0x0d, + 0x5d, 0x75, 0x59, 0x52, 0x00, 0x11, 0x95, 0xb1, 0x64, 0xd8, 0x49, 0xfb, 0x58, 0x9c, 0x7f, 0x43, + 0x00, 0xb1, 0xb7, 0x77, 0xed, 0x71, 0x50, 0xf8, 0x89, 0x3a, 0xf8, 0xba, 0x00, 0xf9, 0xee, 0x86, + 0xb5, 0xc7, 0xbd, 0xb3, 0x3f, 0x51, 0xf7, 0xde, 0x89, 0xc1, 0x58, 0x57, 0x9b, 0x3a, 0xac, 0x77, + 0x9f, 0x87, 0x09, 0xbd, 0x81, 0xda, 0xb6, 0xe5, 0x21, 0x53, 0x3b, 0x54, 0x0c, 0x74, 0x03, 0x19, + 0x85, 0x39, 0x52, 0x28, 0x16, 0xef, 0xdf, 0x08, 0x2f, 0x6c, 0x06, 0xb8, 0x2d, 0x0c, 0x2b, 0x4d, + 0x6e, 0xae, 0x57, 0xb6, 0x77, 0xab, 0x7b, 0x95, 0x9d, 0xb5, 0x97, 0x94, 0xfd, 0x9d, 0x9f, 0xd9, + 0xa9, 0xbe, 0xb0, 0x23, 0x8b, 0x7a, 0x8f, 0xd9, 0x47, 0xb8, 0xd4, 0x77, 0x41, 0xec, 0x75, 0x4a, + 0x3a, 0x05, 0x83, 0xdc, 0x12, 0x47, 0xa4, 0x49, 0x18, 0xdf, 0xa9, 0x2a, 0xb5, 0xcd, 0xf5, 0x8a, + 0x52, 0xb9, 0x72, 0xa5, 0xb2, 0xb6, 0x57, 0xa3, 0x57, 0x1b, 0xbe, 0xf5, 0x5e, 0xf7, 0xa2, 0x7e, + 0x2d, 0x0e, 0x93, 0x03, 0x3c, 0x91, 0xca, 0xec, 0x50, 0x42, 0xcf, 0x49, 0x4f, 0x0f, 0xe3, 0xfd, + 0x02, 0xee, 0x0a, 0x76, 0x55, 0xc7, 0x63, 0x67, 0x98, 0x27, 0x00, 0x47, 0xc9, 0xf4, 0xf4, 0xa6, + 0x8e, 0x1c, 0x76, 0x13, 0x44, 0x4f, 0x2a, 0xe3, 0x81, 0x9c, 0x5e, 0x06, 0x7d, 0x12, 0x24, 0xdb, + 0x72, 0x75, 0x4f, 0xbf, 0x81, 0x14, 0xdd, 0xe4, 0xd7, 0x46, 0xf8, 0xe4, 0x92, 0x90, 0x45, 0xae, + 0xd9, 0x34, 0x3d, 0xdf, 0xda, 0x44, 0x2d, 0xb5, 0xc7, 0x1a, 0x17, 0xf0, 0xb8, 0x2c, 0x72, 0x8d, + 0x6f, 0x7d, 0x16, 0x72, 0x0d, 0xab, 0x83, 0xdb, 0x39, 0x6a, 0x87, 0xf7, 0x0b, 0x41, 0xce, 0x52, + 0x99, 0x6f, 0xc2, 0x1a, 0xf5, 0xe0, 0xbe, 0x2a, 0x27, 0x67, 0xa9, 0x8c, 0x9a, 0x3c, 0x0e, 0xe3, + 0x6a, 0xab, 0xe5, 0x60, 0x72, 0x4e, 0x44, 0x8f, 0x1e, 0x79, 0x5f, 0x4c, 0x0c, 0x67, 0x9e, 0x87, + 0x34, 0x8f, 0x03, 0xde, 0x92, 0x71, 0x24, 0x14, 0x9b, 0x9e, 0xa7, 0x63, 0xf3, 0x19, 0x39, 0x6d, + 0x72, 0xe5, 0x59, 0xc8, 0xe9, 0xae, 0x12, 0x5c, 0xbf, 0xc7, 0x66, 0x63, 0xf3, 0x69, 0x39, 0xab, + 0xbb, 0xfe, 0xd5, 0xe5, 0xdc, 0x9b, 0x31, 0xc8, 0x77, 0x7f, 0x3e, 0x90, 0xd6, 0x21, 0x6d, 0x58, + 0x9a, 0x4a, 0x52, 0x8b, 0x7e, 0xbb, 0x9a, 0x8f, 0xf8, 0xe2, 0xb0, 0xb0, 0xc5, 0xec, 0x65, 0x1f, + 0x39, 0xf3, 0xcf, 0x02, 0xa4, 0xb9, 0x58, 0x9a, 0x86, 0x84, 0xad, 0x7a, 0x07, 0x84, 0x2e, 0xb9, + 0x1a, 0x13, 0x05, 0x99, 0x3c, 0x63, 0xb9, 0x6b, 0xab, 0x26, 0x49, 0x01, 0x26, 0xc7, 0xcf, 0x78, + 0x5e, 0x0d, 0xa4, 0x36, 0xc8, 0xb9, 0xc6, 0x6a, 0xb7, 0x91, 0xe9, 0xb9, 0x7c, 0x5e, 0x99, 0x7c, + 0x8d, 0x89, 0xa5, 0xa7, 0x60, 0xc2, 0x73, 0x54, 0xdd, 0xe8, 0xb2, 0x4d, 0x10, 0x5b, 0x91, 0x2b, + 0x7c, 0xe3, 0x12, 0x9c, 0xe6, 0xbc, 0x0d, 0xe4, 0xa9, 0xda, 0x01, 0x6a, 0x04, 0xa0, 0x14, 0xb9, + 0xbf, 0x38, 0xc5, 0x0c, 0xd6, 0x99, 0x9e, 0x63, 0xe7, 0x7e, 0x20, 0xc0, 0x04, 0x3f, 0x89, 0x35, + 0xfc, 0x60, 0x6d, 0x03, 0xa8, 0xa6, 0x69, 0x79, 0xe1, 0x70, 0xf5, 0xa7, 0x72, 0x1f, 0x6e, 0xa1, + 0xec, 0x83, 0xe4, 0x10, 0xc1, 0x4c, 0x1b, 0x20, 0xd0, 0x1c, 0x1b, 0xb6, 0x33, 0x90, 0x65, 0xdf, + 0x86, 0xc8, 0x07, 0x46, 0x7a, 0x76, 0x07, 0x2a, 0xc2, 0x47, 0x36, 0x69, 0x0a, 0x92, 0x75, 0xd4, + 0xd2, 0x4d, 0x76, 0xe3, 0x4b, 0x1f, 0xf8, 0x0d, 0x4b, 0xc2, 0xbf, 0x61, 0x59, 0xfd, 0x1c, 0x4c, + 0x6a, 0x56, 0xbb, 0xd7, 0xdd, 0x55, 0xb1, 0xe7, 0xfe, 0xc0, 0xbd, 0x2a, 0xbc, 0x0c, 0x41, 0x8b, + 0xf9, 0xa1, 0x20, 0x7c, 0x35, 0x16, 0xdf, 0xd8, 0x5d, 0xfd, 0x7a, 0x6c, 0x66, 0x83, 0x42, 0x77, + 0xf9, 0x48, 0x65, 0xd4, 0x34, 0x90, 0x86, 0xbd, 0x87, 0xaf, 0x3d, 0x05, 0x4f, 0xb7, 0x74, 0xef, + 0xa0, 0x53, 0x5f, 0xd0, 0xac, 0xf6, 0x62, 0xcb, 0x6a, 0x59, 0xc1, 0x37, 0x55, 0xfc, 0x44, 0x1e, + 0xc8, 0x5f, 0xec, 0xbb, 0x6a, 0xc6, 0x97, 0xce, 0x44, 0x7e, 0x84, 0x2d, 0xed, 0xc0, 0x24, 0x33, + 0x56, 0xc8, 0x87, 0x1d, 0x7a, 0x3c, 0x91, 0xee, 0x7b, 0x39, 0x56, 0xf8, 0xe6, 0x7b, 0x64, 0xbb, + 0x96, 0x27, 0x18, 0x14, 0xeb, 0xe8, 0x09, 0xa6, 0x24, 0xc3, 0x03, 0x5d, 0x7c, 0x74, 0x69, 0x22, + 0x27, 0x82, 0xf1, 0x7b, 0x8c, 0x71, 0x32, 0xc4, 0x58, 0x63, 0xd0, 0xd2, 0x1a, 0x8c, 0x9d, 0x84, + 0xeb, 0x1f, 0x19, 0x57, 0x0e, 0x85, 0x49, 0x36, 0x60, 0x9c, 0x90, 0x68, 0x1d, 0xd7, 0xb3, 0xda, + 0xa4, 0xee, 0xdd, 0x9f, 0xe6, 0x9f, 0xde, 0xa3, 0x6b, 0x25, 0x8f, 0x61, 0x6b, 0x3e, 0xaa, 0x54, + 0x02, 0xf2, 0x2d, 0xab, 0x81, 0x34, 0x23, 0x82, 0xe1, 0x6d, 0xe6, 0x88, 0x6f, 0x5f, 0xfa, 0x2c, + 0x4c, 0xe1, 0xbf, 0x49, 0x59, 0x0a, 0x7b, 0x12, 0x7d, 0x93, 0x56, 0xf8, 0xc1, 0xab, 0x74, 0x39, + 0x4e, 0xfa, 0x04, 0x21, 0x9f, 0x42, 0xb3, 0xd8, 0x42, 0x9e, 0x87, 0x1c, 0x57, 0x51, 0x8d, 0x41, + 0xee, 0x85, 0xae, 0x22, 0x0a, 0x5f, 0x7a, 0xbf, 0x7b, 0x16, 0x37, 0x28, 0xb2, 0x6c, 0x18, 0xa5, + 0x7d, 0x38, 0x35, 0x20, 0x2b, 0x86, 0xe0, 0x7c, 0x8d, 0x71, 0x4e, 0xf5, 0x65, 0x06, 0xa6, 0xdd, + 0x05, 0x2e, 0xf7, 0xe7, 0x72, 0x08, 0xce, 0xdf, 0x67, 0x9c, 0x12, 0xc3, 0xf2, 0x29, 0xc5, 0x8c, + 0xcf, 0xc3, 0xc4, 0x0d, 0xe4, 0xd4, 0x2d, 0x97, 0x5d, 0xff, 0x0c, 0x41, 0xf7, 0x3a, 0xa3, 0x1b, + 0x67, 0x40, 0x72, 0x1f, 0x84, 0xb9, 0x2e, 0x41, 0xba, 0xa9, 0x6a, 0x68, 0x08, 0x8a, 0x2f, 0x33, + 0x8a, 0x51, 0x6c, 0x8f, 0xa1, 0x65, 0xc8, 0xb5, 0x2c, 0xb6, 0x33, 0x45, 0xc3, 0xdf, 0x60, 0xf0, + 0x2c, 0xc7, 0x30, 0x0a, 0xdb, 0xb2, 0x3b, 0x06, 0xde, 0xb6, 0xa2, 0x29, 0xfe, 0x80, 0x53, 0x70, + 0x0c, 0xa3, 0x38, 0x41, 0x58, 0xff, 0x90, 0x53, 0xb8, 0xa1, 0x78, 0x3e, 0x07, 0x59, 0xcb, 0x34, + 0x0e, 0x2d, 0x73, 0x18, 0x27, 0xbe, 0xc2, 0x18, 0x80, 0x41, 0x30, 0xc1, 0x65, 0xc8, 0x0c, 0x3b, + 0x11, 0x7f, 0xfc, 0x3e, 0x5f, 0x1e, 0x7c, 0x06, 0x36, 0x60, 0x9c, 0x17, 0x28, 0xdd, 0x32, 0x87, + 0xa0, 0xf8, 0x1a, 0xa3, 0xc8, 0x87, 0x60, 0x6c, 0x18, 0x1e, 0x72, 0xbd, 0x16, 0x1a, 0x86, 0xe4, + 0x4d, 0x3e, 0x0c, 0x06, 0x61, 0xa1, 0xac, 0x23, 0x53, 0x3b, 0x18, 0x8e, 0xe1, 0x2d, 0x1e, 0x4a, + 0x8e, 0xc1, 0x14, 0x6b, 0x30, 0xd6, 0x56, 0x1d, 0xf7, 0x40, 0x35, 0x86, 0x9a, 0x8e, 0x3f, 0x61, + 0x1c, 0x39, 0x1f, 0xc4, 0x22, 0xd2, 0x31, 0x4f, 0x42, 0xf3, 0x75, 0x1e, 0x91, 0x10, 0x8c, 0x2d, + 0x3d, 0xd7, 0x23, 0x77, 0x65, 0x27, 0x61, 0xfb, 0x53, 0xbe, 0xf4, 0x28, 0x76, 0x3b, 0xcc, 0x78, + 0x19, 0x32, 0xae, 0x7e, 0x6b, 0x28, 0x9a, 0x3f, 0xe3, 0x33, 0x4d, 0x00, 0x18, 0xfc, 0x12, 0x9c, + 0x1e, 0xb8, 0x4d, 0x0c, 0x41, 0xf6, 0xe7, 0x8c, 0x6c, 0x7a, 0xc0, 0x56, 0xc1, 0x4a, 0xc2, 0x49, + 0x29, 0xff, 0x82, 0x97, 0x04, 0xd4, 0xc3, 0xb5, 0x8b, 0xcf, 0x0a, 0xae, 0xda, 0x3c, 0x59, 0xd4, + 0xfe, 0x92, 0x47, 0x8d, 0x62, 0xbb, 0xa2, 0xb6, 0x07, 0xd3, 0x8c, 0xf1, 0x64, 0xf3, 0xfa, 0x0d, + 0x5e, 0x58, 0x29, 0x7a, 0xbf, 0x7b, 0x76, 0x3f, 0x07, 0x33, 0x7e, 0x38, 0x79, 0x53, 0xea, 0x2a, + 0x6d, 0xd5, 0x1e, 0x82, 0xf9, 0x9b, 0x8c, 0x99, 0x57, 0x7c, 0xbf, 0xab, 0x75, 0xb7, 0x55, 0x1b, + 0x93, 0xbf, 0x08, 0x05, 0x4e, 0xde, 0x31, 0x1d, 0xa4, 0x59, 0x2d, 0x53, 0xbf, 0x85, 0x1a, 0x43, + 0x50, 0xff, 0x55, 0xcf, 0x54, 0xed, 0x87, 0xe0, 0x98, 0x79, 0x13, 0x44, 0xbf, 0x57, 0x51, 0xf4, + 0xb6, 0x6d, 0x39, 0x5e, 0x04, 0xe3, 0x5f, 0xf3, 0x99, 0xf2, 0x71, 0x9b, 0x04, 0x56, 0xaa, 0x40, + 0x9e, 0x3c, 0x0e, 0x9b, 0x92, 0x7f, 0xc3, 0x88, 0xc6, 0x02, 0x14, 0x2b, 0x1c, 0x9a, 0xd5, 0xb6, + 0x55, 0x67, 0x98, 0xfa, 0xf7, 0xb7, 0xbc, 0x70, 0x30, 0x08, 0x2b, 0x1c, 0xde, 0xa1, 0x8d, 0xf0, + 0x6e, 0x3f, 0x04, 0xc3, 0xb7, 0x78, 0xe1, 0xe0, 0x18, 0x46, 0xc1, 0x1b, 0x86, 0x21, 0x28, 0xfe, + 0x8e, 0x53, 0x70, 0x0c, 0xa6, 0xf8, 0x4c, 0xb0, 0xd1, 0x3a, 0xa8, 0xa5, 0xbb, 0x9e, 0x43, 0x5b, + 0xe1, 0xfb, 0x53, 0x7d, 0xfb, 0xfd, 0xee, 0x26, 0x4c, 0x0e, 0x41, 0x71, 0x25, 0x62, 0x57, 0xa8, + 0xe4, 0xa4, 0x14, 0xed, 0xd8, 0x77, 0x78, 0x25, 0x0a, 0xc1, 0xb0, 0x6f, 0xa1, 0x0e, 0x11, 0x87, + 0x5d, 0xc3, 0xe7, 0x83, 0x21, 0xe8, 0xbe, 0xdb, 0xe3, 0x5c, 0x8d, 0x63, 0x31, 0x67, 0xa8, 0xff, + 0xe9, 0x98, 0xd7, 0xd1, 0xe1, 0x50, 0xd9, 0xf9, 0xf7, 0x3d, 0xfd, 0xcf, 0x3e, 0x45, 0xd2, 0x1a, + 0x32, 0xde, 0xd3, 0x4f, 0x49, 0x51, 0xbf, 0x02, 0x2a, 0xfc, 0xfc, 0x5d, 0x36, 0xde, 0xee, 0x76, + 0xaa, 0xb4, 0x85, 0x93, 0xbc, 0xbb, 0xe9, 0x89, 0x26, 0x7b, 0xf5, 0xae, 0x9f, 0xe7, 0x5d, 0x3d, + 0x4f, 0xe9, 0x0a, 0x8c, 0x75, 0x35, 0x3c, 0xd1, 0x54, 0xbf, 0xc0, 0xa8, 0x72, 0xe1, 0x7e, 0xa7, + 0xb4, 0x02, 0x09, 0xdc, 0xbc, 0x44, 0xc3, 0x7f, 0x91, 0xc1, 0x89, 0x79, 0xe9, 0x53, 0x90, 0xe6, + 0x4d, 0x4b, 0x34, 0xf4, 0x97, 0x18, 0xd4, 0x87, 0x60, 0x38, 0x6f, 0x58, 0xa2, 0xe1, 0xbf, 0xcc, + 0xe1, 0x1c, 0x82, 0xe1, 0xc3, 0x87, 0xf0, 0x1f, 0x7e, 0x25, 0xc1, 0x36, 0x1d, 0x1e, 0xbb, 0xcb, + 0x30, 0xca, 0x3a, 0x95, 0x68, 0xf4, 0x17, 0xd8, 0xcb, 0x39, 0xa2, 0x74, 0x01, 0x92, 0x43, 0x06, + 0xfc, 0xd7, 0x18, 0x94, 0xda, 0x97, 0xd6, 0x20, 0x1b, 0xea, 0x4e, 0xa2, 0xe1, 0xbf, 0xce, 0xe0, + 0x61, 0x14, 0x76, 0x9d, 0x75, 0x27, 0xd1, 0x04, 0xbf, 0xc1, 0x5d, 0x67, 0x08, 0x1c, 0x36, 0xde, + 0x98, 0x44, 0xa3, 0x7f, 0x93, 0x47, 0x9d, 0x43, 0x4a, 0xcf, 0x41, 0xc6, 0xdf, 0x6c, 0xa2, 0xf1, + 0xbf, 0xc5, 0xf0, 0x01, 0x06, 0x47, 0x20, 0xb4, 0xd9, 0x45, 0x53, 0xfc, 0x36, 0x8f, 0x40, 0x08, + 0x85, 0x97, 0x51, 0x6f, 0x03, 0x13, 0xcd, 0xf4, 0x3b, 0x7c, 0x19, 0xf5, 0xf4, 0x2f, 0x78, 0x36, + 0x49, 0xcd, 0x8f, 0xa6, 0xf8, 0x5d, 0x3e, 0x9b, 0xc4, 0x1e, 0xbb, 0xd1, 0xdb, 0x11, 0x44, 0x73, + 0xfc, 0x1e, 0x77, 0xa3, 0xa7, 0x21, 0x28, 0xed, 0x82, 0xd4, 0xdf, 0x0d, 0x44, 0xf3, 0x7d, 0x91, + 0xf1, 0x4d, 0xf4, 0x35, 0x03, 0xa5, 0x17, 0x60, 0x7a, 0x70, 0x27, 0x10, 0xcd, 0xfa, 0xa5, 0xbb, + 0x3d, 0x67, 0xb7, 0x70, 0x23, 0x50, 0xda, 0x0b, 0xb6, 0x94, 0x70, 0x17, 0x10, 0x4d, 0xfb, 0xda, + 0xdd, 0xee, 0xc2, 0x1d, 0x6e, 0x02, 0x4a, 0x65, 0x80, 0x60, 0x03, 0x8e, 0xe6, 0x7a, 0x9d, 0x71, + 0x85, 0x40, 0x78, 0x69, 0xb0, 0xfd, 0x37, 0x1a, 0xff, 0x65, 0xbe, 0x34, 0x18, 0x02, 0x2f, 0x0d, + 0xbe, 0xf5, 0x46, 0xa3, 0xdf, 0xe0, 0x4b, 0x83, 0x43, 0x70, 0x66, 0x87, 0x76, 0xb7, 0x68, 0x86, + 0xaf, 0xf0, 0xcc, 0x0e, 0xa1, 0x4a, 0x3b, 0x30, 0xd1, 0xb7, 0x21, 0x46, 0x53, 0x7d, 0x95, 0x51, + 0x89, 0xbd, 0xfb, 0x61, 0x78, 0xf3, 0x62, 0x9b, 0x61, 0x34, 0xdb, 0x1f, 0xf5, 0x6c, 0x5e, 0x6c, + 0x2f, 0x2c, 0x5d, 0x86, 0xb4, 0xd9, 0x31, 0x0c, 0xbc, 0x78, 0xa4, 0xfb, 0xff, 0x72, 0xaf, 0xf0, + 0x6f, 0xf7, 0x58, 0x74, 0x38, 0xa0, 0xb4, 0x02, 0x49, 0xd4, 0xae, 0xa3, 0x46, 0x14, 0xf2, 0xdf, + 0xef, 0xf1, 0x82, 0x89, 0xad, 0x4b, 0xcf, 0x01, 0xd0, 0xab, 0x11, 0xf2, 0xd9, 0x2f, 0x02, 0xfb, + 0x1f, 0xf7, 0xd8, 0x6f, 0x6a, 0x02, 0x48, 0x40, 0x40, 0x7f, 0xa1, 0x73, 0x7f, 0x82, 0xf7, 0xbb, + 0x09, 0xc8, 0x8c, 0x5c, 0x82, 0xd1, 0x6b, 0xae, 0x65, 0x7a, 0x6a, 0x2b, 0x0a, 0xfd, 0x9f, 0x0c, + 0xcd, 0xed, 0x71, 0xc0, 0xda, 0x96, 0x83, 0x3c, 0xb5, 0xe5, 0x46, 0x61, 0xff, 0x8b, 0x61, 0x7d, + 0x00, 0x06, 0x6b, 0xaa, 0xeb, 0x0d, 0x33, 0xee, 0xff, 0xe6, 0x60, 0x0e, 0xc0, 0x4e, 0xe3, 0xbf, + 0xaf, 0xa3, 0xc3, 0x28, 0xec, 0x07, 0xdc, 0x69, 0x66, 0x5f, 0xfa, 0x14, 0x64, 0xf0, 0x9f, 0xf4, + 0x87, 0x72, 0x11, 0xe0, 0xff, 0x61, 0xe0, 0x00, 0x81, 0xdf, 0xec, 0x7a, 0x0d, 0x4f, 0x8f, 0x0e, + 0xf6, 0xff, 0xb2, 0x99, 0xe6, 0xf6, 0xa5, 0x32, 0x64, 0x5d, 0xaf, 0xd1, 0xe8, 0xb0, 0xfe, 0x34, + 0x02, 0xfe, 0x7f, 0xf7, 0xfc, 0x2b, 0x0b, 0x1f, 0x83, 0x67, 0xfb, 0xe6, 0x75, 0xcf, 0xb6, 0xc8, + 0x67, 0x8e, 0x28, 0x86, 0xbb, 0x8c, 0x21, 0x04, 0x59, 0xad, 0x0c, 0xbe, 0xbe, 0x85, 0x0d, 0x6b, + 0xc3, 0xa2, 0x17, 0xb7, 0x2f, 0xcf, 0x45, 0xdf, 0xc0, 0xc2, 0x1b, 0x49, 0x78, 0x48, 0xb3, 0xda, + 0x75, 0xcb, 0x5d, 0x0c, 0x15, 0xf3, 0x45, 0xcb, 0x64, 0x9c, 0x52, 0xdc, 0x32, 0xd1, 0xcc, 0xc9, + 0xee, 0x72, 0xe7, 0x4e, 0x43, 0xb2, 0xd6, 0xa9, 0xd7, 0x0f, 0x25, 0x11, 0xe2, 0x6e, 0xa7, 0xce, + 0x7e, 0x70, 0x85, 0xff, 0x9c, 0xfb, 0x61, 0x1c, 0xb2, 0x35, 0xb5, 0x6d, 0x1b, 0xa8, 0x6a, 0xa2, + 0x6a, 0x53, 0x2a, 0x40, 0x8a, 0x0c, 0xf5, 0x59, 0x62, 0x24, 0x5c, 0x1d, 0x91, 0xd9, 0xb3, 0xaf, + 0x59, 0x22, 0x77, 0xdc, 0x31, 0x5f, 0xb3, 0xe4, 0x6b, 0xce, 0xd1, 0x2b, 0x6e, 0x5f, 0x73, 0xce, + 0xd7, 0x2c, 0x93, 0x8b, 0xee, 0xb8, 0xaf, 0x59, 0xf6, 0x35, 0x2b, 0xe4, 0x43, 0xce, 0x98, 0xaf, + 0x59, 0xf1, 0x35, 0xe7, 0xc9, 0xa7, 0x9b, 0x84, 0xaf, 0x39, 0xef, 0x6b, 0x2e, 0x90, 0x2f, 0x36, + 0x13, 0xbe, 0xe6, 0x82, 0xaf, 0xb9, 0x48, 0xbe, 0xd2, 0x48, 0xbe, 0xe6, 0xa2, 0xaf, 0xb9, 0x44, + 0x7e, 0x57, 0x35, 0xea, 0x6b, 0x2e, 0x49, 0x33, 0x30, 0x4a, 0x47, 0xf6, 0x0c, 0xf9, 0x94, 0x3f, + 0x7e, 0x75, 0x44, 0xe6, 0x82, 0x40, 0xf7, 0x2c, 0xf9, 0xed, 0x54, 0x2a, 0xd0, 0x3d, 0x1b, 0xe8, + 0x96, 0xc8, 0x7f, 0xe1, 0x10, 0x03, 0xdd, 0x52, 0xa0, 0x3b, 0x57, 0x18, 0xc3, 0x19, 0x12, 0xe8, + 0xce, 0x05, 0xba, 0xe5, 0x42, 0x1e, 0xc7, 0x3f, 0xd0, 0x2d, 0x07, 0xba, 0x95, 0xc2, 0xf8, 0xac, + 0x30, 0x9f, 0x0b, 0x74, 0x2b, 0xd2, 0xd3, 0x90, 0x75, 0x3b, 0x75, 0x85, 0xd5, 0x7a, 0xf2, 0x1b, + 0xad, 0xec, 0x12, 0x2c, 0xe0, 0x8c, 0x20, 0x93, 0x7a, 0x75, 0x44, 0x06, 0xb7, 0x53, 0x67, 0xa5, + 0x78, 0x35, 0x07, 0xe4, 0x06, 0x4a, 0x21, 0x3f, 0xad, 0x5e, 0xbd, 0xfa, 0xf6, 0x9d, 0xe2, 0xc8, + 0xf7, 0xef, 0x14, 0x47, 0xfe, 0xe5, 0x4e, 0x71, 0xe4, 0x9d, 0x3b, 0x45, 0xe1, 0x83, 0x3b, 0x45, + 0xe1, 0xc3, 0x3b, 0x45, 0xe1, 0xf6, 0x51, 0x51, 0x78, 0xeb, 0xa8, 0x28, 0x7c, 0xe3, 0xa8, 0x28, + 0x7c, 0xfb, 0xa8, 0x28, 0xbc, 0x7d, 0x54, 0x1c, 0xf9, 0xfe, 0x51, 0x51, 0x78, 0xe7, 0xa8, 0x28, + 0xfc, 0xe8, 0xa8, 0x38, 0xf2, 0xc1, 0x51, 0x51, 0xf8, 0xf0, 0xa8, 0x38, 0x72, 0xfb, 0xdd, 0xe2, + 0xc8, 0x5b, 0xef, 0x16, 0x85, 0x7a, 0x8a, 0xa4, 0xd2, 0xb9, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, + 0xb4, 0xe8, 0xa9, 0xfa, 0x95, 0x35, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) @@ -3115,6 +3546,7 @@ func skipOne(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -3146,10 +3578,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -3170,55 +3600,30 @@ return 0, ErrInvalidLengthOne } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthOne - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowOne - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipOne(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthOne - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupOne + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthOne + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthOne = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowOne = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthOne = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowOne = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupOne = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/unmarshaler/onepb_test.go golang-gogoprotobuf-1.3.1/test/oneof3/combos/unmarshaler/onepb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/unmarshaler/onepb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/unmarshaler/onepb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -199,6 +199,54 @@ } } +func TestSubbyCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSubby(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &Subby{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSubby(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestSampleOneOfCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedSampleOneOf(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &SampleOneOf{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedSampleOneOf(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} func TestOneDescription(t *testing.T) { OneDescription() } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/unmarshaler/one.proto golang-gogoprotobuf-1.3.1/test/oneof3/combos/unmarshaler/one.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/combos/unmarshaler/one.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/combos/unmarshaler/one.proto 2020-05-17 12:22:58.000000000 +0000 @@ -54,6 +54,8 @@ option (gogoproto.unsafe_marshaler_all) = false; option (gogoproto.unsafe_unmarshaler_all) = false; +option (gogoproto.compare_all) = true; + message Subby { string sub = 1; } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/one.proto golang-gogoprotobuf-1.3.1/test/oneof3/one.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneof3/one.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneof3/one.proto 2020-05-17 12:22:58.000000000 +0000 @@ -54,6 +54,8 @@ option (gogoproto.unsafe_marshaler_all) = false; option (gogoproto.unsafe_unmarshaler_all) = false; +option (gogoproto.compare_all) = true; + message Subby { string sub = 1; } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneofembed/oneofembed.pb.go golang-gogoprotobuf-1.3.1/test/oneofembed/oneofembed.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneofembed/oneofembed.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneofembed/oneofembed.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Foo struct { *Bar `protobuf:"bytes,1,opt,name=bar,proto3,embedded=bar" json:"bar,omitempty"` @@ -90,13 +90,14 @@ type isBar_Pick interface { isBar_Pick() Equal(interface{}) bool + Compare(interface{}) int } type Bar_A struct { - A bool `protobuf:"varint,11,opt,name=a,proto3,oneof"` + A bool `protobuf:"varint,11,opt,name=a,proto3,oneof" json:"a,omitempty"` } type Bar_B struct { - B bool `protobuf:"varint,12,opt,name=b,proto3,oneof"` + B bool `protobuf:"varint,12,opt,name=b,proto3,oneof" json:"b,omitempty"` } func (*Bar_A) isBar_Pick() {} @@ -123,78 +124,14 @@ return false } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Bar) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Bar_OneofMarshaler, _Bar_OneofUnmarshaler, _Bar_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Bar) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Bar_A)(nil), (*Bar_B)(nil), } } -func _Bar_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Bar) - // pick - switch x := m.Pick.(type) { - case *Bar_A: - t := uint64(0) - if x.A { - t = 1 - } - _ = b.EncodeVarint(11<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *Bar_B: - t := uint64(0) - if x.B { - t = 1 - } - _ = b.EncodeVarint(12<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case nil: - default: - return fmt.Errorf("Bar.Pick has unexpected type %T", x) - } - return nil -} - -func _Bar_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Bar) - switch tag { - case 11: // pick.a - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Pick = &Bar_A{x != 0} - return true, err - case 12: // pick.b - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Pick = &Bar_B{x != 0} - return true, err - default: - return false, nil - } -} - -func _Bar_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Bar) - // pick - switch x := m.Pick.(type) { - case *Bar_A: - n += 1 // tag and wire - n += 1 - case *Bar_B: - n += 1 // tag and wire - n += 1 - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*Foo)(nil), "proto.Foo") proto.RegisterType((*Bar)(nil), "proto.Bar") @@ -203,7 +140,7 @@ func init() { proto.RegisterFile("oneofembed.proto", fileDescriptor_70b95aca3b5d76ed) } var fileDescriptor_70b95aca3b5d76ed = []byte{ - // 171 bytes of a gzipped FileDescriptorProto + // 175 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xc8, 0xcf, 0x4b, 0xcd, 0x4f, 0x4b, 0xcd, 0x4d, 0x4a, 0x4d, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0x53, 0x52, 0xba, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xe9, 0xf9, 0xe9, @@ -212,11 +149,175 @@ 0x35, 0xb8, 0x8d, 0xb8, 0x20, 0x72, 0x7a, 0x4e, 0x89, 0x45, 0x4e, 0x2c, 0x17, 0xee, 0xc9, 0x33, 0x06, 0x81, 0x24, 0x95, 0x74, 0xb9, 0x98, 0x9d, 0x12, 0x8b, 0x84, 0xf8, 0xb8, 0x18, 0x13, 0x25, 0xb8, 0x15, 0x18, 0x35, 0x38, 0x3c, 0x18, 0x82, 0x18, 0x13, 0x41, 0xfc, 0x24, 0x09, 0x1e, 0x18, - 0x3f, 0xc9, 0x89, 0x8d, 0x8b, 0xa5, 0x20, 0x33, 0x39, 0xdb, 0x89, 0xe7, 0xc7, 0x43, 0x39, 0xc6, - 0x15, 0x8f, 0xe4, 0x18, 0x77, 0x3c, 0x92, 0x63, 0x4c, 0x62, 0x03, 0x1b, 0x69, 0x0c, 0x08, 0x00, - 0x00, 0xff, 0xff, 0x56, 0x58, 0x05, 0x27, 0xb8, 0x00, 0x00, 0x00, + 0x3f, 0xc9, 0x89, 0x8d, 0x8b, 0xa5, 0x20, 0x33, 0x39, 0xdb, 0x49, 0xe0, 0xc7, 0x43, 0x39, 0xc6, + 0x15, 0x8f, 0xe4, 0x18, 0x77, 0x3c, 0x92, 0x63, 0x5c, 0xf1, 0x58, 0x8e, 0x31, 0x89, 0x0d, 0x6c, + 0xac, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x9f, 0x49, 0x0a, 0xbc, 0x00, 0x00, 0x00, +} + +func (this *Foo) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Foo) + if !ok { + that2, ok := that.(Foo) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.Bar.Compare(that1.Bar); c != 0 { + return c + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 } +func (this *Bar) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + that1, ok := that.(*Bar) + if !ok { + that2, ok := that.(Bar) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.Pick == nil { + if this.Pick != nil { + return 1 + } + } else if this.Pick == nil { + return -1 + } else { + thisType := -1 + switch this.Pick.(type) { + case *Bar_A: + thisType = 0 + case *Bar_B: + thisType = 1 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Pick)) + } + that1Type := -1 + switch that1.Pick.(type) { + case *Bar_A: + that1Type = 0 + case *Bar_B: + that1Type = 1 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Pick)) + } + if thisType == that1Type { + if c := this.Pick.Compare(that1.Pick); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *Bar_A) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Bar_A) + if !ok { + that2, ok := that.(Bar_A) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.A != that1.A { + if !this.A { + return -1 + } + return 1 + } + return 0 +} +func (this *Bar_B) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Bar_B) + if !ok { + that2, ok := that.(Bar_B) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.B != that1.B { + if !this.B { + return -1 + } + return 1 + } + return 0 +} func (this *Foo) Equal(that interface{}) bool { if that == nil { return this == nil @@ -327,7 +428,7 @@ } func NewPopulatedFoo(r randyOneofembed, easy bool) *Foo { this := &Foo{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bar = NewPopulatedBar(r, easy) } if !easy && r.Intn(10) != 0 { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneofembed/oneofembedpb_test.go golang-gogoprotobuf-1.3.1/test/oneofembed/oneofembedpb_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneofembed/oneofembedpb_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneofembed/oneofembedpb_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -174,4 +174,53 @@ } } +func TestFooCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedFoo(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &Foo{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedFoo(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} +func TestBarCompare(t *testing.T) { + popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) + p := NewPopulatedBar(popr, false) + dAtA, err := github_com_gogo_protobuf_proto.Marshal(p) + if err != nil { + panic(err) + } + msg := &Bar{} + if err := github_com_gogo_protobuf_proto.Unmarshal(dAtA, msg); err != nil { + panic(err) + } + if c := p.Compare(msg); c != 0 { + t.Fatalf("%#v !Compare %#v, since %d", msg, p, c) + } + p2 := NewPopulatedBar(popr, false) + c := p.Compare(p2) + c2 := p2.Compare(p) + if c != (-1 * c2) { + t.Errorf("p.Compare(p2) = %d", c) + t.Errorf("p2.Compare(p) = %d", c2) + t.Errorf("p = %#v", p) + t.Errorf("p2 = %#v", p2) + } +} + //These tests are generated by github.com/gogo/protobuf/plugin/testgen diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneofembed/oneofembed.proto golang-gogoprotobuf-1.3.1/test/oneofembed/oneofembed.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/oneofembed/oneofembed.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/oneofembed/oneofembed.proto 2020-05-17 12:22:58.000000000 +0000 @@ -33,6 +33,7 @@ option (gogoproto.populate_all) = true; option (gogoproto.equal_all) = true; option (gogoproto.testgen_all) = true; +option (gogoproto.compare_all) = true; message Foo { Bar bar = 1 [(gogoproto.embed) = true]; diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/packed/packed.pb.go golang-gogoprotobuf-1.3.1/test/packed/packed.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/packed/packed.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/packed/packed.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type NinRepNative struct { Field1 []float64 `protobuf:"fixed64,1,rep,name=Field1" json:"Field1,omitempty"` @@ -599,7 +599,7 @@ func NewPopulatedNinRepNative(r randyPacked, easy bool) *NinRepNative { this := &NinRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(10) this.Field1 = make([]float64, v1) for i := 0; i < v1; i++ { @@ -609,7 +609,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.Field2 = make([]float32, v2) for i := 0; i < v2; i++ { @@ -619,7 +619,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.Field3 = make([]int32, v3) for i := 0; i < v3; i++ { @@ -629,7 +629,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(10) this.Field4 = make([]int64, v4) for i := 0; i < v4; i++ { @@ -639,21 +639,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.Field5 = make([]uint32, v5) for i := 0; i < v5; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(10) this.Field6 = make([]uint64, v6) for i := 0; i < v6; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(10) this.Field7 = make([]int32, v7) for i := 0; i < v7; i++ { @@ -663,7 +663,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(10) this.Field8 = make([]int64, v8) for i := 0; i < v8; i++ { @@ -673,14 +673,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := r.Intn(10) this.Field9 = make([]uint32, v9) for i := 0; i < v9; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.Field10 = make([]int32, v10) for i := 0; i < v10; i++ { @@ -690,14 +690,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := r.Intn(10) this.Field11 = make([]uint64, v11) for i := 0; i < v11; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := r.Intn(10) this.Field12 = make([]int64, v12) for i := 0; i < v12; i++ { @@ -707,7 +707,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.Field13 = make([]bool, v13) for i := 0; i < v13; i++ { @@ -722,7 +722,7 @@ func NewPopulatedNinRepPackedNative(r randyPacked, easy bool) *NinRepPackedNative { this := &NinRepPackedNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := r.Intn(10) this.Field1 = make([]float64, v14) for i := 0; i < v14; i++ { @@ -732,7 +732,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := r.Intn(10) this.Field2 = make([]float32, v15) for i := 0; i < v15; i++ { @@ -742,7 +742,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(10) this.Field3 = make([]int32, v16) for i := 0; i < v16; i++ { @@ -752,7 +752,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := r.Intn(10) this.Field4 = make([]int64, v17) for i := 0; i < v17; i++ { @@ -762,21 +762,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(10) this.Field5 = make([]uint32, v18) for i := 0; i < v18; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := r.Intn(10) this.Field6 = make([]uint64, v19) for i := 0; i < v19; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(10) this.Field7 = make([]int32, v20) for i := 0; i < v20; i++ { @@ -786,7 +786,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(10) this.Field8 = make([]int64, v21) for i := 0; i < v21; i++ { @@ -796,14 +796,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := r.Intn(10) this.Field9 = make([]uint32, v22) for i := 0; i < v22; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(10) this.Field10 = make([]int32, v23) for i := 0; i < v23; i++ { @@ -813,14 +813,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(10) this.Field11 = make([]uint64, v24) for i := 0; i < v24; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(10) this.Field12 = make([]int64, v25) for i := 0; i < v25; i++ { @@ -830,7 +830,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v26 := r.Intn(10) this.Field13 = make([]bool, v26) for i := 0; i < v26; i++ { @@ -845,7 +845,7 @@ func NewPopulatedNinRepNativeUnsafe(r randyPacked, easy bool) *NinRepNativeUnsafe { this := &NinRepNativeUnsafe{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(10) this.Field1 = make([]float64, v27) for i := 0; i < v27; i++ { @@ -855,7 +855,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v28 := r.Intn(10) this.Field2 = make([]float32, v28) for i := 0; i < v28; i++ { @@ -865,7 +865,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(10) this.Field3 = make([]int32, v29) for i := 0; i < v29; i++ { @@ -875,7 +875,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(10) this.Field4 = make([]int64, v30) for i := 0; i < v30; i++ { @@ -885,21 +885,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v31 := r.Intn(10) this.Field5 = make([]uint32, v31) for i := 0; i < v31; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(10) this.Field6 = make([]uint64, v32) for i := 0; i < v32; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(10) this.Field7 = make([]int32, v33) for i := 0; i < v33; i++ { @@ -909,7 +909,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v34 := r.Intn(10) this.Field8 = make([]int64, v34) for i := 0; i < v34; i++ { @@ -919,14 +919,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(10) this.Field9 = make([]uint32, v35) for i := 0; i < v35; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.Field10 = make([]int32, v36) for i := 0; i < v36; i++ { @@ -936,14 +936,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.Field11 = make([]uint64, v37) for i := 0; i < v37; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(10) this.Field12 = make([]int64, v38) for i := 0; i < v38; i++ { @@ -953,7 +953,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(10) this.Field13 = make([]bool, v39) for i := 0; i < v39; i++ { @@ -968,7 +968,7 @@ func NewPopulatedNinRepPackedNativeUnsafe(r randyPacked, easy bool) *NinRepPackedNativeUnsafe { this := &NinRepPackedNativeUnsafe{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v40 := r.Intn(10) this.Field1 = make([]float64, v40) for i := 0; i < v40; i++ { @@ -978,7 +978,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(10) this.Field2 = make([]float32, v41) for i := 0; i < v41; i++ { @@ -988,7 +988,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(10) this.Field3 = make([]int32, v42) for i := 0; i < v42; i++ { @@ -998,7 +998,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v43 := r.Intn(10) this.Field4 = make([]int64, v43) for i := 0; i < v43; i++ { @@ -1008,21 +1008,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(10) this.Field5 = make([]uint32, v44) for i := 0; i < v44; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(10) this.Field6 = make([]uint64, v45) for i := 0; i < v45; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v46 := r.Intn(10) this.Field7 = make([]int32, v46) for i := 0; i < v46; i++ { @@ -1032,7 +1032,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(10) this.Field8 = make([]int64, v47) for i := 0; i < v47; i++ { @@ -1042,14 +1042,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v48 := r.Intn(10) this.Field9 = make([]uint32, v48) for i := 0; i < v48; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v49 := r.Intn(10) this.Field10 = make([]int32, v49) for i := 0; i < v49; i++ { @@ -1059,14 +1059,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(10) this.Field11 = make([]uint64, v50) for i := 0; i < v50; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(10) this.Field12 = make([]int64, v51) for i := 0; i < v51; i++ { @@ -1076,7 +1076,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v52 := r.Intn(10) this.Field13 = make([]bool, v52) for i := 0; i < v52; i++ { @@ -4764,6 +4764,7 @@ func skipPacked(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -4795,10 +4796,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -4819,55 +4818,30 @@ return 0, ErrInvalidLengthPacked } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthPacked - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowPacked - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipPacked(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthPacked - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupPacked + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthPacked + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthPacked = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowPacked = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthPacked = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowPacked = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupPacked = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/proto3extension/proto3ext.pb.go golang-gogoprotobuf-1.3.1/test/proto3extension/proto3ext.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/proto3extension/proto3ext.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/proto3extension/proto3ext.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,7 +19,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package var E_Primary = &proto.ExtensionDesc{ ExtendedType: (*descriptor.FieldOptions)(nil), diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/protobuffer/Makefile golang-gogoprotobuf-1.3.1/test/protobuffer/Makefile --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/protobuffer/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/protobuffer/Makefile 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,31 @@ +# Protocol Buffers for Go with Gadgets +# +# Copyright (c) 2019, The GoGo Authors. All rights reserved. +# http://github.com/gogo/protobuf +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +regenerate: + go install github.com/gogo/protobuf/protoc-gen-gogo + protoc --gogo_out=. --proto_path=../../../../../:../../protobuf/:. *.proto diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/protobuffer/protobuffer.pb.go golang-gogoprotobuf-1.3.1/test/protobuffer/protobuffer.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/protobuffer/protobuffer.pb.go 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/protobuffer/protobuffer.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,220 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: protobuffer.proto + +package protobuffer + +import ( + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +type PBuffMarshal struct { + Field1 []byte `protobuf:"bytes,1,opt,name=Field1" json:"Field1,omitempty"` + Field2 *int32 `protobuf:"varint,2,opt,name=Field2" json:"Field2,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *PBuffMarshal) Reset() { *m = PBuffMarshal{} } +func (m *PBuffMarshal) String() string { return proto.CompactTextString(m) } +func (*PBuffMarshal) ProtoMessage() {} +func (*PBuffMarshal) Descriptor() ([]byte, []int) { + return fileDescriptor_12798c2215df1728, []int{0} +} +func (m *PBuffMarshal) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PBuffMarshal.Unmarshal(m, b) +} +func (m *PBuffMarshal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_PBuffMarshal.Marshal(b, m, deterministic) +} +func (m *PBuffMarshal) XXX_Merge(src proto.Message) { + xxx_messageInfo_PBuffMarshal.Merge(m, src) +} +func (m *PBuffMarshal) XXX_Size() int { + return xxx_messageInfo_PBuffMarshal.Size(m) +} +func (m *PBuffMarshal) XXX_DiscardUnknown() { + xxx_messageInfo_PBuffMarshal.DiscardUnknown(m) +} + +var xxx_messageInfo_PBuffMarshal proto.InternalMessageInfo + +func (m *PBuffMarshal) GetField1() []byte { + if m != nil { + return m.Field1 + } + return nil +} + +func (m *PBuffMarshal) GetField2() int32 { + if m != nil && m.Field2 != nil { + return *m.Field2 + } + return 0 +} + +type PBuffMarshaler struct { + Field1 []byte `protobuf:"bytes,1,opt,name=Field1" json:"Field1,omitempty"` + Field2 *int32 `protobuf:"varint,2,opt,name=Field2" json:"Field2,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *PBuffMarshaler) Reset() { *m = PBuffMarshaler{} } +func (m *PBuffMarshaler) String() string { return proto.CompactTextString(m) } +func (*PBuffMarshaler) ProtoMessage() {} +func (*PBuffMarshaler) Descriptor() ([]byte, []int) { + return fileDescriptor_12798c2215df1728, []int{1} +} +func (m *PBuffMarshaler) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_PBuffMarshaler.Unmarshal(m, b) +} +func (m *PBuffMarshaler) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PBuffMarshaler.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PBuffMarshaler) XXX_Merge(src proto.Message) { + xxx_messageInfo_PBuffMarshaler.Merge(m, src) +} +func (m *PBuffMarshaler) XXX_Size() int { + return m.Size() +} +func (m *PBuffMarshaler) XXX_DiscardUnknown() { + xxx_messageInfo_PBuffMarshaler.DiscardUnknown(m) +} + +var xxx_messageInfo_PBuffMarshaler proto.InternalMessageInfo + +func (m *PBuffMarshaler) GetField1() []byte { + if m != nil { + return m.Field1 + } + return nil +} + +func (m *PBuffMarshaler) GetField2() int32 { + if m != nil && m.Field2 != nil { + return *m.Field2 + } + return 0 +} + +func init() { + proto.RegisterType((*PBuffMarshal)(nil), "protobuffer.PBuffMarshal") + proto.RegisterType((*PBuffMarshaler)(nil), "protobuffer.PBuffMarshaler") +} + +func init() { proto.RegisterFile("protobuffer.proto", fileDescriptor_12798c2215df1728) } + +var fileDescriptor_12798c2215df1728 = []byte{ + // 144 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2c, 0x28, 0xca, 0x2f, + 0xc9, 0x4f, 0x2a, 0x4d, 0x4b, 0x4b, 0x2d, 0xd2, 0x03, 0xb3, 0x85, 0xb8, 0x91, 0x84, 0xa4, 0x74, + 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5, + 0x61, 0x92, 0x60, 0x1e, 0x98, 0x03, 0x66, 0x41, 0xf4, 0x2a, 0x79, 0x70, 0xf1, 0x04, 0x38, 0x95, + 0xa6, 0xa5, 0xf9, 0x26, 0x16, 0x15, 0x67, 0x24, 0xe6, 0x08, 0x89, 0x71, 0xb1, 0xb9, 0x65, 0xa6, + 0xe6, 0xa4, 0x18, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0xf0, 0x04, 0x41, 0x79, 0x70, 0x71, 0x23, 0x09, + 0x26, 0x05, 0x46, 0x0d, 0x56, 0xa8, 0xb8, 0x91, 0x15, 0x47, 0xc7, 0x42, 0x79, 0x86, 0x05, 0x0b, + 0xe5, 0x19, 0x94, 0xbc, 0xb8, 0xf8, 0x90, 0x4d, 0x4a, 0x2d, 0x22, 0xcb, 0x2c, 0xc6, 0x05, 0x0b, + 0xe5, 0x19, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x9d, 0x92, 0xe0, 0xe5, 0x00, 0x00, 0x00, +} + +func (m *PBuffMarshaler) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *PBuffMarshaler) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PBuffMarshaler) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Field2 != nil { + i = encodeVarintProtobuffer(dAtA, i, uint64(*m.Field2)) + i-- + dAtA[i] = 0x10 + } + if m.Field1 != nil { + i -= len(m.Field1) + copy(dAtA[i:], m.Field1) + i = encodeVarintProtobuffer(dAtA, i, uint64(len(m.Field1))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintProtobuffer(dAtA []byte, offset int, v uint64) int { + offset -= sovProtobuffer(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *PBuffMarshaler) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Field1 != nil { + l = len(m.Field1) + n += 1 + l + sovProtobuffer(uint64(l)) + } + if m.Field2 != nil { + n += 1 + sovProtobuffer(uint64(*m.Field2)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + +func sovProtobuffer(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozProtobuffer(x uint64) (n int) { + return sovProtobuffer(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/protobuffer/protobuffer.proto golang-gogoprotobuf-1.3.1/test/protobuffer/protobuffer.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/protobuffer/protobuffer.proto 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/protobuffer/protobuffer.proto 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,47 @@ +// Protocol Buffers for Go with Gadgets +// +// Copyright (c) 2019, The GoGo Authors. All rights reserved. +// http://github.com/gogo/protobuf +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto2"; + +package protobuffer; + +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; + +message PBuffMarshal { + option (gogoproto.marshaler) = false; + option (gogoproto.sizer) = false; + optional bytes Field1 = 1; + optional int32 Field2 = 2; +} + +message PBuffMarshaler { + option (gogoproto.marshaler) = true; + option (gogoproto.sizer) = true; + optional bytes Field1 = 1; + optional int32 Field2 = 2; +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/protobuffer/protobuffer_test.go golang-gogoprotobuf-1.3.1/test/protobuffer/protobuffer_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/protobuffer/protobuffer_test.go 1970-01-01 00:00:00.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/protobuffer/protobuffer_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -0,0 +1,78 @@ +// Protocol Buffers for Go with Gadgets +// +// Copyright (c) 2019, The GoGo Authors. All rights reserved. +// http://github.com/gogo/protobuf +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +package protobuffer + +import ( + "bytes" + "testing" + + proto "github.com/gogo/protobuf/proto" +) + +func TestProtoBufferMarshal12(t *testing.T) { + i := int32(33) + m := &PBuffMarshal{Field1: []byte(string("Tester123")), Field2: &i} + mer := &PBuffMarshaler{Field1: []byte(string("Tester123")), Field2: &i} + testCases := []struct { + name string + size int + m proto.Message + }{ + {"MarshalLarge", 1024, m}, + {"MarshalSmall", 0, m}, + {"MarshalerLarge", 1024, mer}, + {"MarshalerSmall", 0, mer}, + } + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + marshalCheck(t, tc.m, tc.size) + }) + } +} + +func marshalCheck(t *testing.T, m proto.Message, size int) { + buf := proto.NewBuffer(make([]byte, 0, size)) + err := buf.Marshal(m) + if err != nil { + t.Fatal(err) + } + err = buf.Marshal(m) + if err != nil { + t.Fatal(err) + } + bufferBytes := buf.Bytes() + protoBytes, err := proto.Marshal(m) + if err != nil { + t.Fatal(err) + } + protoBytes = append(protoBytes, protoBytes...) + if !bytes.Equal(bufferBytes, protoBytes) { + t.Fatalf("proto.Buffer Marshal != proto.Marshal (%v != %v)\n", bufferBytes, protoBytes) + } +} diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/protosize/protosize.pb.go golang-gogoprotobuf-1.3.1/test/protosize/protosize.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/protosize/protosize.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/protosize/protosize.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type SizeMessage struct { Size *int64 `protobuf:"varint,1,opt,name=size" json:"size,omitempty"` @@ -48,7 +48,7 @@ return xxx_messageInfo_SizeMessage.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -180,7 +180,7 @@ func (m *SizeMessage) Marshal() (dAtA []byte, err error) { size := m.ProtoSize() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -188,72 +188,81 @@ } func (m *SizeMessage) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.ProtoSize() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SizeMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Size != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintProtosize(dAtA, i, uint64(*m.Size)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.ProtoSize_ != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintProtosize(dAtA, i, uint64(*m.ProtoSize_)) + if m.String_ != nil { + i -= len(*m.String_) + copy(dAtA[i:], *m.String_) + i = encodeVarintProtosize(dAtA, i, uint64(len(*m.String_))) + i-- + dAtA[i] = 0x22 } if m.Equal_ != nil { - dAtA[i] = 0x18 - i++ + i-- if *m.Equal_ { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x18 } - if m.String_ != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintProtosize(dAtA, i, uint64(len(*m.String_))) - i += copy(dAtA[i:], *m.String_) + if m.ProtoSize_ != nil { + i = encodeVarintProtosize(dAtA, i, uint64(*m.ProtoSize_)) + i-- + dAtA[i] = 0x10 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Size != nil { + i = encodeVarintProtosize(dAtA, i, uint64(*m.Size)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintProtosize(dAtA []byte, offset int, v uint64) int { + offset -= sovProtosize(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedSizeMessage(r randyProtosize, easy bool) *SizeMessage { this := &SizeMessage{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := int64(r.Int63()) if r.Intn(2) == 0 { v1 *= -1 } this.Size = &v1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := int64(r.Int63()) if r.Intn(2) == 0 { v2 *= -1 } this.ProtoSize_ = &v2 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := bool(bool(r.Intn(2) == 0)) this.Equal_ = &v3 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := string(randStringProtosize(r)) this.String_ = &v4 } @@ -517,6 +526,7 @@ func skipProtosize(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -548,10 +558,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -572,55 +580,30 @@ return 0, ErrInvalidLengthProtosize } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthProtosize - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowProtosize - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipProtosize(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthProtosize - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupProtosize + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthProtosize + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthProtosize = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowProtosize = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthProtosize = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowProtosize = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupProtosize = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/required/requiredexample.pb.go golang-gogoprotobuf-1.3.1/test/required/requiredexample.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/required/requiredexample.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/required/requiredexample.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type RequiredExample struct { TheRequiredString *string `protobuf:"bytes,1,req,name=theRequiredString" json:"theRequiredString,omitempty"` @@ -48,7 +48,7 @@ return xxx_messageInfo_RequiredExample.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -123,7 +123,7 @@ return xxx_messageInfo_NidOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -282,7 +282,7 @@ return xxx_messageInfo_NinOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -427,7 +427,7 @@ return xxx_messageInfo_NestedNinOptNative.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -499,7 +499,7 @@ func (m *RequiredExample) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -507,49 +507,51 @@ } func (m *RequiredExample) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RequiredExample) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.TheRequiredString == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("theRequiredString") - } else { - dAtA[i] = 0xa - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(len(*m.TheRequiredString))) - i += copy(dAtA[i:], *m.TheRequiredString) - } - if m.TheOptionalString != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(len(*m.TheOptionalString))) - i += copy(dAtA[i:], *m.TheOptionalString) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.TheRepeatedStrings) > 0 { - for _, s := range m.TheRepeatedStrings { + for iNdEx := len(m.TheRepeatedStrings) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.TheRepeatedStrings[iNdEx]) + copy(dAtA[i:], m.TheRepeatedStrings[iNdEx]) + i = encodeVarintRequiredexample(dAtA, i, uint64(len(m.TheRepeatedStrings[iNdEx]))) + i-- dAtA[i] = 0x1a - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.TheOptionalString != nil { + i -= len(*m.TheOptionalString) + copy(dAtA[i:], *m.TheOptionalString) + i = encodeVarintRequiredexample(dAtA, i, uint64(len(*m.TheOptionalString))) + i-- + dAtA[i] = 0x12 + } + if m.TheRequiredString == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("theRequiredString") + } else { + i -= len(*m.TheRequiredString) + copy(dAtA[i:], *m.TheRequiredString) + i = encodeVarintRequiredexample(dAtA, i, uint64(len(*m.TheRequiredString))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *NidOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -557,80 +559,88 @@ } func (m *NidOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NidOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) - i += 8 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) - i += 4 - dAtA[i] = 0x18 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(m.Field3)) - dAtA[i] = 0x20 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(m.Field4)) - dAtA[i] = 0x28 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(m.Field5)) - dAtA[i] = 0x30 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(m.Field6)) - dAtA[i] = 0x38 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) - dAtA[i] = 0x40 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64((uint64(m.Field8)<<1)^uint64((m.Field8>>63)))) - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9)) - i += 4 - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10)) - i += 4 - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11)) - i += 8 - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12)) - i += 8 - dAtA[i] = 0x68 - i++ - if m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i++ - dAtA[i] = 0x72 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(len(m.Field14))) - i += copy(dAtA[i:], m.Field14) if m.Field15 != nil { - dAtA[i] = 0x7a - i++ + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) i = encodeVarintRequiredexample(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) + i-- + dAtA[i] = 0x7a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.Field14) + copy(dAtA[i:], m.Field14) + i = encodeVarintRequiredexample(dAtA, i, uint64(len(m.Field14))) + i-- + dAtA[i] = 0x72 + i-- + if m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 } - return i, nil + i-- + dAtA[i] = 0x68 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field12)) + i-- + dAtA[i] = 0x61 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(m.Field11)) + i-- + dAtA[i] = 0x59 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field10)) + i-- + dAtA[i] = 0x55 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(m.Field9)) + i-- + dAtA[i] = 0x4d + i = encodeVarintRequiredexample(dAtA, i, uint64((uint64(m.Field8)<<1)^uint64((m.Field8>>63)))) + i-- + dAtA[i] = 0x40 + i = encodeVarintRequiredexample(dAtA, i, uint64((uint32(m.Field7)<<1)^uint32((m.Field7>>31)))) + i-- + dAtA[i] = 0x38 + i = encodeVarintRequiredexample(dAtA, i, uint64(m.Field6)) + i-- + dAtA[i] = 0x30 + i = encodeVarintRequiredexample(dAtA, i, uint64(m.Field5)) + i-- + dAtA[i] = 0x28 + i = encodeVarintRequiredexample(dAtA, i, uint64(m.Field4)) + i-- + dAtA[i] = 0x20 + i = encodeVarintRequiredexample(dAtA, i, uint64(m.Field3)) + i-- + dAtA[i] = 0x18 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Field2)))) + i-- + dAtA[i] = 0x15 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Field1)))) + i-- + dAtA[i] = 0x9 + return len(dAtA) - i, nil } func (m *NinOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -638,138 +648,146 @@ } func (m *NinOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NinOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field1") + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.Field15 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field15") } else { - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) - i += 8 + i -= len(m.Field15) + copy(dAtA[i:], m.Field15) + i = encodeVarintRequiredexample(dAtA, i, uint64(len(m.Field15))) + i-- + dAtA[i] = 0x7a } - if m.Field2 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field2") + if m.Field14 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field14") } else { - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) - i += 4 + i -= len(*m.Field14) + copy(dAtA[i:], *m.Field14) + i = encodeVarintRequiredexample(dAtA, i, uint64(len(*m.Field14))) + i-- + dAtA[i] = 0x72 } - if m.Field3 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field3") + if m.Field13 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field13") } else { - dAtA[i] = 0x18 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(*m.Field3)) + i-- + if *m.Field13 { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x68 } - if m.Field4 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field4") + if m.Field12 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field12") } else { - dAtA[i] = 0x20 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(*m.Field4)) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) + i-- + dAtA[i] = 0x61 } - if m.Field5 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field5") + if m.Field11 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field11") } else { - dAtA[i] = 0x28 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(*m.Field5)) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) + i-- + dAtA[i] = 0x59 } - if m.Field6 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field6") + if m.Field10 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field10") } else { - dAtA[i] = 0x30 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(*m.Field6)) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) + i-- + dAtA[i] = 0x55 } - if m.Field7 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field7") + if m.Field9 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field9") } else { - dAtA[i] = 0x38 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field9)) + i-- + dAtA[i] = 0x4d } if m.Field8 == nil { return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field8") } else { - dAtA[i] = 0x40 - i++ i = encodeVarintRequiredexample(dAtA, i, uint64((uint64(*m.Field8)<<1)^uint64((*m.Field8>>63)))) + i-- + dAtA[i] = 0x40 } - if m.Field9 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field9") + if m.Field7 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field7") } else { - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field9)) - i += 4 + i = encodeVarintRequiredexample(dAtA, i, uint64((uint32(*m.Field7)<<1)^uint32((*m.Field7>>31)))) + i-- + dAtA[i] = 0x38 } - if m.Field10 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field10") + if m.Field6 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field6") } else { - dAtA[i] = 0x55 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(*m.Field10)) - i += 4 + i = encodeVarintRequiredexample(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if m.Field11 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field11") + if m.Field5 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field5") } else { - dAtA[i] = 0x59 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field11)) - i += 8 + i = encodeVarintRequiredexample(dAtA, i, uint64(*m.Field5)) + i-- + dAtA[i] = 0x28 } - if m.Field12 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field12") + if m.Field4 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field4") } else { - dAtA[i] = 0x61 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(*m.Field12)) - i += 8 + i = encodeVarintRequiredexample(dAtA, i, uint64(*m.Field4)) + i-- + dAtA[i] = 0x20 } - if m.Field13 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field13") + if m.Field3 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field3") } else { - dAtA[i] = 0x68 - i++ - if *m.Field13 { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintRequiredexample(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 } - if m.Field14 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field14") + if m.Field2 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field2") } else { - dAtA[i] = 0x72 - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(len(*m.Field14))) - i += copy(dAtA[i:], *m.Field14) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(*m.Field2)))) + i-- + dAtA[i] = 0x15 } - if m.Field15 == nil { - return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field15") + if m.Field1 == nil { + return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Field1") } else { - dAtA[i] = 0x7a - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(len(m.Field15))) - i += copy(dAtA[i:], m.Field15) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field1)))) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *NestedNinOptNative) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -777,46 +795,56 @@ } func (m *NestedNinOptNative) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NestedNinOptNative) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.NestedNinOpts) > 0 { - for _, msg := range m.NestedNinOpts { - dAtA[i] = 0xa - i++ - i = encodeVarintRequiredexample(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.NestedNinOpts) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NestedNinOpts[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintRequiredexample(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintRequiredexample(dAtA []byte, offset int, v uint64) int { + offset -= sovRequiredexample(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedRequiredExample(r randyRequiredexample, easy bool) *RequiredExample { this := &RequiredExample{} v1 := string(randStringRequiredexample(r)) this.TheRequiredString = &v1 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := string(randStringRequiredexample(r)) this.TheOptionalString = &v2 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.TheRepeatedStrings = make([]string, v3) for i := 0; i < v3; i++ { @@ -947,7 +975,7 @@ func NewPopulatedNestedNinOptNative(r randyRequiredexample, easy bool) *NestedNinOptNative { this := &NestedNinOptNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(5) this.NestedNinOpts = make([]*NinOptNative, v20) for i := 0; i < v20; i++ { @@ -2195,6 +2223,7 @@ func skipRequiredexample(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -2226,10 +2255,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -2250,55 +2277,30 @@ return 0, ErrInvalidLengthRequiredexample } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthRequiredexample - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowRequiredexample - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipRequiredexample(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthRequiredexample - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupRequiredexample + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthRequiredexample + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthRequiredexample = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowRequiredexample = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthRequiredexample = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowRequiredexample = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupRequiredexample = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/sizeunderscore/sizeunderscore.pb.go golang-gogoprotobuf-1.3.1/test/sizeunderscore/sizeunderscore.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/sizeunderscore/sizeunderscore.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/sizeunderscore/sizeunderscore.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type SizeMessage struct { Size_ *int64 `protobuf:"varint,1,opt,name=size" json:"size,omitempty"` @@ -47,7 +47,7 @@ return xxx_messageInfo_SizeMessage.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -162,7 +162,7 @@ func (m *SizeMessage) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -170,60 +170,69 @@ } func (m *SizeMessage) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SizeMessage) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Size_ != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintSizeunderscore(dAtA, i, uint64(*m.Size_)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.String_ != nil { + i -= len(*m.String_) + copy(dAtA[i:], *m.String_) + i = encodeVarintSizeunderscore(dAtA, i, uint64(len(*m.String_))) + i-- + dAtA[i] = 0x1a } if m.Equal_ != nil { - dAtA[i] = 0x10 - i++ + i-- if *m.Equal_ { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - } - if m.String_ != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintSizeunderscore(dAtA, i, uint64(len(*m.String_))) - i += copy(dAtA[i:], *m.String_) + i-- + dAtA[i] = 0x10 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Size_ != nil { + i = encodeVarintSizeunderscore(dAtA, i, uint64(*m.Size_)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintSizeunderscore(dAtA []byte, offset int, v uint64) int { + offset -= sovSizeunderscore(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedSizeMessage(r randySizeunderscore, easy bool) *SizeMessage { this := &SizeMessage{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := int64(r.Int63()) if r.Intn(2) == 0 { v1 *= -1 } this.Size_ = &v1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := bool(bool(r.Intn(2) == 0)) this.Equal_ = &v2 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := string(randStringSizeunderscore(r)) this.String_ = &v3 } @@ -464,6 +473,7 @@ func skipSizeunderscore(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -495,10 +505,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -519,55 +527,30 @@ return 0, ErrInvalidLengthSizeunderscore } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthSizeunderscore - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSizeunderscore - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipSizeunderscore(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthSizeunderscore - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupSizeunderscore + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthSizeunderscore + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthSizeunderscore = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowSizeunderscore = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthSizeunderscore = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowSizeunderscore = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupSizeunderscore = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/stdtypes/stdtypes.pb.go golang-gogoprotobuf-1.3.1/test/stdtypes/stdtypes.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/stdtypes/stdtypes.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/stdtypes/stdtypes.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -28,7 +28,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type StdTypes struct { NullableTimestamp *time.Time `protobuf:"bytes,1,opt,name=nullableTimestamp,proto3,stdtime" json:"nullableTimestamp,omitempty"` @@ -699,37 +699,37 @@ } type OneofStdTypes_Timestamp struct { - Timestamp *time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof,stdtime"` + Timestamp *time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof,stdtime" json:"timestamp,omitempty"` } type OneofStdTypes_Duration struct { - Duration *time.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof,stdduration"` + Duration *time.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof,stdduration" json:"duration,omitempty"` } type OneofStdTypes_RepDouble struct { - RepDouble *float64 `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof,wktptr"` + RepDouble *float64 `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof,wktptr" json:"repDouble,omitempty"` } type OneofStdTypes_RepFloat struct { - RepFloat *float32 `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof,wktptr"` + RepFloat *float32 `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof,wktptr" json:"repFloat,omitempty"` } type OneofStdTypes_RepInt64 struct { - RepInt64 *int64 `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof,wktptr"` + RepInt64 *int64 `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof,wktptr" json:"repInt64,omitempty"` } type OneofStdTypes_RepUInt64 struct { - RepUInt64 *uint64 `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof,wktptr"` + RepUInt64 *uint64 `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof,wktptr" json:"repUInt64,omitempty"` } type OneofStdTypes_RepInt32 struct { - RepInt32 *int32 `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof,wktptr"` + RepInt32 *int32 `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof,wktptr" json:"repInt32,omitempty"` } type OneofStdTypes_RepUInt32 struct { - RepUInt32 *uint32 `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof,wktptr"` + RepUInt32 *uint32 `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof,wktptr" json:"repUInt32,omitempty"` } type OneofStdTypes_RepBool struct { - RepBool *bool `protobuf:"bytes,9,opt,name=repBool,proto3,oneof,wktptr"` + RepBool *bool `protobuf:"bytes,9,opt,name=repBool,proto3,oneof,wktptr" json:"repBool,omitempty"` } type OneofStdTypes_RepString struct { - RepString *string `protobuf:"bytes,10,opt,name=repString,proto3,oneof,wktptr"` + RepString *string `protobuf:"bytes,10,opt,name=repString,proto3,oneof,wktptr" json:"repString,omitempty"` } type OneofStdTypes_RepBytes struct { - RepBytes *[]byte `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof,wktptr"` + RepBytes *[]byte `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof,wktptr" json:"repBytes,omitempty"` } func (*OneofStdTypes_Timestamp) isOneofStdTypes_OneOfStdTimes() {} @@ -828,9 +828,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*OneofStdTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _OneofStdTypes_OneofMarshaler, _OneofStdTypes_OneofUnmarshaler, _OneofStdTypes_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*OneofStdTypes) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*OneofStdTypes_Timestamp)(nil), (*OneofStdTypes_Duration)(nil), (*OneofStdTypes_RepDouble)(nil), @@ -845,344 +845,6 @@ } } -func _OneofStdTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*OneofStdTypes) - // OneOfStdTimes - switch x := m.OneOfStdTimes.(type) { - case *OneofStdTypes_Timestamp: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdTimeMarshal(*x.Timestamp) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_Duration: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdDurationMarshal(*x.Duration) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepDouble: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdDoubleMarshal(*x.RepDouble) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepFloat: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdFloatMarshal(*x.RepFloat) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepInt64: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdInt64Marshal(*x.RepInt64) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepUInt64: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdUInt64Marshal(*x.RepUInt64) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepInt32: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdInt32Marshal(*x.RepInt32) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepUInt32: - _ = b.EncodeVarint(8<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdUInt32Marshal(*x.RepUInt32) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepBool: - _ = b.EncodeVarint(9<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdBoolMarshal(*x.RepBool) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepString: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdStringMarshal(*x.RepString) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepBytes: - _ = b.EncodeVarint(11<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdBytesMarshal(*x.RepBytes) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("OneofStdTypes.OneOfStdTimes has unexpected type %T", x) - } - return nil -} - -func _OneofStdTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*OneofStdTypes) - switch tag { - case 1: // OneOfStdTimes.timestamp - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(time.Time) - if err2 := github_com_gogo_protobuf_types.StdTimeUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_Timestamp{c} - return true, err - case 2: // OneOfStdTimes.duration - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(time.Duration) - if err2 := github_com_gogo_protobuf_types.StdDurationUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_Duration{c} - return true, err - case 3: // OneOfStdTimes.repDouble - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(float64) - if err2 := github_com_gogo_protobuf_types.StdDoubleUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepDouble{c} - return true, err - case 4: // OneOfStdTimes.repFloat - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(float32) - if err2 := github_com_gogo_protobuf_types.StdFloatUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepFloat{c} - return true, err - case 5: // OneOfStdTimes.repInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(int64) - if err2 := github_com_gogo_protobuf_types.StdInt64Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepInt64{c} - return true, err - case 6: // OneOfStdTimes.repUInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(uint64) - if err2 := github_com_gogo_protobuf_types.StdUInt64Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepUInt64{c} - return true, err - case 7: // OneOfStdTimes.repInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(int32) - if err2 := github_com_gogo_protobuf_types.StdInt32Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepInt32{c} - return true, err - case 8: // OneOfStdTimes.repUInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(uint32) - if err2 := github_com_gogo_protobuf_types.StdUInt32Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepUInt32{c} - return true, err - case 9: // OneOfStdTimes.repBool - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(bool) - if err2 := github_com_gogo_protobuf_types.StdBoolUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepBool{c} - return true, err - case 10: // OneOfStdTimes.repString - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(string) - if err2 := github_com_gogo_protobuf_types.StdStringUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepString{c} - return true, err - case 11: // OneOfStdTimes.repBytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new([]byte) - if err2 := github_com_gogo_protobuf_types.StdBytesUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepBytes{c} - return true, err - default: - return false, nil - } -} - -func _OneofStdTypes_OneofSizer(msg proto.Message) (n int) { - m := msg.(*OneofStdTypes) - // OneOfStdTimes - switch x := m.OneOfStdTimes.(type) { - case *OneofStdTypes_Timestamp: - s := github_com_gogo_protobuf_types.SizeOfStdTime(*x.Timestamp) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_Duration: - s := github_com_gogo_protobuf_types.SizeOfStdDuration(*x.Duration) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepDouble: - s := github_com_gogo_protobuf_types.SizeOfStdDouble(*x.RepDouble) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepFloat: - s := github_com_gogo_protobuf_types.SizeOfStdFloat(*x.RepFloat) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepInt64: - s := github_com_gogo_protobuf_types.SizeOfStdInt64(*x.RepInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepUInt64: - s := github_com_gogo_protobuf_types.SizeOfStdUInt64(*x.RepUInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepInt32: - s := github_com_gogo_protobuf_types.SizeOfStdInt32(*x.RepInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepUInt32: - s := github_com_gogo_protobuf_types.SizeOfStdUInt32(*x.RepUInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepBool: - s := github_com_gogo_protobuf_types.SizeOfStdBool(*x.RepBool) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepString: - s := github_com_gogo_protobuf_types.SizeOfStdString(*x.RepString) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepBytes: - s := github_com_gogo_protobuf_types.SizeOfStdBytes(*x.RepBytes) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*StdTypes)(nil), "stdtypes.StdTypes") proto.RegisterType((*RepStdTypes)(nil), "stdtypes.RepStdTypes") @@ -3767,57 +3429,57 @@ } func NewPopulatedStdTypes(r randyStdtypes, easy bool) *StdTypes { this := &StdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableTimestamp = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDuration = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } v1 := github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) this.Timestamp = *v1 v2 := github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) this.Duration = *v2 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDouble = github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) } v3 := github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) this.NonnullDouble = *v3 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableFloat = github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) } v4 := github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) this.NonnullFloat = *v4 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt64 = github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) } v5 := github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) this.NonnullInt64 = *v5 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt64 = github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) } v6 := github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) this.NonnullUInt64 = *v6 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt32 = github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) } v7 := github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) this.NonnullInt32 = *v7 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt32 = github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) } v8 := github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) this.NonnullUInt32 = *v8 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBool = github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) } v9 := github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) this.NonnullBool = *v9 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableString = github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) } v10 := github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) this.NonnullString = *v10 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBytes = github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) } v11 := github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) @@ -3830,21 +3492,21 @@ func NewPopulatedRepStdTypes(r randyStdtypes, easy bool) *RepStdTypes { this := &RepStdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := r.Intn(5) this.NullableTimestamps = make([]*time.Time, v12) for i := 0; i < v12; i++ { this.NullableTimestamps[i] = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(5) this.NullableDurations = make([]*time.Duration, v13) for i := 0; i < v13; i++ { this.NullableDurations[i] = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := r.Intn(5) this.Timestamps = make([]time.Time, v14) for i := 0; i < v14; i++ { @@ -3852,7 +3514,7 @@ this.Timestamps[i] = *v15 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(5) this.Durations = make([]time.Duration, v16) for i := 0; i < v16; i++ { @@ -3860,14 +3522,14 @@ this.Durations[i] = *v17 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(5) this.NullableDouble = make([]*float64, v18) for i := 0; i < v18; i++ { this.NullableDouble[i] = github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := r.Intn(5) this.NonnullDouble = make([]float64, v19) for i := 0; i < v19; i++ { @@ -3875,14 +3537,14 @@ this.NonnullDouble[i] = *v20 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(5) this.NullableFloat = make([]*float32, v21) for i := 0; i < v21; i++ { this.NullableFloat[i] = github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := r.Intn(5) this.NonnullFloat = make([]float32, v22) for i := 0; i < v22; i++ { @@ -3890,14 +3552,14 @@ this.NonnullFloat[i] = *v23 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(5) this.NullableInt64 = make([]*int64, v24) for i := 0; i < v24; i++ { this.NullableInt64[i] = github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(5) this.NonnullInt64 = make([]int64, v25) for i := 0; i < v25; i++ { @@ -3905,14 +3567,14 @@ this.NonnullInt64[i] = *v26 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(5) this.NullableUInt64 = make([]*uint64, v27) for i := 0; i < v27; i++ { this.NullableUInt64[i] = github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v28 := r.Intn(5) this.NonnullUInt64 = make([]uint64, v28) for i := 0; i < v28; i++ { @@ -3920,14 +3582,14 @@ this.NonnullUInt64[i] = *v29 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(5) this.NullableInt32 = make([]*int32, v30) for i := 0; i < v30; i++ { this.NullableInt32[i] = github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v31 := r.Intn(5) this.NonnullInt32 = make([]int32, v31) for i := 0; i < v31; i++ { @@ -3935,14 +3597,14 @@ this.NonnullInt32[i] = *v32 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(5) this.NullableUInt32 = make([]*uint32, v33) for i := 0; i < v33; i++ { this.NullableUInt32[i] = github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v34 := r.Intn(5) this.NonnullUInt32 = make([]uint32, v34) for i := 0; i < v34; i++ { @@ -3950,14 +3612,14 @@ this.NonnullUInt32[i] = *v35 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(5) this.NullableBool = make([]*bool, v36) for i := 0; i < v36; i++ { this.NullableBool[i] = github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(5) this.NonnullBool = make([]bool, v37) for i := 0; i < v37; i++ { @@ -3965,14 +3627,14 @@ this.NonnullBool[i] = *v38 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(5) this.NullableString = make([]*string, v39) for i := 0; i < v39; i++ { this.NullableString[i] = github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v40 := r.Intn(5) this.NonnullString = make([]string, v40) for i := 0; i < v40; i++ { @@ -3980,14 +3642,14 @@ this.NonnullString[i] = *v41 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(5) this.NullableBytes = make([]*[]byte, v42) for i := 0; i < v42; i++ { this.NullableBytes[i] = github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v43 := r.Intn(5) this.NonnullBytes = make([][]byte, v43) for i := 0; i < v43; i++ { @@ -4003,154 +3665,154 @@ func NewPopulatedMapStdTypes(r randyStdtypes, easy bool) *MapStdTypes { this := &MapStdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(10) this.NullableTimestamp = make(map[int32]*time.Time) for i := 0; i < v45; i++ { this.NullableTimestamp[int32(r.Int31())] = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v46 := r.Intn(10) this.Timestamp = make(map[int32]time.Time) for i := 0; i < v46; i++ { this.Timestamp[int32(r.Int31())] = *github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(10) this.NullableDuration = make(map[int32]*time.Duration) for i := 0; i < v47; i++ { this.NullableDuration[int32(r.Int31())] = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v48 := r.Intn(10) this.Duration = make(map[int32]time.Duration) for i := 0; i < v48; i++ { this.Duration[int32(r.Int31())] = *github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v49 := r.Intn(10) this.NullableDouble = make(map[int32]*float64) for i := 0; i < v49; i++ { this.NullableDouble[int32(r.Int31())] = (*float64)(github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(10) this.NonnullDouble = make(map[int32]float64) for i := 0; i < v50; i++ { this.NonnullDouble[int32(r.Int31())] = (float64)(*github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(10) this.NullableFloat = make(map[int32]*float32) for i := 0; i < v51; i++ { this.NullableFloat[int32(r.Int31())] = (*float32)(github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v52 := r.Intn(10) this.NonnullFloat = make(map[int32]float32) for i := 0; i < v52; i++ { this.NonnullFloat[int32(r.Int31())] = (float32)(*github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(10) this.NullableInt64 = make(map[int32]*int64) for i := 0; i < v53; i++ { this.NullableInt64[int32(r.Int31())] = (*int64)(github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(10) this.NonnullInt64 = make(map[int32]int64) for i := 0; i < v54; i++ { this.NonnullInt64[int32(r.Int31())] = (int64)(*github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v55 := r.Intn(10) this.NullableUInt64 = make(map[int32]*uint64) for i := 0; i < v55; i++ { this.NullableUInt64[int32(r.Int31())] = (*uint64)(github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(10) this.NonnullUInt64 = make(map[int32]uint64) for i := 0; i < v56; i++ { this.NonnullUInt64[int32(r.Int31())] = (uint64)(*github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(10) this.NullableInt32 = make(map[int32]*int32) for i := 0; i < v57; i++ { this.NullableInt32[int32(r.Int31())] = (*int32)(github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(10) this.NonnullInt32 = make(map[int32]int32) for i := 0; i < v58; i++ { this.NonnullInt32[int32(r.Int31())] = (int32)(*github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v59 := r.Intn(10) this.NullableUInt32 = make(map[int32]*uint32) for i := 0; i < v59; i++ { this.NullableUInt32[int32(r.Int31())] = (*uint32)(github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(10) this.NonnullUInt32 = make(map[int32]uint32) for i := 0; i < v60; i++ { this.NonnullUInt32[int32(r.Int31())] = (uint32)(*github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v61 := r.Intn(10) this.NullableBool = make(map[int32]*bool) for i := 0; i < v61; i++ { this.NullableBool[int32(r.Int31())] = (*bool)(github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(10) this.NonnullBool = make(map[int32]bool) for i := 0; i < v62; i++ { this.NonnullBool[int32(r.Int31())] = (bool)(*github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(10) this.NullableString = make(map[int32]*string) for i := 0; i < v63; i++ { this.NullableString[int32(r.Int31())] = (*string)(github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.NonnullString = make(map[int32]string) for i := 0; i < v64; i++ { this.NonnullString[int32(r.Int31())] = (string)(*github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(10) this.NullableBytes = make(map[int32]*[]byte) for i := 0; i < v65; i++ { this.NullableBytes[int32(r.Int31())] = (*[]byte)(github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v66 := r.Intn(10) this.NonnullBytes = make(map[int32][]byte) for i := 0; i < v66; i++ { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/tags/tags.pb.go golang-gogoprotobuf-1.3.1/test/tags/tags.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/tags/tags.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/tags/tags.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -19,14 +19,17 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Outside struct { - *Inside `protobuf:"bytes,1,opt,name=Inside,embedded=Inside" json:""` - Field2 *string `protobuf:"bytes,2,opt,name=Field2" json:"MyField2" xml:",comment"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + *Inside `protobuf:"bytes,1,opt,name=Inside,embedded=Inside" json:""` + Field2 *string `protobuf:"bytes,2,opt,name=Field2" json:"MyField2" xml:",comment"` + // Types that are valid to be assigned to Filed: + // *Outside_Field3 + Filed isOutside_Filed `protobuf_oneof:"filed"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Outside) Reset() { *m = Outside{} } @@ -53,6 +56,23 @@ var xxx_messageInfo_Outside proto.InternalMessageInfo +type isOutside_Filed interface { + isOutside_Filed() +} + +type Outside_Field3 struct { + Field3 string `protobuf:"bytes,3,opt,name=Field3,oneof" json:"MyField3" xml:",comment"` +} + +func (*Outside_Field3) isOutside_Filed() {} + +func (m *Outside) GetFiled() isOutside_Filed { + if m != nil { + return m.Filed + } + return nil +} + func (m *Outside) GetField2() string { if m != nil && m.Field2 != nil { return *m.Field2 @@ -60,6 +80,20 @@ return "" } +func (m *Outside) GetField3() string { + if x, ok := m.GetFiled().(*Outside_Field3); ok { + return x.Field3 + } + return "" +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Outside) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*Outside_Field3)(nil), + } +} + type Inside struct { Field1 *string `protobuf:"bytes,1,opt,name=Field1" json:"MyField1" xml:",chardata"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -106,40 +140,52 @@ func init() { proto.RegisterFile("tags.proto", fileDescriptor_e7d9cbcae1e528f6) } var fileDescriptor_e7d9cbcae1e528f6 = []byte{ - // 203 bytes of a gzipped FileDescriptorProto + // 231 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2a, 0x49, 0x4c, 0x2f, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x01, 0xb1, 0xa5, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5, 0xc1, 0x92, 0x49, 0xa5, - 0x69, 0x60, 0x1e, 0x98, 0x03, 0x66, 0x41, 0x34, 0x29, 0x15, 0x72, 0xb1, 0xfb, 0x97, 0x96, 0x14, - 0x67, 0xa6, 0xa4, 0x0a, 0xe9, 0x71, 0xb1, 0x79, 0xe6, 0x81, 0x58, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, - 0xdc, 0x46, 0x3c, 0x7a, 0x60, 0xc3, 0x21, 0x62, 0x4e, 0x1c, 0x17, 0xee, 0xc9, 0x33, 0xbe, 0xba, - 0x27, 0xcf, 0x10, 0x04, 0x55, 0x25, 0x64, 0xc6, 0xc5, 0xe6, 0x96, 0x99, 0x9a, 0x93, 0x62, 0x24, - 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0xe9, 0x24, 0xf7, 0xea, 0x9e, 0x3c, 0x87, 0x6f, 0x25, 0x44, 0xec, - 0xd3, 0x3d, 0x79, 0xbe, 0x8a, 0xdc, 0x1c, 0x2b, 0x25, 0x9d, 0xe4, 0xfc, 0xdc, 0xdc, 0xd4, 0xbc, - 0x12, 0xa5, 0x20, 0xa8, 0x6a, 0x25, 0x47, 0x98, 0x3d, 0x42, 0xe6, 0x50, 0x13, 0x0c, 0xc1, 0x36, - 0x72, 0x3a, 0xc9, 0x23, 0x99, 0x60, 0xf8, 0xe9, 0x9e, 0x3c, 0x3f, 0xd4, 0x84, 0x8c, 0xc4, 0xa2, - 0x94, 0xc4, 0x92, 0x44, 0x98, 0x11, 0x86, 0x4e, 0x2c, 0x3f, 0x1e, 0xca, 0x31, 0x02, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x57, 0x12, 0x09, 0x10, 0xfd, 0x00, 0x00, 0x00, + 0x69, 0x60, 0x1e, 0x98, 0x03, 0x66, 0x41, 0x34, 0x29, 0x6d, 0x61, 0xe4, 0x62, 0xf7, 0x2f, 0x2d, + 0x29, 0xce, 0x4c, 0x49, 0x15, 0xd2, 0xe3, 0x62, 0xf3, 0xcc, 0x03, 0xb1, 0x24, 0x18, 0x15, 0x18, + 0x35, 0xb8, 0x8d, 0x78, 0xf4, 0xc0, 0xa6, 0x43, 0xc4, 0x9c, 0x38, 0x2e, 0xdc, 0x93, 0x67, 0x7c, + 0x75, 0x4f, 0x9e, 0x21, 0x08, 0xaa, 0x4a, 0xc8, 0x8c, 0x8b, 0xcd, 0x2d, 0x33, 0x35, 0x27, 0xc5, + 0x48, 0x82, 0x49, 0x81, 0x51, 0x83, 0xd3, 0x49, 0xee, 0xd5, 0x3d, 0x79, 0x0e, 0xdf, 0x4a, 0x88, + 0xd8, 0xa7, 0x7b, 0xf2, 0x7c, 0x15, 0xb9, 0x39, 0x56, 0x4a, 0x3a, 0xc9, 0xf9, 0xb9, 0xb9, 0xa9, + 0x79, 0x25, 0x4a, 0x41, 0x50, 0xd5, 0x42, 0x16, 0x50, 0x7d, 0xc6, 0x12, 0xcc, 0x18, 0xfa, 0x8c, + 0x31, 0xf5, 0x79, 0x30, 0x40, 0x75, 0x1a, 0x3b, 0xb1, 0x73, 0xb1, 0xa6, 0x65, 0xe6, 0xa4, 0xa6, + 0x28, 0x39, 0xc2, 0x9c, 0x2a, 0x64, 0x0e, 0x35, 0xcc, 0x10, 0xec, 0x68, 0x4e, 0x27, 0x79, 0x24, + 0xc3, 0x0c, 0x3f, 0xdd, 0x93, 0xe7, 0x87, 0x1a, 0x96, 0x91, 0x58, 0x94, 0x92, 0x58, 0x92, 0x08, + 0x73, 0x85, 0xa1, 0x13, 0xcb, 0x8f, 0x87, 0x72, 0x8c, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x23, + 0x9e, 0x05, 0xb9, 0x41, 0x01, 0x00, 0x00, } func NewPopulatedOutside(r randyTags, easy bool) *Outside { this := &Outside{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Inside = NewPopulatedInside(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := string(randStringTags(r)) this.Field2 = &v1 } + oneofNumber_Filed := []int32{3}[r.Intn(1)] + switch oneofNumber_Filed { + case 3: + this.Filed = NewPopulatedOutside_Field3(r, easy) + } if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedTags(r, 3) + this.XXX_unrecognized = randUnrecognizedTags(r, 4) } return this } +func NewPopulatedOutside_Field3(r randyTags, easy bool) *Outside_Field3 { + this := &Outside_Field3{} + this.Field3 = string(randStringTags(r)) + return this +} func NewPopulatedInside(r randyTags, easy bool) *Inside { this := &Inside{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := string(randStringTags(r)) this.Field1 = &v2 } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/tags/tags.proto golang-gogoprotobuf-1.3.1/test/tags/tags.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/tags/tags.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/tags/tags.proto 2020-05-17 12:22:58.000000000 +0000 @@ -37,6 +37,9 @@ message Outside { optional Inside Inside = 1 [(gogoproto.embed) = true, (gogoproto.jsontag) = ""]; optional string Field2 = 2 [(gogoproto.jsontag) = "MyField2", (gogoproto.moretags) = "xml:\",comment\""]; + oneof filed { + string Field3 = 3 [(gogoproto.jsontag) = "MyField3", (gogoproto.moretags) = "xml:\",comment\""]; + } } message Inside { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/tags/tags_test.go golang-gogoprotobuf-1.3.1/test/tags/tags_test.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/tags/tags_test.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/tags/tags_test.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,91 +29,46 @@ package tags import ( - "bytes" - "encoding/json" - "encoding/xml" - math_rand "math/rand" + "reflect" "testing" - "time" ) -type MyJson struct { - MyField1 string - MyField2 string -} - -func NewPopulatedMyJson(r randyTags) *MyJson { - this := &MyJson{} - if r.Intn(10) != 0 { - this.MyField1 = randStringTags(r) - } - if r.Intn(10) != 0 { - this.MyField2 = randStringTags(r) - } - return this -} - -func TestJson(t *testing.T) { - popr := math_rand.New(math_rand.NewSource(time.Now().UnixNano())) - msg1 := NewPopulatedMyJson(popr) - data, err := json.Marshal(msg1) - if err != nil { - panic(err) - } - outside := &Outside{} - err = json.Unmarshal(data, outside) - if err != nil { - panic(err) - } - if outside.GetField1() != msg1.MyField1 { - t.Fatalf("proto field1 %s != %s", outside.GetField1(), msg1.MyField1) - } - if outside.GetField2() != msg1.MyField2 { - t.Fatalf("proto field2 %s != %s", outside.GetField2(), msg1.MyField2) - } - data2, err := json.Marshal(outside) - if err != nil { - panic(err) - } - msg2 := &MyJson{} - err = json.Unmarshal(data2, msg2) - if err != nil { - panic(err) - } - if msg2.MyField1 != msg1.MyField1 { - t.Fatalf("proto field1 %s != %s", msg2.MyField1, msg1.MyField1) - } - if msg2.MyField2 != msg1.MyField2 { - t.Fatalf("proto field2 %s != %s", msg2.MyField2, msg1.MyField2) - } -} +func TestTags(t *testing.T) { -func TestXml(t *testing.T) { - s := "Field1Value0" - field1 := "Field1Value" - field2 := "Field2Value" - msg1 := &Outside{} - err := xml.Unmarshal([]byte(s), msg1) - if err != nil { - panic(err) - } - msg2 := &Outside{ - Inside: &Inside{ - Field1: &field1, + var tests = []struct { + value interface{} + field string + jsontag string + xmltag string + }{ + { + value: Inside{}, + field: "Field1", + jsontag: "MyField1", + xmltag: ",chardata", + }, + { + value: Outside{}, + field: "Field2", + jsontag: "MyField2", + xmltag: ",comment", + }, + { + value: Outside_Field3{}, + field: "Field3", + jsontag: "MyField3", + xmltag: ",comment", }, - Field2: &field2, - } - if msg1.GetField1() != msg2.GetField1() { - t.Fatalf("field1 expected %s got %s", msg2.GetField1(), msg1.GetField1()) - } - if err != nil { - panic(err) - } - data, err := xml.Marshal(msg2) - if err != nil { - panic(err) } - if !bytes.Equal(data, []byte(s)) { - t.Fatalf("expected %s got %s", s, string(data)) + + for _, tt := range tests { + tv := reflect.ValueOf(tt.value).Type() + f, _ := tv.FieldByName(tt.field) + if jsontag := f.Tag.Get("json"); jsontag != tt.jsontag { + t.Fatalf("proto %q type: json tag %s != %s", tv.Name(), jsontag, tt.jsontag) + } + if xmltag := f.Tag.Get("xml"); xmltag != tt.xmltag { + t.Fatalf("proto %q type: xml tag %s != %s", tv.Name(), xmltag, tt.xmltag) + } } } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/theproto3/combos/both/theproto3.pb.go golang-gogoprotobuf-1.3.1/test/theproto3/combos/both/theproto3.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/theproto3/combos/both/theproto3.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/theproto3/combos/both/theproto3.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -33,7 +33,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapEnum int32 @@ -117,7 +117,7 @@ return xxx_messageInfo_Message.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -156,7 +156,7 @@ return xxx_messageInfo_Nested.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -211,7 +211,7 @@ return xxx_messageInfo_AllMaps.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -263,7 +263,7 @@ } func (m *AllMapsOrdered) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -303,7 +303,7 @@ return xxx_messageInfo_MessageWithMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -342,7 +342,7 @@ return xxx_messageInfo_FloatingPoint.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -382,7 +382,7 @@ return xxx_messageInfo_Uint128Pair.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -420,7 +420,7 @@ return xxx_messageInfo_ContainsNestedMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -459,7 +459,7 @@ return xxx_messageInfo_ContainsNestedMap_NestedMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -498,7 +498,7 @@ return xxx_messageInfo_NotPacked.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3717,7 +3717,7 @@ func (m *Message) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3725,154 +3725,161 @@ } func (m *Message) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Message) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } - if m.Hilarity != 0 { - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.Hilarity)) - } - if m.HeightInCm != 0 { - dAtA[i] = 0x18 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.HeightInCm)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Data) > 0 { - dAtA[i] = 0x22 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(m.Data))) - i += copy(dAtA[i:], m.Data) + if len(m.Proto2Value) > 0 { + for k := range m.Proto2Value { + v := m.Proto2Value[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a + } } - if len(m.Key) > 0 { - dAtA2 := make([]byte, len(m.Key)*10) - var j1 int - for _, num := range m.Key { - for num >= 1<<7 { - dAtA2[j1] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 - j1++ + if m.Proto2Field != nil { + { + size, err := m.Proto2Field.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - dAtA2[j1] = uint8(num) - j1++ + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) } - dAtA[i] = 0x2a - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(j1)) - i += copy(dAtA[i:], dAtA2[:j1]) + i-- + dAtA[i] = 0x5a } - if m.Nested != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.Nested.Size())) - n3, err3 := m.Nested.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + if len(m.Terrain) > 0 { + for k := range m.Terrain { + v := m.Terrain[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } - i += n3 } - if m.ResultCount != 0 { - dAtA[i] = 0x38 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.ResultCount)) + if m.Score != 0 { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Score)))) + i-- + dAtA[i] = 0x4d } if m.TrueScotsman { - dAtA[i] = 0x40 - i++ + i-- if m.TrueScotsman { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x40 } - if m.Score != 0 { - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Score)))) - i += 4 + if m.ResultCount != 0 { + i = encodeVarintTheproto3(dAtA, i, uint64(m.ResultCount)) + i-- + dAtA[i] = 0x38 } - if len(m.Terrain) > 0 { - for k := range m.Terrain { - dAtA[i] = 0x52 - i++ - v := m.Terrain[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTheproto3(uint64(msgSize)) - } - mapSize := 1 + sovTheproto3(uint64(k)) + msgSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v.Size())) - n4, err4 := v.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 - } - i += n4 + if m.Nested != nil { + { + size, err := m.Nested.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x32 } - if m.Proto2Field != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.Proto2Field.Size())) - n5, err5 := m.Proto2Field.MarshalTo(dAtA[i:]) - if err5 != nil { - return 0, err5 - } - i += n5 - } - if len(m.Proto2Value) > 0 { - for k := range m.Proto2Value { - dAtA[i] = 0x6a - i++ - v := m.Proto2Value[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTheproto3(uint64(msgSize)) - } - mapSize := 1 + sovTheproto3(uint64(k)) + msgSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v.Size())) - n6, err6 := v.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 - } - i += n6 + if len(m.Key) > 0 { + dAtA6 := make([]byte, len(m.Key)*10) + var j5 int + for _, num := range m.Key { + for num >= 1<<7 { + dAtA6[j5] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j5++ } + dAtA6[j5] = uint8(num) + j5++ } + i -= j5 + copy(dAtA[i:], dAtA6[:j5]) + i = encodeVarintTheproto3(dAtA, i, uint64(j5)) + i-- + dAtA[i] = 0x2a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Data) > 0 { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintTheproto3(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0x22 + } + if m.HeightInCm != 0 { + i = encodeVarintTheproto3(dAtA, i, uint64(m.HeightInCm)) + i-- + dAtA[i] = 0x18 + } + if m.Hilarity != 0 { + i = encodeVarintTheproto3(dAtA, i, uint64(m.Hilarity)) + i-- + dAtA[i] = 0x10 + } + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintTheproto3(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *Nested) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3880,26 +3887,33 @@ } func (m *Nested) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Nested) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Bunny) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.Bunny) + copy(dAtA[i:], m.Bunny) i = encodeVarintTheproto3(dAtA, i, uint64(len(m.Bunny))) - i += copy(dAtA[i:], m.Bunny) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *AllMaps) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3907,325 +3921,332 @@ } func (m *AllMaps) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllMaps) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.StringToDoubleMap) > 0 { - for k := range m.StringToDoubleMap { + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.StringToMsgMap) > 0 { + for k := range m.StringToMsgMap { + v := m.StringToMsgMap[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) + i-- dAtA[i] = 0xa - i++ - v := m.StringToDoubleMap[k] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + } + if len(m.StringToEnumMap) > 0 { + for k := range m.StringToEnumMap { + v := m.StringToEnumMap[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) + i-- dAtA[i] = 0xa - i++ + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + } + if len(m.StringToBytesMap) > 0 { + for k := range m.StringToBytesMap { + v := m.StringToBytesMap[k] + baseI := i + if len(v) > 0 { + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.StringToFloatMap) > 0 { - for k := range m.StringToFloatMap { + if len(m.StringMap) > 0 { + for k := range m.StringMap { + v := m.StringMap[k] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- dAtA[i] = 0x12 - i++ - v := m.StringToFloatMap[k] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) - i += 4 + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.Int32Map) > 0 { - for k := range m.Int32Map { - dAtA[i] = 0x1a - i++ - v := m.Int32Map[k] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) + if len(m.BoolMap) > 0 { + for k := range m.BoolMap { + v := m.BoolMap[k] + baseI := i + i-- + if v { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + if k { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } - if len(m.Int64Map) > 0 { - for k := range m.Int64Map { - dAtA[i] = 0x22 - i++ - v := m.Int64Map[k] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + if len(m.Sfixed64Map) > 0 { + for k := range m.Sfixed64Map { + v := m.Sfixed64Map[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) + i-- + dAtA[i] = 0x9 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.Uint32Map) > 0 { - for k := range m.Uint32Map { - dAtA[i] = 0x2a - i++ - v := m.Uint32Map[k] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + if len(m.Fixed64Map) > 0 { + for k := range m.Fixed64Map { + v := m.Fixed64Map[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) + i-- + dAtA[i] = 0x9 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a } } - if len(m.Uint64Map) > 0 { - for k := range m.Uint64Map { - dAtA[i] = 0x32 - i++ - v := m.Uint64Map[k] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + if len(m.Sfixed32Map) > 0 { + for k := range m.Sfixed32Map { + v := m.Sfixed32Map[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) + i-- + dAtA[i] = 0xd + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } - if len(m.Sint32Map) > 0 { - for k := range m.Sint32Map { - dAtA[i] = 0x3a - i++ - v := m.Sint32Map[k] - mapSize := 1 + sozTheproto3(uint64(k)) + 1 + sozTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + if len(m.Fixed32Map) > 0 { + for k := range m.Fixed32Map { + v := m.Fixed32Map[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) + i-- + dAtA[i] = 0xd + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } if len(m.Sint64Map) > 0 { for k := range m.Sint64Map { - dAtA[i] = 0x42 - i++ v := m.Sint64Map[k] - mapSize := 1 + sozTheproto3(uint64(k)) + 1 + sozTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) - dAtA[i] = 0x10 - i++ + baseI := i i = encodeVarintTheproto3(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.Fixed32Map) > 0 { - for k := range m.Fixed32Map { - dAtA[i] = 0x4a - i++ - v := m.Fixed32Map[k] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + if len(m.Sint32Map) > 0 { + for k := range m.Sint32Map { + v := m.Sint32Map[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.Sfixed32Map) > 0 { - for k := range m.Sfixed32Map { - dAtA[i] = 0x52 - i++ - v := m.Sfixed32Map[k] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + if len(m.Uint64Map) > 0 { + for k := range m.Uint64Map { + v := m.Uint64Map[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.Fixed64Map) > 0 { - for k := range m.Fixed64Map { - dAtA[i] = 0x5a - i++ - v := m.Fixed64Map[k] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + if len(m.Uint32Map) > 0 { + for k := range m.Uint32Map { + v := m.Uint32Map[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.Sfixed64Map) > 0 { - for k := range m.Sfixed64Map { - dAtA[i] = 0x62 - i++ - v := m.Sfixed64Map[k] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + if len(m.Int64Map) > 0 { + for k := range m.Int64Map { + v := m.Int64Map[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.BoolMap) > 0 { - for k := range m.BoolMap { - dAtA[i] = 0x6a - i++ - v := m.BoolMap[k] - mapSize := 1 + 1 + 1 + 1 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - if k { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Int32Map) > 0 { + for k := range m.Int32Map { + v := m.Int32Map[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- dAtA[i] = 0x10 - i++ - if v { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.StringMap) > 0 { - for k := range m.StringMap { - dAtA[i] = 0x72 - i++ - v := m.StringMap[k] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + len(v) + sovTheproto3(uint64(len(v))) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + if len(m.StringToFloatMap) > 0 { + for k := range m.StringToFloatMap { + v := m.StringToFloatMap[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) + i-- + dAtA[i] = 0x15 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) } } - if len(m.StringToBytesMap) > 0 { - for k := range m.StringToBytesMap { - dAtA[i] = 0x7a - i++ - v := m.StringToBytesMap[k] - byteSize := 0 - if len(v) > 0 { - byteSize = 1 + len(v) + sovTheproto3(uint64(len(v))) - } - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + byteSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + if len(m.StringToDoubleMap) > 0 { + for k := range m.StringToDoubleMap { + v := m.StringToDoubleMap[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) + i-- + dAtA[i] = 0x11 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if len(v) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } - } - } - if len(m.StringToEnumMap) > 0 { - for k := range m.StringToEnumMap { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToEnumMap[k] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) - } - } - if len(m.StringToMsgMap) > 0 { - for k := range m.StringToMsgMap { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToMsgMap[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTheproto3(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + msgSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v.Size())) - n7, err7 := v.MarshalTo(dAtA[i:]) - if err7 != nil { - return 0, err7 - } - i += n7 - } } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *AllMapsOrdered) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4233,172 +4254,220 @@ } func (m *AllMapsOrdered) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllMapsOrdered) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.StringToDoubleMap) > 0 { - keysForStringToDoubleMap := make([]string, 0, len(m.StringToDoubleMap)) - for k := range m.StringToDoubleMap { - keysForStringToDoubleMap = append(keysForStringToDoubleMap, string(k)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.StringToMsgMap) > 0 { + keysForStringToMsgMap := make([]string, 0, len(m.StringToMsgMap)) + for k := range m.StringToMsgMap { + keysForStringToMsgMap = append(keysForStringToMsgMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToDoubleMap) - for _, k := range keysForStringToDoubleMap { - dAtA[i] = 0xa - i++ - v := m.StringToDoubleMap[string(k)] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToMsgMap) + for iNdEx := len(keysForStringToMsgMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToMsgMap[string(keysForStringToMsgMap[iNdEx])] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(keysForStringToMsgMap[iNdEx]) + copy(dAtA[i:], keysForStringToMsgMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringToMsgMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.StringToFloatMap) > 0 { - keysForStringToFloatMap := make([]string, 0, len(m.StringToFloatMap)) - for k := range m.StringToFloatMap { - keysForStringToFloatMap = append(keysForStringToFloatMap, string(k)) + if len(m.StringToEnumMap) > 0 { + keysForStringToEnumMap := make([]string, 0, len(m.StringToEnumMap)) + for k := range m.StringToEnumMap { + keysForStringToEnumMap = append(keysForStringToEnumMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToFloatMap) - for _, k := range keysForStringToFloatMap { - dAtA[i] = 0x12 - i++ - v := m.StringToFloatMap[string(k)] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToEnumMap) + for iNdEx := len(keysForStringToEnumMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToEnumMap[string(keysForStringToEnumMap[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(keysForStringToEnumMap[iNdEx]) + copy(dAtA[i:], keysForStringToEnumMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringToEnumMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) - i += 4 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.Int32Map) > 0 { - keysForInt32Map := make([]int32, 0, len(m.Int32Map)) - for k := range m.Int32Map { - keysForInt32Map = append(keysForInt32Map, int32(k)) + if len(m.StringToBytesMap) > 0 { + keysForStringToBytesMap := make([]string, 0, len(m.StringToBytesMap)) + for k := range m.StringToBytesMap { + keysForStringToBytesMap = append(keysForStringToBytesMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Int32s(keysForInt32Map) - for _, k := range keysForInt32Map { - dAtA[i] = 0x1a - i++ - v := m.Int32Map[int32(k)] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToBytesMap) + for iNdEx := len(keysForStringToBytesMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToBytesMap[string(keysForStringToBytesMap[iNdEx])] + baseI := i + if len(v) > 0 { + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + } + i -= len(keysForStringToBytesMap[iNdEx]) + copy(dAtA[i:], keysForStringToBytesMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringToBytesMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.Int64Map) > 0 { - keysForInt64Map := make([]int64, 0, len(m.Int64Map)) - for k := range m.Int64Map { - keysForInt64Map = append(keysForInt64Map, int64(k)) + if len(m.StringMap) > 0 { + keysForStringMap := make([]string, 0, len(m.StringMap)) + for k := range m.StringMap { + keysForStringMap = append(keysForStringMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForInt64Map) - for _, k := range keysForInt64Map { - dAtA[i] = 0x22 - i++ - v := m.Int64Map[int64(k)] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap) + for iNdEx := len(keysForStringMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringMap[string(keysForStringMap[iNdEx])] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(keysForStringMap[iNdEx]) + copy(dAtA[i:], keysForStringMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.Uint32Map) > 0 { - keysForUint32Map := make([]uint32, 0, len(m.Uint32Map)) - for k := range m.Uint32Map { - keysForUint32Map = append(keysForUint32Map, uint32(k)) + if len(m.BoolMap) > 0 { + keysForBoolMap := make([]bool, 0, len(m.BoolMap)) + for k := range m.BoolMap { + keysForBoolMap = append(keysForBoolMap, bool(k)) } - github_com_gogo_protobuf_sortkeys.Uint32s(keysForUint32Map) - for _, k := range keysForUint32Map { - dAtA[i] = 0x2a - i++ - v := m.Uint32Map[uint32(k)] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) + github_com_gogo_protobuf_sortkeys.Bools(keysForBoolMap) + for iNdEx := len(keysForBoolMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.BoolMap[bool(keysForBoolMap[iNdEx])] + baseI := i + i-- + if v { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + if keysForBoolMap[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } - if len(m.Uint64Map) > 0 { - keysForUint64Map := make([]uint64, 0, len(m.Uint64Map)) - for k := range m.Uint64Map { - keysForUint64Map = append(keysForUint64Map, uint64(k)) + if len(m.Sfixed64Map) > 0 { + keysForSfixed64Map := make([]int64, 0, len(m.Sfixed64Map)) + for k := range m.Sfixed64Map { + keysForSfixed64Map = append(keysForSfixed64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Uint64s(keysForUint64Map) - for _, k := range keysForUint64Map { - dAtA[i] = 0x32 - i++ - v := m.Uint64Map[uint64(k)] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Int64s(keysForSfixed64Map) + for iNdEx := len(keysForSfixed64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sfixed64Map[int64(keysForSfixed64Map[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(keysForSfixed64Map[iNdEx])) + i-- + dAtA[i] = 0x9 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.Sint32Map) > 0 { - keysForSint32Map := make([]int32, 0, len(m.Sint32Map)) - for k := range m.Sint32Map { - keysForSint32Map = append(keysForSint32Map, int32(k)) + if len(m.Fixed64Map) > 0 { + keysForFixed64Map := make([]uint64, 0, len(m.Fixed64Map)) + for k := range m.Fixed64Map { + keysForFixed64Map = append(keysForFixed64Map, uint64(k)) } - github_com_gogo_protobuf_sortkeys.Int32s(keysForSint32Map) - for _, k := range keysForSint32Map { - dAtA[i] = 0x3a - i++ - v := m.Sint32Map[int32(k)] - mapSize := 1 + sozTheproto3(uint64(k)) + 1 + sozTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + github_com_gogo_protobuf_sortkeys.Uint64s(keysForFixed64Map) + for iNdEx := len(keysForFixed64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Fixed64Map[uint64(keysForFixed64Map[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(keysForFixed64Map[iNdEx])) + i-- + dAtA[i] = 0x9 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a } } - if len(m.Sint64Map) > 0 { - keysForSint64Map := make([]int64, 0, len(m.Sint64Map)) - for k := range m.Sint64Map { - keysForSint64Map = append(keysForSint64Map, int64(k)) + if len(m.Sfixed32Map) > 0 { + keysForSfixed32Map := make([]int32, 0, len(m.Sfixed32Map)) + for k := range m.Sfixed32Map { + keysForSfixed32Map = append(keysForSfixed32Map, int32(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForSint64Map) - for _, k := range keysForSint64Map { - dAtA[i] = 0x42 - i++ - v := m.Sint64Map[int64(k)] - mapSize := 1 + sozTheproto3(uint64(k)) + 1 + sozTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + github_com_gogo_protobuf_sortkeys.Int32s(keysForSfixed32Map) + for iNdEx := len(keysForSfixed32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sfixed32Map[int32(keysForSfixed32Map[iNdEx])] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(keysForSfixed32Map[iNdEx])) + i-- + dAtA[i] = 0xd + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } if len(m.Fixed32Map) > 0 { @@ -4407,236 +4476,195 @@ keysForFixed32Map = append(keysForFixed32Map, uint32(k)) } github_com_gogo_protobuf_sortkeys.Uint32s(keysForFixed32Map) - for _, k := range keysForFixed32Map { - dAtA[i] = 0x4a - i++ - v := m.Fixed32Map[uint32(k)] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ + for iNdEx := len(keysForFixed32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Fixed32Map[uint32(keysForFixed32Map[iNdEx])] + baseI := i + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 - } - } - if len(m.Sfixed32Map) > 0 { - keysForSfixed32Map := make([]int32, 0, len(m.Sfixed32Map)) - for k := range m.Sfixed32Map { - keysForSfixed32Map = append(keysForSfixed32Map, int32(k)) - } - github_com_gogo_protobuf_sortkeys.Int32s(keysForSfixed32Map) - for _, k := range keysForSfixed32Map { - dAtA[i] = 0x52 - i++ - v := m.Sfixed32Map[int32(k)] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 + i-- dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(keysForFixed32Map[iNdEx])) + i-- + dAtA[i] = 0xd + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } - if len(m.Fixed64Map) > 0 { - keysForFixed64Map := make([]uint64, 0, len(m.Fixed64Map)) - for k := range m.Fixed64Map { - keysForFixed64Map = append(keysForFixed64Map, uint64(k)) + if len(m.Sint64Map) > 0 { + keysForSint64Map := make([]int64, 0, len(m.Sint64Map)) + for k := range m.Sint64Map { + keysForSint64Map = append(keysForSint64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Uint64s(keysForFixed64Map) - for _, k := range keysForFixed64Map { - dAtA[i] = 0x5a - i++ - v := m.Fixed64Map[uint64(k)] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + github_com_gogo_protobuf_sortkeys.Int64s(keysForSint64Map) + for iNdEx := len(keysForSint64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sint64Map[int64(keysForSint64Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64((uint64(keysForSint64Map[iNdEx])<<1)^uint64((keysForSint64Map[iNdEx]>>63)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.Sfixed64Map) > 0 { - keysForSfixed64Map := make([]int64, 0, len(m.Sfixed64Map)) - for k := range m.Sfixed64Map { - keysForSfixed64Map = append(keysForSfixed64Map, int64(k)) - } - github_com_gogo_protobuf_sortkeys.Int64s(keysForSfixed64Map) - for _, k := range keysForSfixed64Map { - dAtA[i] = 0x62 - i++ - v := m.Sfixed64Map[int64(k)] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + if len(m.Sint32Map) > 0 { + keysForSint32Map := make([]int32, 0, len(m.Sint32Map)) + for k := range m.Sint32Map { + keysForSint32Map = append(keysForSint32Map, int32(k)) + } + github_com_gogo_protobuf_sortkeys.Int32s(keysForSint32Map) + for iNdEx := len(keysForSint32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sint32Map[int32(keysForSint32Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64((uint32(keysForSint32Map[iNdEx])<<1)^uint32((keysForSint32Map[iNdEx]>>31)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.BoolMap) > 0 { - keysForBoolMap := make([]bool, 0, len(m.BoolMap)) - for k := range m.BoolMap { - keysForBoolMap = append(keysForBoolMap, bool(k)) + if len(m.Uint64Map) > 0 { + keysForUint64Map := make([]uint64, 0, len(m.Uint64Map)) + for k := range m.Uint64Map { + keysForUint64Map = append(keysForUint64Map, uint64(k)) } - github_com_gogo_protobuf_sortkeys.Bools(keysForBoolMap) - for _, k := range keysForBoolMap { - dAtA[i] = 0x6a - i++ - v := m.BoolMap[bool(k)] - mapSize := 1 + 1 + 1 + 1 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - if k { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + github_com_gogo_protobuf_sortkeys.Uint64s(keysForUint64Map) + for iNdEx := len(keysForUint64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Uint64Map[uint64(keysForUint64Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- dAtA[i] = 0x10 - i++ - if v { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintTheproto3(dAtA, i, uint64(keysForUint64Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.StringMap) > 0 { - keysForStringMap := make([]string, 0, len(m.StringMap)) - for k := range m.StringMap { - keysForStringMap = append(keysForStringMap, string(k)) + if len(m.Uint32Map) > 0 { + keysForUint32Map := make([]uint32, 0, len(m.Uint32Map)) + for k := range m.Uint32Map { + keysForUint32Map = append(keysForUint32Map, uint32(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap) - for _, k := range keysForStringMap { - dAtA[i] = 0x72 - i++ - v := m.StringMap[string(k)] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + len(v) + sovTheproto3(uint64(len(v))) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) + github_com_gogo_protobuf_sortkeys.Uint32s(keysForUint32Map) + for iNdEx := len(keysForUint32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Uint32Map[uint32(keysForUint32Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(keysForUint32Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.StringToBytesMap) > 0 { - keysForStringToBytesMap := make([]string, 0, len(m.StringToBytesMap)) - for k := range m.StringToBytesMap { - keysForStringToBytesMap = append(keysForStringToBytesMap, string(k)) + if len(m.Int64Map) > 0 { + keysForInt64Map := make([]int64, 0, len(m.Int64Map)) + for k := range m.Int64Map { + keysForInt64Map = append(keysForInt64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToBytesMap) - for _, k := range keysForStringToBytesMap { - dAtA[i] = 0x7a - i++ - v := m.StringToBytesMap[string(k)] - byteSize := 0 - if len(v) > 0 { - byteSize = 1 + len(v) + sovTheproto3(uint64(len(v))) - } - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + byteSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if len(v) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } + github_com_gogo_protobuf_sortkeys.Int64s(keysForInt64Map) + for iNdEx := len(keysForInt64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Int64Map[int64(keysForInt64Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(keysForInt64Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.StringToEnumMap) > 0 { - keysForStringToEnumMap := make([]string, 0, len(m.StringToEnumMap)) - for k := range m.StringToEnumMap { - keysForStringToEnumMap = append(keysForStringToEnumMap, string(k)) + if len(m.Int32Map) > 0 { + keysForInt32Map := make([]int32, 0, len(m.Int32Map)) + for k := range m.Int32Map { + keysForInt32Map = append(keysForInt32Map, int32(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToEnumMap) - for _, k := range keysForStringToEnumMap { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToEnumMap[string(k)] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ + github_com_gogo_protobuf_sortkeys.Int32s(keysForInt32Map) + for iNdEx := len(keysForInt32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Int32Map[int32(keysForInt32Map[iNdEx])] + baseI := i i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(keysForInt32Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.StringToMsgMap) > 0 { - keysForStringToMsgMap := make([]string, 0, len(m.StringToMsgMap)) - for k := range m.StringToMsgMap { - keysForStringToMsgMap = append(keysForStringToMsgMap, string(k)) + if len(m.StringToFloatMap) > 0 { + keysForStringToFloatMap := make([]string, 0, len(m.StringToFloatMap)) + for k := range m.StringToFloatMap { + keysForStringToFloatMap = append(keysForStringToFloatMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToMsgMap) - for _, k := range keysForStringToMsgMap { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToMsgMap[string(k)] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTheproto3(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + msgSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToFloatMap) + for iNdEx := len(keysForStringToFloatMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToFloatMap[string(keysForStringToFloatMap[iNdEx])] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) + i-- + dAtA[i] = 0x15 + i -= len(keysForStringToFloatMap[iNdEx]) + copy(dAtA[i:], keysForStringToFloatMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringToFloatMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v.Size())) - n8, err8 := v.MarshalTo(dAtA[i:]) - if err8 != nil { - return 0, err8 - } - i += n8 - } + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.StringToDoubleMap) > 0 { + keysForStringToDoubleMap := make([]string, 0, len(m.StringToDoubleMap)) + for k := range m.StringToDoubleMap { + keysForStringToDoubleMap = append(keysForStringToDoubleMap, string(k)) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToDoubleMap) + for iNdEx := len(keysForStringToDoubleMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToDoubleMap[string(keysForStringToDoubleMap[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) + i-- + dAtA[i] = 0x11 + i -= len(keysForStringToDoubleMap[iNdEx]) + copy(dAtA[i:], keysForStringToDoubleMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringToDoubleMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *MessageWithMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4644,90 +4672,91 @@ } func (m *MessageWithMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MessageWithMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.NameMapping) > 0 { - for k := range m.NameMapping { - dAtA[i] = 0xa - i++ - v := m.NameMapping[k] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + len(v) + sovTheproto3(uint64(len(v))) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } - } - if len(m.MsgMapping) > 0 { - for k := range m.MsgMapping { - dAtA[i] = 0x12 - i++ - v := m.MsgMapping[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTheproto3(uint64(msgSize)) - } - mapSize := 1 + sozTheproto3(uint64(k)) + msgSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v.Size())) - n9, err9 := v.MarshalTo(dAtA[i:]) - if err9 != nil { - return 0, err9 - } - i += n9 - } - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.ByteMapping) > 0 { for k := range m.ByteMapping { - dAtA[i] = 0x1a - i++ v := m.ByteMapping[k] - byteSize := 0 + baseI := i if len(v) > 0 { - byteSize = 1 + len(v) + sovTheproto3(uint64(len(v))) + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 } - mapSize := 1 + 1 + byteSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ + i-- if k { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - if len(v) > 0 { + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a + } + } + if len(m.MsgMapping) > 0 { + for k := range m.MsgMapping { + v := m.MsgMapping[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) } + i = encodeVarintTheproto3(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.NameMapping) > 0 { + for k := range m.NameMapping { + v := m.NameMapping[k] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *FloatingPoint) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4735,26 +4764,32 @@ } func (m *FloatingPoint) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FloatingPoint) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.F != 0 { - dAtA[i] = 0x9 - i++ + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.F)))) - i += 8 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *Uint128Pair) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4762,38 +4797,48 @@ } func (m *Uint128Pair) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Uint128Pair) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.Left.Size())) - n10, err10 := m.Left.MarshalTo(dAtA[i:]) - if err10 != nil { - return 0, err10 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n10 if m.Right != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.Right.Size())) - n11, err11 := m.Right.MarshalTo(dAtA[i:]) - if err11 != nil { - return 0, err11 + { + size := m.Right.Size() + i -= size + if _, err := m.Right.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTheproto3(dAtA, i, uint64(size)) } - i += n11 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + { + size := m.Left.Size() + i -= size + if _, err := m.Left.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTheproto3(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *ContainsNestedMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4801,20 +4846,26 @@ } func (m *ContainsNestedMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ContainsNestedMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *ContainsNestedMap_NestedMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4822,37 +4873,44 @@ } func (m *ContainsNestedMap_NestedMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ContainsNestedMap_NestedMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.NestedMapField) > 0 { for k := range m.NestedMapField { - dAtA[i] = 0xa - i++ v := m.NestedMapField[k] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ + baseI := i + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 + i-- + dAtA[i] = 0x11 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NotPacked) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4860,31 +4918,39 @@ } func (m *NotPacked) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NotPacked) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Key) > 0 { - for _, num := range m.Key { + for iNdEx := len(m.Key) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintTheproto3(dAtA, i, uint64(m.Key[iNdEx])) + i-- dAtA[i] = 0x28 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(num)) } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintTheproto3(dAtA []byte, offset int, v uint64) int { + offset -= sovTheproto3(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedMessage(r randyTheproto3, easy bool) *Message { this := &Message{} @@ -4901,7 +4967,7 @@ for i := 0; i < v2; i++ { this.Key[i] = uint64(uint64(r.Uint32())) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Nested = NewPopulatedNested(r, easy) } this.ResultCount = int64(r.Int63()) @@ -4913,17 +4979,17 @@ if r.Intn(2) == 0 { this.Score *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.Terrain = make(map[int64]*Nested) for i := 0; i < v3; i++ { this.Terrain[int64(r.Int63())] = NewPopulatedNested(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Proto2Field = both.NewPopulatedNinOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(10) this.Proto2Value = make(map[int64]*both.NinOptEnum) for i := 0; i < v4; i++ { @@ -4947,7 +5013,7 @@ func NewPopulatedAllMaps(r randyTheproto3, easy bool) *AllMaps { this := &AllMaps{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v5; i++ { @@ -4958,7 +5024,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v7; i++ { @@ -4969,7 +5035,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v9; i++ { @@ -4980,7 +5046,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v11; i++ { @@ -4991,7 +5057,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v13; i++ { @@ -4999,7 +5065,7 @@ this.Uint32Map[v14] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v15; i++ { @@ -5007,7 +5073,7 @@ this.Uint64Map[v16] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v17; i++ { @@ -5018,7 +5084,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v19; i++ { @@ -5029,7 +5095,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v21; i++ { @@ -5037,7 +5103,7 @@ this.Fixed32Map[v22] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v23; i++ { @@ -5048,7 +5114,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v25; i++ { @@ -5056,7 +5122,7 @@ this.Fixed64Map[v26] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v27; i++ { @@ -5067,7 +5133,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v29; i++ { @@ -5075,14 +5141,14 @@ this.BoolMap[v30] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v31 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v31; i++ { this.StringMap[randStringTheproto3(r)] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v32; i++ { @@ -5094,14 +5160,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v35; i++ { this.StringToEnumMap[randStringTheproto3(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v36; i++ { @@ -5116,7 +5182,7 @@ func NewPopulatedAllMapsOrdered(r randyTheproto3, easy bool) *AllMapsOrdered { this := &AllMapsOrdered{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v37; i++ { @@ -5127,7 +5193,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v39; i++ { @@ -5138,7 +5204,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v41; i++ { @@ -5149,7 +5215,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v43 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v43; i++ { @@ -5160,7 +5226,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v45; i++ { @@ -5168,7 +5234,7 @@ this.Uint32Map[v46] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v47; i++ { @@ -5176,7 +5242,7 @@ this.Uint64Map[v48] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v49 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v49; i++ { @@ -5187,7 +5253,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v51; i++ { @@ -5198,7 +5264,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v53; i++ { @@ -5206,7 +5272,7 @@ this.Fixed32Map[v54] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v55 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v55; i++ { @@ -5217,7 +5283,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v57; i++ { @@ -5225,7 +5291,7 @@ this.Fixed64Map[v58] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v59 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v59; i++ { @@ -5236,7 +5302,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v61 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v61; i++ { @@ -5244,14 +5310,14 @@ this.BoolMap[v62] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v63; i++ { this.StringMap[randStringTheproto3(r)] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v64; i++ { @@ -5263,14 +5329,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v67 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v67; i++ { this.StringToEnumMap[randStringTheproto3(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v68; i++ { @@ -5285,21 +5351,21 @@ func NewPopulatedMessageWithMap(r randyTheproto3, easy bool) *MessageWithMap { this := &MessageWithMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.NameMapping = make(map[int32]string) for i := 0; i < v69; i++ { this.NameMapping[int32(r.Int31())] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v70 := r.Intn(10) this.MsgMapping = make(map[int64]*FloatingPoint) for i := 0; i < v70; i++ { this.MsgMapping[int64(r.Int63())] = NewPopulatedFloatingPoint(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(10) this.ByteMapping = make(map[bool][]byte) for i := 0; i < v71; i++ { @@ -5350,7 +5416,7 @@ func NewPopulatedContainsNestedMap_NestedMap(r randyTheproto3, easy bool) *ContainsNestedMap_NestedMap { this := &ContainsNestedMap_NestedMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v75 := r.Intn(10) this.NestedMapField = make(map[string]float64) for i := 0; i < v75; i++ { @@ -11753,6 +11819,7 @@ func skipTheproto3(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -11784,10 +11851,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -11808,55 +11873,30 @@ return 0, ErrInvalidLengthTheproto3 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthTheproto3 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTheproto3 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipTheproto3(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthTheproto3 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTheproto3 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthTheproto3 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthTheproto3 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTheproto3 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthTheproto3 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTheproto3 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTheproto3 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/theproto3/combos/marshaler/theproto3.pb.go golang-gogoprotobuf-1.3.1/test/theproto3/combos/marshaler/theproto3.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/theproto3/combos/marshaler/theproto3.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/theproto3/combos/marshaler/theproto3.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -32,7 +32,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapEnum int32 @@ -116,7 +116,7 @@ return xxx_messageInfo_Message.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -155,7 +155,7 @@ return xxx_messageInfo_Nested.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -210,7 +210,7 @@ return xxx_messageInfo_AllMaps.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -262,7 +262,7 @@ } func (m *AllMapsOrdered) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -302,7 +302,7 @@ return xxx_messageInfo_MessageWithMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -341,7 +341,7 @@ return xxx_messageInfo_FloatingPoint.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -381,7 +381,7 @@ return xxx_messageInfo_Uint128Pair.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -419,7 +419,7 @@ return xxx_messageInfo_ContainsNestedMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -458,7 +458,7 @@ return xxx_messageInfo_ContainsNestedMap_NestedMap.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -497,7 +497,7 @@ return xxx_messageInfo_NotPacked.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -3717,7 +3717,7 @@ func (m *Message) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3725,154 +3725,161 @@ } func (m *Message) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Message) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } - if m.Hilarity != 0 { - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.Hilarity)) - } - if m.HeightInCm != 0 { - dAtA[i] = 0x18 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.HeightInCm)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Data) > 0 { - dAtA[i] = 0x22 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(m.Data))) - i += copy(dAtA[i:], m.Data) + if len(m.Proto2Value) > 0 { + for k := range m.Proto2Value { + v := m.Proto2Value[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a + } } - if len(m.Key) > 0 { - dAtA2 := make([]byte, len(m.Key)*10) - var j1 int - for _, num := range m.Key { - for num >= 1<<7 { - dAtA2[j1] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 - j1++ + if m.Proto2Field != nil { + { + size, err := m.Proto2Field.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - dAtA2[j1] = uint8(num) - j1++ + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) } - dAtA[i] = 0x2a - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(j1)) - i += copy(dAtA[i:], dAtA2[:j1]) + i-- + dAtA[i] = 0x5a } - if m.Nested != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.Nested.Size())) - n3, err3 := m.Nested.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + if len(m.Terrain) > 0 { + for k := range m.Terrain { + v := m.Terrain[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } - i += n3 } - if m.ResultCount != 0 { - dAtA[i] = 0x38 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.ResultCount)) + if m.Score != 0 { + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Score)))) + i-- + dAtA[i] = 0x4d } if m.TrueScotsman { - dAtA[i] = 0x40 - i++ + i-- if m.TrueScotsman { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x40 } - if m.Score != 0 { - dAtA[i] = 0x4d - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Score)))) - i += 4 + if m.ResultCount != 0 { + i = encodeVarintTheproto3(dAtA, i, uint64(m.ResultCount)) + i-- + dAtA[i] = 0x38 } - if len(m.Terrain) > 0 { - for k := range m.Terrain { - dAtA[i] = 0x52 - i++ - v := m.Terrain[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTheproto3(uint64(msgSize)) - } - mapSize := 1 + sovTheproto3(uint64(k)) + msgSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v.Size())) - n4, err4 := v.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 - } - i += n4 + if m.Nested != nil { + { + size, err := m.Nested.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x32 } - if m.Proto2Field != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.Proto2Field.Size())) - n5, err5 := m.Proto2Field.MarshalTo(dAtA[i:]) - if err5 != nil { - return 0, err5 - } - i += n5 - } - if len(m.Proto2Value) > 0 { - for k := range m.Proto2Value { - dAtA[i] = 0x6a - i++ - v := m.Proto2Value[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTheproto3(uint64(msgSize)) - } - mapSize := 1 + sovTheproto3(uint64(k)) + msgSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v.Size())) - n6, err6 := v.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 - } - i += n6 + if len(m.Key) > 0 { + dAtA6 := make([]byte, len(m.Key)*10) + var j5 int + for _, num := range m.Key { + for num >= 1<<7 { + dAtA6[j5] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j5++ } + dAtA6[j5] = uint8(num) + j5++ } + i -= j5 + copy(dAtA[i:], dAtA6[:j5]) + i = encodeVarintTheproto3(dAtA, i, uint64(j5)) + i-- + dAtA[i] = 0x2a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Data) > 0 { + i -= len(m.Data) + copy(dAtA[i:], m.Data) + i = encodeVarintTheproto3(dAtA, i, uint64(len(m.Data))) + i-- + dAtA[i] = 0x22 + } + if m.HeightInCm != 0 { + i = encodeVarintTheproto3(dAtA, i, uint64(m.HeightInCm)) + i-- + dAtA[i] = 0x18 + } + if m.Hilarity != 0 { + i = encodeVarintTheproto3(dAtA, i, uint64(m.Hilarity)) + i-- + dAtA[i] = 0x10 + } + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintTheproto3(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *Nested) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3880,26 +3887,33 @@ } func (m *Nested) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Nested) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Bunny) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.Bunny) + copy(dAtA[i:], m.Bunny) i = encodeVarintTheproto3(dAtA, i, uint64(len(m.Bunny))) - i += copy(dAtA[i:], m.Bunny) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *AllMaps) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -3907,325 +3921,332 @@ } func (m *AllMaps) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllMaps) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.StringToDoubleMap) > 0 { - for k := range m.StringToDoubleMap { + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.StringToMsgMap) > 0 { + for k := range m.StringToMsgMap { + v := m.StringToMsgMap[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) + i-- dAtA[i] = 0xa - i++ - v := m.StringToDoubleMap[k] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + } + if len(m.StringToEnumMap) > 0 { + for k := range m.StringToEnumMap { + v := m.StringToEnumMap[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) + i-- dAtA[i] = 0xa - i++ + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + } + } + if len(m.StringToBytesMap) > 0 { + for k := range m.StringToBytesMap { + v := m.StringToBytesMap[k] + baseI := i + if len(v) > 0 { + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.StringToFloatMap) > 0 { - for k := range m.StringToFloatMap { + if len(m.StringMap) > 0 { + for k := range m.StringMap { + v := m.StringMap[k] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- dAtA[i] = 0x12 - i++ - v := m.StringToFloatMap[k] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) - i += 4 + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.Int32Map) > 0 { - for k := range m.Int32Map { - dAtA[i] = 0x1a - i++ - v := m.Int32Map[k] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) + if len(m.BoolMap) > 0 { + for k := range m.BoolMap { + v := m.BoolMap[k] + baseI := i + i-- + if v { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) - } - } - if len(m.Int64Map) > 0 { - for k := range m.Int64Map { - dAtA[i] = 0x22 - i++ - v := m.Int64Map[k] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + i-- + if k { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } - if len(m.Uint32Map) > 0 { - for k := range m.Uint32Map { - dAtA[i] = 0x2a - i++ - v := m.Uint32Map[k] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + if len(m.Sfixed64Map) > 0 { + for k := range m.Sfixed64Map { + v := m.Sfixed64Map[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) + i-- + dAtA[i] = 0x9 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.Uint64Map) > 0 { - for k := range m.Uint64Map { - dAtA[i] = 0x32 - i++ - v := m.Uint64Map[k] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + if len(m.Fixed64Map) > 0 { + for k := range m.Fixed64Map { + v := m.Fixed64Map[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) + i-- + dAtA[i] = 0x9 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a } } - if len(m.Sint32Map) > 0 { - for k := range m.Sint32Map { - dAtA[i] = 0x3a - i++ - v := m.Sint32Map[k] - mapSize := 1 + sozTheproto3(uint64(k)) + 1 + sozTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) - } - } - if len(m.Sint64Map) > 0 { - for k := range m.Sint64Map { - dAtA[i] = 0x42 - i++ - v := m.Sint64Map[k] - mapSize := 1 + sozTheproto3(uint64(k)) + 1 + sozTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + if len(m.Sfixed32Map) > 0 { + for k := range m.Sfixed32Map { + v := m.Sfixed32Map[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) + i-- + dAtA[i] = 0xd + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } if len(m.Fixed32Map) > 0 { for k := range m.Fixed32Map { - dAtA[i] = 0x4a - i++ v := m.Fixed32Map[k] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ + baseI := i + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 - } - } - if len(m.Sfixed32Map) > 0 { - for k := range m.Sfixed32Map { - dAtA[i] = 0x52 - i++ - v := m.Sfixed32Map[k] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 + i-- dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) + i-- + dAtA[i] = 0xd + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } - if len(m.Fixed64Map) > 0 { - for k := range m.Fixed64Map { - dAtA[i] = 0x5a - i++ - v := m.Fixed64Map[k] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + if len(m.Sint64Map) > 0 { + for k := range m.Sint64Map { + v := m.Sint64Map[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.Sfixed64Map) > 0 { - for k := range m.Sfixed64Map { - dAtA[i] = 0x62 - i++ - v := m.Sfixed64Map[k] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + if len(m.Sint32Map) > 0 { + for k := range m.Sint32Map { + v := m.Sint32Map[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.BoolMap) > 0 { - for k := range m.BoolMap { - dAtA[i] = 0x6a - i++ - v := m.BoolMap[k] - mapSize := 1 + 1 + 1 + 1 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - if k { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + if len(m.Uint64Map) > 0 { + for k := range m.Uint64Map { + v := m.Uint64Map[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- dAtA[i] = 0x10 - i++ - if v { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.StringMap) > 0 { - for k := range m.StringMap { - dAtA[i] = 0x72 - i++ - v := m.StringMap[k] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + len(v) + sovTheproto3(uint64(len(v))) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) + if len(m.Uint32Map) > 0 { + for k := range m.Uint32Map { + v := m.Uint32Map[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.StringToBytesMap) > 0 { - for k := range m.StringToBytesMap { - dAtA[i] = 0x7a - i++ - v := m.StringToBytesMap[k] - byteSize := 0 - if len(v) > 0 { - byteSize = 1 + len(v) + sovTheproto3(uint64(len(v))) - } - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + byteSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if len(v) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } + if len(m.Int64Map) > 0 { + for k := range m.Int64Map { + v := m.Int64Map[k] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.StringToEnumMap) > 0 { - for k := range m.StringToEnumMap { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToEnumMap[k] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ + if len(m.Int32Map) > 0 { + for k := range m.Int32Map { + v := m.Int32Map[k] + baseI := i i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.StringToMsgMap) > 0 { - for k := range m.StringToMsgMap { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToMsgMap[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTheproto3(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + msgSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ + if len(m.StringToFloatMap) > 0 { + for k := range m.StringToFloatMap { + v := m.StringToFloatMap[k] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) + i-- + dAtA[i] = 0x15 + i -= len(k) + copy(dAtA[i:], k) i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v.Size())) - n7, err7 := v.MarshalTo(dAtA[i:]) - if err7 != nil { - return 0, err7 - } - i += n7 - } + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.StringToDoubleMap) > 0 { + for k := range m.StringToDoubleMap { + v := m.StringToDoubleMap[k] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) + i-- + dAtA[i] = 0x11 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *AllMapsOrdered) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4233,172 +4254,220 @@ } func (m *AllMapsOrdered) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AllMapsOrdered) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.StringToDoubleMap) > 0 { - keysForStringToDoubleMap := make([]string, 0, len(m.StringToDoubleMap)) - for k := range m.StringToDoubleMap { - keysForStringToDoubleMap = append(keysForStringToDoubleMap, string(k)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.StringToMsgMap) > 0 { + keysForStringToMsgMap := make([]string, 0, len(m.StringToMsgMap)) + for k := range m.StringToMsgMap { + keysForStringToMsgMap = append(keysForStringToMsgMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToDoubleMap) - for _, k := range keysForStringToDoubleMap { - dAtA[i] = 0xa - i++ - v := m.StringToDoubleMap[string(k)] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToMsgMap) + for iNdEx := len(keysForStringToMsgMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToMsgMap[string(keysForStringToMsgMap[iNdEx])] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(keysForStringToMsgMap[iNdEx]) + copy(dAtA[i:], keysForStringToMsgMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringToMsgMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.StringToFloatMap) > 0 { - keysForStringToFloatMap := make([]string, 0, len(m.StringToFloatMap)) - for k := range m.StringToFloatMap { - keysForStringToFloatMap = append(keysForStringToFloatMap, string(k)) + if len(m.StringToEnumMap) > 0 { + keysForStringToEnumMap := make([]string, 0, len(m.StringToEnumMap)) + for k := range m.StringToEnumMap { + keysForStringToEnumMap = append(keysForStringToEnumMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToFloatMap) - for _, k := range keysForStringToFloatMap { - dAtA[i] = 0x12 - i++ - v := m.StringToFloatMap[string(k)] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToEnumMap) + for iNdEx := len(keysForStringToEnumMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToEnumMap[string(keysForStringToEnumMap[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i -= len(keysForStringToEnumMap[iNdEx]) + copy(dAtA[i:], keysForStringToEnumMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringToEnumMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) - i += 4 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.Int32Map) > 0 { - keysForInt32Map := make([]int32, 0, len(m.Int32Map)) - for k := range m.Int32Map { - keysForInt32Map = append(keysForInt32Map, int32(k)) + if len(m.StringToBytesMap) > 0 { + keysForStringToBytesMap := make([]string, 0, len(m.StringToBytesMap)) + for k := range m.StringToBytesMap { + keysForStringToBytesMap = append(keysForStringToBytesMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Int32s(keysForInt32Map) - for _, k := range keysForInt32Map { - dAtA[i] = 0x1a - i++ - v := m.Int32Map[int32(k)] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToBytesMap) + for iNdEx := len(keysForStringToBytesMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToBytesMap[string(keysForStringToBytesMap[iNdEx])] + baseI := i + if len(v) > 0 { + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + } + i -= len(keysForStringToBytesMap[iNdEx]) + copy(dAtA[i:], keysForStringToBytesMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringToBytesMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.Int64Map) > 0 { - keysForInt64Map := make([]int64, 0, len(m.Int64Map)) - for k := range m.Int64Map { - keysForInt64Map = append(keysForInt64Map, int64(k)) + if len(m.StringMap) > 0 { + keysForStringMap := make([]string, 0, len(m.StringMap)) + for k := range m.StringMap { + keysForStringMap = append(keysForStringMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForInt64Map) - for _, k := range keysForInt64Map { - dAtA[i] = 0x22 - i++ - v := m.Int64Map[int64(k)] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap) + for iNdEx := len(keysForStringMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringMap[string(keysForStringMap[iNdEx])] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i -= len(keysForStringMap[iNdEx]) + copy(dAtA[i:], keysForStringMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.Uint32Map) > 0 { - keysForUint32Map := make([]uint32, 0, len(m.Uint32Map)) - for k := range m.Uint32Map { - keysForUint32Map = append(keysForUint32Map, uint32(k)) + if len(m.BoolMap) > 0 { + keysForBoolMap := make([]bool, 0, len(m.BoolMap)) + for k := range m.BoolMap { + keysForBoolMap = append(keysForBoolMap, bool(k)) } - github_com_gogo_protobuf_sortkeys.Uint32s(keysForUint32Map) - for _, k := range keysForUint32Map { - dAtA[i] = 0x2a - i++ - v := m.Uint32Map[uint32(k)] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) + github_com_gogo_protobuf_sortkeys.Bools(keysForBoolMap) + for iNdEx := len(keysForBoolMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.BoolMap[bool(keysForBoolMap[iNdEx])] + baseI := i + i-- + if v { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + if keysForBoolMap[iNdEx] { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } - if len(m.Uint64Map) > 0 { - keysForUint64Map := make([]uint64, 0, len(m.Uint64Map)) - for k := range m.Uint64Map { - keysForUint64Map = append(keysForUint64Map, uint64(k)) + if len(m.Sfixed64Map) > 0 { + keysForSfixed64Map := make([]int64, 0, len(m.Sfixed64Map)) + for k := range m.Sfixed64Map { + keysForSfixed64Map = append(keysForSfixed64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Uint64s(keysForUint64Map) - for _, k := range keysForUint64Map { - dAtA[i] = 0x32 - i++ - v := m.Uint64Map[uint64(k)] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + github_com_gogo_protobuf_sortkeys.Int64s(keysForSfixed64Map) + for iNdEx := len(keysForSfixed64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sfixed64Map[int64(keysForSfixed64Map[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(keysForSfixed64Map[iNdEx])) + i-- + dAtA[i] = 0x9 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.Sint32Map) > 0 { - keysForSint32Map := make([]int32, 0, len(m.Sint32Map)) - for k := range m.Sint32Map { - keysForSint32Map = append(keysForSint32Map, int32(k)) + if len(m.Fixed64Map) > 0 { + keysForFixed64Map := make([]uint64, 0, len(m.Fixed64Map)) + for k := range m.Fixed64Map { + keysForFixed64Map = append(keysForFixed64Map, uint64(k)) } - github_com_gogo_protobuf_sortkeys.Int32s(keysForSint32Map) - for _, k := range keysForSint32Map { - dAtA[i] = 0x3a - i++ - v := m.Sint32Map[int32(k)] - mapSize := 1 + sozTheproto3(uint64(k)) + 1 + sozTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint32(k)<<1)^uint32((k>>31)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + github_com_gogo_protobuf_sortkeys.Uint64s(keysForFixed64Map) + for iNdEx := len(keysForFixed64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Fixed64Map[uint64(keysForFixed64Map[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) + i-- + dAtA[i] = 0x11 + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(keysForFixed64Map[iNdEx])) + i-- + dAtA[i] = 0x9 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a } } - if len(m.Sint64Map) > 0 { - keysForSint64Map := make([]int64, 0, len(m.Sint64Map)) - for k := range m.Sint64Map { - keysForSint64Map = append(keysForSint64Map, int64(k)) + if len(m.Sfixed32Map) > 0 { + keysForSfixed32Map := make([]int32, 0, len(m.Sfixed32Map)) + for k := range m.Sfixed32Map { + keysForSfixed32Map = append(keysForSfixed32Map, int32(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForSint64Map) - for _, k := range keysForSint64Map { - dAtA[i] = 0x42 - i++ - v := m.Sint64Map[int64(k)] - mapSize := 1 + sozTheproto3(uint64(k)) + 1 + sozTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + github_com_gogo_protobuf_sortkeys.Int32s(keysForSfixed32Map) + for iNdEx := len(keysForSfixed32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sfixed32Map[int32(keysForSfixed32Map[iNdEx])] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(keysForSfixed32Map[iNdEx])) + i-- + dAtA[i] = 0xd + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } if len(m.Fixed32Map) > 0 { @@ -4407,236 +4476,195 @@ keysForFixed32Map = append(keysForFixed32Map, uint32(k)) } github_com_gogo_protobuf_sortkeys.Uint32s(keysForFixed32Map) - for _, k := range keysForFixed32Map { - dAtA[i] = 0x4a - i++ - v := m.Fixed32Map[uint32(k)] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ + for iNdEx := len(keysForFixed32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Fixed32Map[uint32(keysForFixed32Map[iNdEx])] + baseI := i + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + i-- + dAtA[i] = 0x15 + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(keysForFixed32Map[iNdEx])) + i-- + dAtA[i] = 0xd + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } - if len(m.Sfixed32Map) > 0 { - keysForSfixed32Map := make([]int32, 0, len(m.Sfixed32Map)) - for k := range m.Sfixed32Map { - keysForSfixed32Map = append(keysForSfixed32Map, int32(k)) - } - github_com_gogo_protobuf_sortkeys.Int32s(keysForSfixed32Map) - for _, k := range keysForSfixed32Map { - dAtA[i] = 0x52 - i++ - v := m.Sfixed32Map[int32(k)] - mapSize := 1 + 4 + 1 + 4 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xd - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(k)) - i += 4 - dAtA[i] = 0x15 - i++ - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(v)) - i += 4 + if len(m.Sint64Map) > 0 { + keysForSint64Map := make([]int64, 0, len(m.Sint64Map)) + for k := range m.Sint64Map { + keysForSint64Map = append(keysForSint64Map, int64(k)) + } + github_com_gogo_protobuf_sortkeys.Int64s(keysForSint64Map) + for iNdEx := len(keysForSint64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sint64Map[int64(keysForSint64Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64((uint64(v)<<1)^uint64((v>>63)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64((uint64(keysForSint64Map[iNdEx])<<1)^uint64((keysForSint64Map[iNdEx]>>63)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.Fixed64Map) > 0 { - keysForFixed64Map := make([]uint64, 0, len(m.Fixed64Map)) - for k := range m.Fixed64Map { - keysForFixed64Map = append(keysForFixed64Map, uint64(k)) + if len(m.Sint32Map) > 0 { + keysForSint32Map := make([]int32, 0, len(m.Sint32Map)) + for k := range m.Sint32Map { + keysForSint32Map = append(keysForSint32Map, int32(k)) } - github_com_gogo_protobuf_sortkeys.Uint64s(keysForFixed64Map) - for _, k := range keysForFixed64Map { - dAtA[i] = 0x5a - i++ - v := m.Fixed64Map[uint64(k)] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + github_com_gogo_protobuf_sortkeys.Int32s(keysForSint32Map) + for iNdEx := len(keysForSint32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Sint32Map[int32(keysForSint32Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64((uint32(v)<<1)^uint32((v>>31)))) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64((uint32(keysForSint32Map[iNdEx])<<1)^uint32((keysForSint32Map[iNdEx]>>31)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.Sfixed64Map) > 0 { - keysForSfixed64Map := make([]int64, 0, len(m.Sfixed64Map)) - for k := range m.Sfixed64Map { - keysForSfixed64Map = append(keysForSfixed64Map, int64(k)) + if len(m.Uint64Map) > 0 { + keysForUint64Map := make([]uint64, 0, len(m.Uint64Map)) + for k := range m.Uint64Map { + keysForUint64Map = append(keysForUint64Map, uint64(k)) } - github_com_gogo_protobuf_sortkeys.Int64s(keysForSfixed64Map) - for _, k := range keysForSfixed64Map { - dAtA[i] = 0x62 - i++ - v := m.Sfixed64Map[int64(k)] - mapSize := 1 + 8 + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x9 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(k)) - i += 8 - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(v)) - i += 8 + github_com_gogo_protobuf_sortkeys.Uint64s(keysForUint64Map) + for iNdEx := len(keysForUint64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Uint64Map[uint64(keysForUint64Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(keysForUint64Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.BoolMap) > 0 { - keysForBoolMap := make([]bool, 0, len(m.BoolMap)) - for k := range m.BoolMap { - keysForBoolMap = append(keysForBoolMap, bool(k)) + if len(m.Uint32Map) > 0 { + keysForUint32Map := make([]uint32, 0, len(m.Uint32Map)) + for k := range m.Uint32Map { + keysForUint32Map = append(keysForUint32Map, uint32(k)) } - github_com_gogo_protobuf_sortkeys.Bools(keysForBoolMap) - for _, k := range keysForBoolMap { - dAtA[i] = 0x6a - i++ - v := m.BoolMap[bool(k)] - mapSize := 1 + 1 + 1 + 1 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - if k { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + github_com_gogo_protobuf_sortkeys.Uint32s(keysForUint32Map) + for iNdEx := len(keysForUint32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Uint32Map[uint32(keysForUint32Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- dAtA[i] = 0x10 - i++ - if v { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ + i = encodeVarintTheproto3(dAtA, i, uint64(keysForUint32Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.StringMap) > 0 { - keysForStringMap := make([]string, 0, len(m.StringMap)) - for k := range m.StringMap { - keysForStringMap = append(keysForStringMap, string(k)) + if len(m.Int64Map) > 0 { + keysForInt64Map := make([]int64, 0, len(m.Int64Map)) + for k := range m.Int64Map { + keysForInt64Map = append(keysForInt64Map, int64(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringMap) - for _, k := range keysForStringMap { - dAtA[i] = 0x72 - i++ - v := m.StringMap[string(k)] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + len(v) + sovTheproto3(uint64(len(v))) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) + github_com_gogo_protobuf_sortkeys.Int64s(keysForInt64Map) + for iNdEx := len(keysForInt64Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Int64Map[int64(keysForInt64Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(keysForInt64Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.StringToBytesMap) > 0 { - keysForStringToBytesMap := make([]string, 0, len(m.StringToBytesMap)) - for k := range m.StringToBytesMap { - keysForStringToBytesMap = append(keysForStringToBytesMap, string(k)) + if len(m.Int32Map) > 0 { + keysForInt32Map := make([]int32, 0, len(m.Int32Map)) + for k := range m.Int32Map { + keysForInt32Map = append(keysForInt32Map, int32(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToBytesMap) - for _, k := range keysForStringToBytesMap { - dAtA[i] = 0x7a - i++ - v := m.StringToBytesMap[string(k)] - byteSize := 0 - if len(v) > 0 { - byteSize = 1 + len(v) + sovTheproto3(uint64(len(v))) - } - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + byteSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if len(v) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } + github_com_gogo_protobuf_sortkeys.Int32s(keysForInt32Map) + for iNdEx := len(keysForInt32Map) - 1; iNdEx >= 0; iNdEx-- { + v := m.Int32Map[int32(keysForInt32Map[iNdEx])] + baseI := i + i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i-- + dAtA[i] = 0x10 + i = encodeVarintTheproto3(dAtA, i, uint64(keysForInt32Map[iNdEx])) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.StringToEnumMap) > 0 { - keysForStringToEnumMap := make([]string, 0, len(m.StringToEnumMap)) - for k := range m.StringToEnumMap { - keysForStringToEnumMap = append(keysForStringToEnumMap, string(k)) + if len(m.StringToFloatMap) > 0 { + keysForStringToFloatMap := make([]string, 0, len(m.StringToFloatMap)) + for k := range m.StringToFloatMap { + keysForStringToFloatMap = append(keysForStringToFloatMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToEnumMap) - for _, k := range keysForStringToEnumMap { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToEnumMap[string(k)] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + sovTheproto3(uint64(v)) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToFloatMap) + for iNdEx := len(keysForStringToFloatMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToFloatMap[string(keysForStringToFloatMap[iNdEx])] + baseI := i + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(v)))) + i-- + dAtA[i] = 0x15 + i -= len(keysForStringToFloatMap[iNdEx]) + copy(dAtA[i:], keysForStringToFloatMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringToFloatMap[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x10 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v)) + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 } } - if len(m.StringToMsgMap) > 0 { - keysForStringToMsgMap := make([]string, 0, len(m.StringToMsgMap)) - for k := range m.StringToMsgMap { - keysForStringToMsgMap = append(keysForStringToMsgMap, string(k)) + if len(m.StringToDoubleMap) > 0 { + keysForStringToDoubleMap := make([]string, 0, len(m.StringToDoubleMap)) + for k := range m.StringToDoubleMap { + keysForStringToDoubleMap = append(keysForStringToDoubleMap, string(k)) } - github_com_gogo_protobuf_sortkeys.Strings(keysForStringToMsgMap) - for _, k := range keysForStringToMsgMap { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.StringToMsgMap[string(k)] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTheproto3(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + msgSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) + github_com_gogo_protobuf_sortkeys.Strings(keysForStringToDoubleMap) + for iNdEx := len(keysForStringToDoubleMap) - 1; iNdEx >= 0; iNdEx-- { + v := m.StringToDoubleMap[string(keysForStringToDoubleMap[iNdEx])] + baseI := i + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) + i-- + dAtA[i] = 0x11 + i -= len(keysForStringToDoubleMap[iNdEx]) + copy(dAtA[i:], keysForStringToDoubleMap[iNdEx]) + i = encodeVarintTheproto3(dAtA, i, uint64(len(keysForStringToDoubleMap[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v.Size())) - n8, err8 := v.MarshalTo(dAtA[i:]) - if err8 != nil { - return 0, err8 - } - i += n8 - } } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *MessageWithMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4644,90 +4672,91 @@ } func (m *MessageWithMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MessageWithMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.NameMapping) > 0 { - for k := range m.NameMapping { - dAtA[i] = 0xa - i++ - v := m.NameMapping[k] - mapSize := 1 + sovTheproto3(uint64(k)) + 1 + len(v) + sovTheproto3(uint64(len(v))) - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) - } - } - if len(m.MsgMapping) > 0 { - for k := range m.MsgMapping { - dAtA[i] = 0x12 - i++ - v := m.MsgMapping[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTheproto3(uint64(msgSize)) - } - mapSize := 1 + sozTheproto3(uint64(k)) + msgSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(v.Size())) - n9, err9 := v.MarshalTo(dAtA[i:]) - if err9 != nil { - return 0, err9 - } - i += n9 - } - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.ByteMapping) > 0 { for k := range m.ByteMapping { - dAtA[i] = 0x1a - i++ v := m.ByteMapping[k] - byteSize := 0 + baseI := i if len(v) > 0 { - byteSize = 1 + len(v) + sovTheproto3(uint64(len(v))) + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 } - mapSize := 1 + 1 + byteSize - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ + i-- if k { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - if len(v) > 0 { + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a + } + } + if len(m.MsgMapping) > 0 { + for k := range m.MsgMapping { + v := m.MsgMapping[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTheproto3(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) - i += copy(dAtA[i:], v) } + i = encodeVarintTheproto3(dAtA, i, uint64((uint64(k)<<1)^uint64((k>>63)))) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.NameMapping) > 0 { + for k := range m.NameMapping { + v := m.NameMapping[k] + baseI := i + i -= len(v) + copy(dAtA[i:], v) + i = encodeVarintTheproto3(dAtA, i, uint64(len(v))) + i-- + dAtA[i] = 0x12 + i = encodeVarintTheproto3(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *FloatingPoint) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4735,26 +4764,32 @@ } func (m *FloatingPoint) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FloatingPoint) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.F != 0 { - dAtA[i] = 0x9 - i++ + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.F)))) - i += 8 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *Uint128Pair) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4762,38 +4797,48 @@ } func (m *Uint128Pair) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Uint128Pair) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.Left.Size())) - n10, err10 := m.Left.MarshalTo(dAtA[i:]) - if err10 != nil { - return 0, err10 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - i += n10 if m.Right != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(m.Right.Size())) - n11, err11 := m.Right.MarshalTo(dAtA[i:]) - if err11 != nil { - return 0, err11 + { + size := m.Right.Size() + i -= size + if _, err := m.Right.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTheproto3(dAtA, i, uint64(size)) } - i += n11 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + { + size := m.Left.Size() + i -= size + if _, err := m.Left.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintTheproto3(dAtA, i, uint64(size)) } - return i, nil + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *ContainsNestedMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4801,20 +4846,26 @@ } func (m *ContainsNestedMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ContainsNestedMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *ContainsNestedMap_NestedMap) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4822,37 +4873,44 @@ } func (m *ContainsNestedMap_NestedMap) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ContainsNestedMap_NestedMap) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.NestedMapField) > 0 { for k := range m.NestedMapField { - dAtA[i] = 0xa - i++ v := m.NestedMapField[k] - mapSize := 1 + len(k) + sovTheproto3(uint64(len(k))) + 1 + 8 - i = encodeVarintTheproto3(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - dAtA[i] = 0x11 - i++ + baseI := i + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(v)))) - i += 8 + i-- + dAtA[i] = 0x11 + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintTheproto3(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintTheproto3(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *NotPacked) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -4860,31 +4918,39 @@ } func (m *NotPacked) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NotPacked) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Key) > 0 { - for _, num := range m.Key { + for iNdEx := len(m.Key) - 1; iNdEx >= 0; iNdEx-- { + i = encodeVarintTheproto3(dAtA, i, uint64(m.Key[iNdEx])) + i-- dAtA[i] = 0x28 - i++ - i = encodeVarintTheproto3(dAtA, i, uint64(num)) } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintTheproto3(dAtA []byte, offset int, v uint64) int { + offset -= sovTheproto3(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedMessage(r randyTheproto3, easy bool) *Message { this := &Message{} @@ -4901,7 +4967,7 @@ for i := 0; i < v2; i++ { this.Key[i] = uint64(uint64(r.Uint32())) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Nested = NewPopulatedNested(r, easy) } this.ResultCount = int64(r.Int63()) @@ -4913,17 +4979,17 @@ if r.Intn(2) == 0 { this.Score *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.Terrain = make(map[int64]*Nested) for i := 0; i < v3; i++ { this.Terrain[int64(r.Int63())] = NewPopulatedNested(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Proto2Field = both.NewPopulatedNinOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(10) this.Proto2Value = make(map[int64]*both.NinOptEnum) for i := 0; i < v4; i++ { @@ -4947,7 +5013,7 @@ func NewPopulatedAllMaps(r randyTheproto3, easy bool) *AllMaps { this := &AllMaps{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v5; i++ { @@ -4958,7 +5024,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v7; i++ { @@ -4969,7 +5035,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v9; i++ { @@ -4980,7 +5046,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v11; i++ { @@ -4991,7 +5057,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v13; i++ { @@ -4999,7 +5065,7 @@ this.Uint32Map[v14] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v15; i++ { @@ -5007,7 +5073,7 @@ this.Uint64Map[v16] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v17; i++ { @@ -5018,7 +5084,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v19; i++ { @@ -5029,7 +5095,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v21; i++ { @@ -5037,7 +5103,7 @@ this.Fixed32Map[v22] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v23; i++ { @@ -5048,7 +5114,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v25; i++ { @@ -5056,7 +5122,7 @@ this.Fixed64Map[v26] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v27; i++ { @@ -5067,7 +5133,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v29; i++ { @@ -5075,14 +5141,14 @@ this.BoolMap[v30] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v31 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v31; i++ { this.StringMap[randStringTheproto3(r)] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v32; i++ { @@ -5094,14 +5160,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v35; i++ { this.StringToEnumMap[randStringTheproto3(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v36; i++ { @@ -5116,7 +5182,7 @@ func NewPopulatedAllMapsOrdered(r randyTheproto3, easy bool) *AllMapsOrdered { this := &AllMapsOrdered{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v37; i++ { @@ -5127,7 +5193,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v39; i++ { @@ -5138,7 +5204,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v41; i++ { @@ -5149,7 +5215,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v43 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v43; i++ { @@ -5160,7 +5226,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v45; i++ { @@ -5168,7 +5234,7 @@ this.Uint32Map[v46] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v47; i++ { @@ -5176,7 +5242,7 @@ this.Uint64Map[v48] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v49 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v49; i++ { @@ -5187,7 +5253,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v51; i++ { @@ -5198,7 +5264,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v53; i++ { @@ -5206,7 +5272,7 @@ this.Fixed32Map[v54] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v55 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v55; i++ { @@ -5217,7 +5283,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v57; i++ { @@ -5225,7 +5291,7 @@ this.Fixed64Map[v58] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v59 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v59; i++ { @@ -5236,7 +5302,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v61 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v61; i++ { @@ -5244,14 +5310,14 @@ this.BoolMap[v62] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v63; i++ { this.StringMap[randStringTheproto3(r)] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v64; i++ { @@ -5263,14 +5329,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v67 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v67; i++ { this.StringToEnumMap[randStringTheproto3(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v68; i++ { @@ -5285,21 +5351,21 @@ func NewPopulatedMessageWithMap(r randyTheproto3, easy bool) *MessageWithMap { this := &MessageWithMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.NameMapping = make(map[int32]string) for i := 0; i < v69; i++ { this.NameMapping[int32(r.Int31())] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v70 := r.Intn(10) this.MsgMapping = make(map[int64]*FloatingPoint) for i := 0; i < v70; i++ { this.MsgMapping[int64(r.Int63())] = NewPopulatedFloatingPoint(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(10) this.ByteMapping = make(map[bool][]byte) for i := 0; i < v71; i++ { @@ -5350,7 +5416,7 @@ func NewPopulatedContainsNestedMap_NestedMap(r randyTheproto3, easy bool) *ContainsNestedMap_NestedMap { this := &ContainsNestedMap_NestedMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v75 := r.Intn(10) this.NestedMapField = make(map[string]float64) for i := 0; i < v75; i++ { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/theproto3/combos/neither/theproto3.pb.go golang-gogoprotobuf-1.3.1/test/theproto3/combos/neither/theproto3.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/theproto3/combos/neither/theproto3.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/theproto3/combos/neither/theproto3.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -31,7 +31,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapEnum int32 @@ -3651,20 +3651,20 @@ for i := 0; i < v2; i++ { this.Key[i] = uint64(uint64(r.Uint32())) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Nested = NewPopulatedNested(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.Terrain = make(map[int64]*Nested) for i := 0; i < v3; i++ { this.Terrain[int64(r.Int63())] = NewPopulatedNested(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Proto2Field = both.NewPopulatedNinOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(10) this.Proto2Value = make(map[int64]*both.NinOptEnum) for i := 0; i < v4; i++ { @@ -3688,7 +3688,7 @@ func NewPopulatedAllMaps(r randyTheproto3, easy bool) *AllMaps { this := &AllMaps{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v5; i++ { @@ -3699,7 +3699,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v7; i++ { @@ -3710,7 +3710,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v9; i++ { @@ -3721,7 +3721,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v11; i++ { @@ -3732,7 +3732,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v13; i++ { @@ -3740,7 +3740,7 @@ this.Uint32Map[v14] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v15; i++ { @@ -3748,7 +3748,7 @@ this.Uint64Map[v16] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v17; i++ { @@ -3759,7 +3759,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v19; i++ { @@ -3770,7 +3770,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v21; i++ { @@ -3778,7 +3778,7 @@ this.Fixed32Map[v22] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v23; i++ { @@ -3789,7 +3789,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v25; i++ { @@ -3797,7 +3797,7 @@ this.Fixed64Map[v26] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v27; i++ { @@ -3808,7 +3808,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v29; i++ { @@ -3816,14 +3816,14 @@ this.BoolMap[v30] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v31 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v31; i++ { this.StringMap[randStringTheproto3(r)] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v32; i++ { @@ -3835,14 +3835,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v35; i++ { this.StringToEnumMap[randStringTheproto3(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v36; i++ { @@ -3857,7 +3857,7 @@ func NewPopulatedAllMapsOrdered(r randyTheproto3, easy bool) *AllMapsOrdered { this := &AllMapsOrdered{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v37; i++ { @@ -3868,7 +3868,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v39; i++ { @@ -3879,7 +3879,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v41; i++ { @@ -3890,7 +3890,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v43 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v43; i++ { @@ -3901,7 +3901,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v45; i++ { @@ -3909,7 +3909,7 @@ this.Uint32Map[v46] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v47; i++ { @@ -3917,7 +3917,7 @@ this.Uint64Map[v48] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v49 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v49; i++ { @@ -3928,7 +3928,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v51; i++ { @@ -3939,7 +3939,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v53; i++ { @@ -3947,7 +3947,7 @@ this.Fixed32Map[v54] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v55 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v55; i++ { @@ -3958,7 +3958,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v57; i++ { @@ -3966,7 +3966,7 @@ this.Fixed64Map[v58] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v59 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v59; i++ { @@ -3977,7 +3977,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v61 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v61; i++ { @@ -3985,14 +3985,14 @@ this.BoolMap[v62] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v63; i++ { this.StringMap[randStringTheproto3(r)] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v64; i++ { @@ -4004,14 +4004,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v67 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v67; i++ { this.StringToEnumMap[randStringTheproto3(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v68; i++ { @@ -4026,21 +4026,21 @@ func NewPopulatedMessageWithMap(r randyTheproto3, easy bool) *MessageWithMap { this := &MessageWithMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.NameMapping = make(map[int32]string) for i := 0; i < v69; i++ { this.NameMapping[int32(r.Int31())] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v70 := r.Intn(10) this.MsgMapping = make(map[int64]*FloatingPoint) for i := 0; i < v70; i++ { this.MsgMapping[int64(r.Int63())] = NewPopulatedFloatingPoint(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(10) this.ByteMapping = make(map[bool][]byte) for i := 0; i < v71; i++ { @@ -4091,7 +4091,7 @@ func NewPopulatedContainsNestedMap_NestedMap(r randyTheproto3, easy bool) *ContainsNestedMap_NestedMap { this := &ContainsNestedMap_NestedMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v75 := r.Intn(10) this.NestedMapField = make(map[string]float64) for i := 0; i < v75; i++ { diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/theproto3/combos/unmarshaler/theproto3.pb.go golang-gogoprotobuf-1.3.1/test/theproto3/combos/unmarshaler/theproto3.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/theproto3/combos/unmarshaler/theproto3.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/theproto3/combos/unmarshaler/theproto3.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -33,7 +33,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MapEnum int32 @@ -3653,20 +3653,20 @@ for i := 0; i < v2; i++ { this.Key[i] = uint64(uint64(r.Uint32())) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Nested = NewPopulatedNested(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(10) this.Terrain = make(map[int64]*Nested) for i := 0; i < v3; i++ { this.Terrain[int64(r.Int63())] = NewPopulatedNested(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Proto2Field = both.NewPopulatedNinOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(10) this.Proto2Value = make(map[int64]*both.NinOptEnum) for i := 0; i < v4; i++ { @@ -3690,7 +3690,7 @@ func NewPopulatedAllMaps(r randyTheproto3, easy bool) *AllMaps { this := &AllMaps{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v5; i++ { @@ -3701,7 +3701,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v7; i++ { @@ -3712,7 +3712,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v9; i++ { @@ -3723,7 +3723,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v11; i++ { @@ -3734,7 +3734,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v13; i++ { @@ -3742,7 +3742,7 @@ this.Uint32Map[v14] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v15; i++ { @@ -3750,7 +3750,7 @@ this.Uint64Map[v16] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v17; i++ { @@ -3761,7 +3761,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v19; i++ { @@ -3772,7 +3772,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v21; i++ { @@ -3780,7 +3780,7 @@ this.Fixed32Map[v22] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v23; i++ { @@ -3791,7 +3791,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v25; i++ { @@ -3799,7 +3799,7 @@ this.Fixed64Map[v26] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v27; i++ { @@ -3810,7 +3810,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v29; i++ { @@ -3818,14 +3818,14 @@ this.BoolMap[v30] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v31 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v31; i++ { this.StringMap[randStringTheproto3(r)] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v32; i++ { @@ -3837,14 +3837,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v35; i++ { this.StringToEnumMap[randStringTheproto3(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v36; i++ { @@ -3859,7 +3859,7 @@ func NewPopulatedAllMapsOrdered(r randyTheproto3, easy bool) *AllMapsOrdered { this := &AllMapsOrdered{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.StringToDoubleMap = make(map[string]float64) for i := 0; i < v37; i++ { @@ -3870,7 +3870,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(10) this.StringToFloatMap = make(map[string]float32) for i := 0; i < v39; i++ { @@ -3881,7 +3881,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(10) this.Int32Map = make(map[int32]int32) for i := 0; i < v41; i++ { @@ -3892,7 +3892,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v43 := r.Intn(10) this.Int64Map = make(map[int64]int64) for i := 0; i < v43; i++ { @@ -3903,7 +3903,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(10) this.Uint32Map = make(map[uint32]uint32) for i := 0; i < v45; i++ { @@ -3911,7 +3911,7 @@ this.Uint32Map[v46] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(10) this.Uint64Map = make(map[uint64]uint64) for i := 0; i < v47; i++ { @@ -3919,7 +3919,7 @@ this.Uint64Map[v48] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v49 := r.Intn(10) this.Sint32Map = make(map[int32]int32) for i := 0; i < v49; i++ { @@ -3930,7 +3930,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(10) this.Sint64Map = make(map[int64]int64) for i := 0; i < v51; i++ { @@ -3941,7 +3941,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(10) this.Fixed32Map = make(map[uint32]uint32) for i := 0; i < v53; i++ { @@ -3949,7 +3949,7 @@ this.Fixed32Map[v54] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v55 := r.Intn(10) this.Sfixed32Map = make(map[int32]int32) for i := 0; i < v55; i++ { @@ -3960,7 +3960,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(10) this.Fixed64Map = make(map[uint64]uint64) for i := 0; i < v57; i++ { @@ -3968,7 +3968,7 @@ this.Fixed64Map[v58] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v59 := r.Intn(10) this.Sfixed64Map = make(map[int64]int64) for i := 0; i < v59; i++ { @@ -3979,7 +3979,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v61 := r.Intn(10) this.BoolMap = make(map[bool]bool) for i := 0; i < v61; i++ { @@ -3987,14 +3987,14 @@ this.BoolMap[v62] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(10) this.StringMap = make(map[string]string) for i := 0; i < v63; i++ { this.StringMap[randStringTheproto3(r)] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.StringToBytesMap = make(map[string][]byte) for i := 0; i < v64; i++ { @@ -4006,14 +4006,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v67 := r.Intn(10) this.StringToEnumMap = make(map[string]MapEnum) for i := 0; i < v67; i++ { this.StringToEnumMap[randStringTheproto3(r)] = MapEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.StringToMsgMap = make(map[string]*FloatingPoint) for i := 0; i < v68; i++ { @@ -4028,21 +4028,21 @@ func NewPopulatedMessageWithMap(r randyTheproto3, easy bool) *MessageWithMap { this := &MessageWithMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.NameMapping = make(map[int32]string) for i := 0; i < v69; i++ { this.NameMapping[int32(r.Int31())] = randStringTheproto3(r) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v70 := r.Intn(10) this.MsgMapping = make(map[int64]*FloatingPoint) for i := 0; i < v70; i++ { this.MsgMapping[int64(r.Int63())] = NewPopulatedFloatingPoint(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(10) this.ByteMapping = make(map[bool][]byte) for i := 0; i < v71; i++ { @@ -4093,7 +4093,7 @@ func NewPopulatedContainsNestedMap_NestedMap(r randyTheproto3, easy bool) *ContainsNestedMap_NestedMap { this := &ContainsNestedMap_NestedMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v75 := r.Intn(10) this.NestedMapField = make(map[string]float64) for i := 0; i < v75; i++ { @@ -10496,6 +10496,7 @@ func skipTheproto3(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -10527,10 +10528,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -10551,55 +10550,30 @@ return 0, ErrInvalidLengthTheproto3 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthTheproto3 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTheproto3 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipTheproto3(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthTheproto3 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTheproto3 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthTheproto3 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthTheproto3 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTheproto3 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthTheproto3 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTheproto3 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTheproto3 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/thetest.pb.go golang-gogoprotobuf-1.3.1/test/thetest.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/thetest.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/thetest.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -32,7 +32,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type TheTestEnum int32 @@ -20184,16 +20184,16 @@ s = append(s, "Field2: "+fmt.Sprintf("%#v", this.Field2)+",\n") } if this.Field3 != nil { - vs := make([]*NidOptNative, len(this.Field3)) + vs := make([]NidOptNative, len(this.Field3)) for i := range vs { - vs[i] = &this.Field3[i] + vs[i] = this.Field3[i] } s = append(s, "Field3: "+fmt.Sprintf("%#v", vs)+",\n") } if this.Field4 != nil { - vs := make([]*NinOptNative, len(this.Field4)) + vs := make([]NinOptNative, len(this.Field4)) for i := range vs { - vs[i] = &this.Field4[i] + vs[i] = this.Field4[i] } s = append(s, "Field4: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -20204,9 +20204,9 @@ s = append(s, "Field7: "+fmt.Sprintf("%#v", this.Field7)+",\n") } if this.Field8 != nil { - vs := make([]*NidOptNative, len(this.Field8)) + vs := make([]NidOptNative, len(this.Field8)) for i := range vs { - vs[i] = &this.Field8[i] + vs[i] = this.Field8[i] } s = append(s, "Field8: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -20313,9 +20313,9 @@ s = append(s, "&test.NidNestedStruct{") s = append(s, "Field1: "+strings.Replace(this.Field1.GoString(), `&`, ``, 1)+",\n") if this.Field2 != nil { - vs := make([]*NidRepStruct, len(this.Field2)) + vs := make([]NidRepStruct, len(this.Field2)) for i := range vs { - vs[i] = &this.Field2[i] + vs[i] = this.Field2[i] } s = append(s, "Field2: "+fmt.Sprintf("%#v", vs)+",\n") } @@ -21541,87 +21541,87 @@ func NewPopulatedNinOptNative(r randyThetest, easy bool) *NinOptNative { this := &NinOptNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := float64(r.Float64()) if r.Intn(2) == 0 { v2 *= -1 } this.Field1 = &v2 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := float32(r.Float32()) if r.Intn(2) == 0 { v3 *= -1 } this.Field2 = &v3 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := int32(r.Int31()) if r.Intn(2) == 0 { v4 *= -1 } this.Field3 = &v4 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := int64(r.Int63()) if r.Intn(2) == 0 { v5 *= -1 } this.Field4 = &v5 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := uint32(r.Uint32()) this.Field5 = &v6 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := uint64(uint64(r.Uint32())) this.Field6 = &v7 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := int32(r.Int31()) if r.Intn(2) == 0 { v8 *= -1 } this.Field7 = &v8 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := int64(r.Int63()) if r.Intn(2) == 0 { v9 *= -1 } this.Field8 = &v9 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := uint32(r.Uint32()) this.Field9 = &v10 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := int32(r.Int31()) if r.Intn(2) == 0 { v11 *= -1 } this.Field10 = &v11 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := uint64(uint64(r.Uint32())) this.Field11 = &v12 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := int64(r.Int63()) if r.Intn(2) == 0 { v13 *= -1 } this.Field12 = &v13 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v14 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := string(randStringThetest(r)) this.Field14 = &v15 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := r.Intn(100) this.Field15 = make([]byte, v16) for i := 0; i < v16; i++ { @@ -21636,7 +21636,7 @@ func NewPopulatedNidRepNative(r randyThetest, easy bool) *NidRepNative { this := &NidRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := r.Intn(10) this.Field1 = make([]float64, v17) for i := 0; i < v17; i++ { @@ -21646,7 +21646,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := r.Intn(10) this.Field2 = make([]float32, v18) for i := 0; i < v18; i++ { @@ -21656,7 +21656,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := r.Intn(10) this.Field3 = make([]int32, v19) for i := 0; i < v19; i++ { @@ -21666,7 +21666,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(10) this.Field4 = make([]int64, v20) for i := 0; i < v20; i++ { @@ -21676,21 +21676,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(10) this.Field5 = make([]uint32, v21) for i := 0; i < v21; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := r.Intn(10) this.Field6 = make([]uint64, v22) for i := 0; i < v22; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(10) this.Field7 = make([]int32, v23) for i := 0; i < v23; i++ { @@ -21700,7 +21700,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(10) this.Field8 = make([]int64, v24) for i := 0; i < v24; i++ { @@ -21710,14 +21710,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(10) this.Field9 = make([]uint32, v25) for i := 0; i < v25; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v26 := r.Intn(10) this.Field10 = make([]int32, v26) for i := 0; i < v26; i++ { @@ -21727,14 +21727,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(10) this.Field11 = make([]uint64, v27) for i := 0; i < v27; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v28 := r.Intn(10) this.Field12 = make([]int64, v28) for i := 0; i < v28; i++ { @@ -21744,21 +21744,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(10) this.Field13 = make([]bool, v29) for i := 0; i < v29; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(10) this.Field14 = make([]string, v30) for i := 0; i < v30; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v31 := r.Intn(10) this.Field15 = make([][]byte, v31) for i := 0; i < v31; i++ { @@ -21777,7 +21777,7 @@ func NewPopulatedNinRepNative(r randyThetest, easy bool) *NinRepNative { this := &NinRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(10) this.Field1 = make([]float64, v33) for i := 0; i < v33; i++ { @@ -21787,7 +21787,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v34 := r.Intn(10) this.Field2 = make([]float32, v34) for i := 0; i < v34; i++ { @@ -21797,7 +21797,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(10) this.Field3 = make([]int32, v35) for i := 0; i < v35; i++ { @@ -21807,7 +21807,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(10) this.Field4 = make([]int64, v36) for i := 0; i < v36; i++ { @@ -21817,21 +21817,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v37 := r.Intn(10) this.Field5 = make([]uint32, v37) for i := 0; i < v37; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(10) this.Field6 = make([]uint64, v38) for i := 0; i < v38; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(10) this.Field7 = make([]int32, v39) for i := 0; i < v39; i++ { @@ -21841,7 +21841,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v40 := r.Intn(10) this.Field8 = make([]int64, v40) for i := 0; i < v40; i++ { @@ -21851,14 +21851,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(10) this.Field9 = make([]uint32, v41) for i := 0; i < v41; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(10) this.Field10 = make([]int32, v42) for i := 0; i < v42; i++ { @@ -21868,14 +21868,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v43 := r.Intn(10) this.Field11 = make([]uint64, v43) for i := 0; i < v43; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(10) this.Field12 = make([]int64, v44) for i := 0; i < v44; i++ { @@ -21885,21 +21885,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(10) this.Field13 = make([]bool, v45) for i := 0; i < v45; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v46 := r.Intn(10) this.Field14 = make([]string, v46) for i := 0; i < v46; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(10) this.Field15 = make([][]byte, v47) for i := 0; i < v47; i++ { @@ -21918,7 +21918,7 @@ func NewPopulatedNidRepPackedNative(r randyThetest, easy bool) *NidRepPackedNative { this := &NidRepPackedNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v49 := r.Intn(10) this.Field1 = make([]float64, v49) for i := 0; i < v49; i++ { @@ -21928,7 +21928,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(10) this.Field2 = make([]float32, v50) for i := 0; i < v50; i++ { @@ -21938,7 +21938,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(10) this.Field3 = make([]int32, v51) for i := 0; i < v51; i++ { @@ -21948,7 +21948,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v52 := r.Intn(10) this.Field4 = make([]int64, v52) for i := 0; i < v52; i++ { @@ -21958,21 +21958,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(10) this.Field5 = make([]uint32, v53) for i := 0; i < v53; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(10) this.Field6 = make([]uint64, v54) for i := 0; i < v54; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v55 := r.Intn(10) this.Field7 = make([]int32, v55) for i := 0; i < v55; i++ { @@ -21982,7 +21982,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(10) this.Field8 = make([]int64, v56) for i := 0; i < v56; i++ { @@ -21992,14 +21992,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(10) this.Field9 = make([]uint32, v57) for i := 0; i < v57; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(10) this.Field10 = make([]int32, v58) for i := 0; i < v58; i++ { @@ -22009,14 +22009,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v59 := r.Intn(10) this.Field11 = make([]uint64, v59) for i := 0; i < v59; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(10) this.Field12 = make([]int64, v60) for i := 0; i < v60; i++ { @@ -22026,7 +22026,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v61 := r.Intn(10) this.Field13 = make([]bool, v61) for i := 0; i < v61; i++ { @@ -22041,7 +22041,7 @@ func NewPopulatedNinRepPackedNative(r randyThetest, easy bool) *NinRepPackedNative { this := &NinRepPackedNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(10) this.Field1 = make([]float64, v62) for i := 0; i < v62; i++ { @@ -22051,7 +22051,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(10) this.Field2 = make([]float32, v63) for i := 0; i < v63; i++ { @@ -22061,7 +22061,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v64 := r.Intn(10) this.Field3 = make([]int32, v64) for i := 0; i < v64; i++ { @@ -22071,7 +22071,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(10) this.Field4 = make([]int64, v65) for i := 0; i < v65; i++ { @@ -22081,21 +22081,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v66 := r.Intn(10) this.Field5 = make([]uint32, v66) for i := 0; i < v66; i++ { this.Field5[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v67 := r.Intn(10) this.Field6 = make([]uint64, v67) for i := 0; i < v67; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(10) this.Field7 = make([]int32, v68) for i := 0; i < v68; i++ { @@ -22105,7 +22105,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(10) this.Field8 = make([]int64, v69) for i := 0; i < v69; i++ { @@ -22115,14 +22115,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v70 := r.Intn(10) this.Field9 = make([]uint32, v70) for i := 0; i < v70; i++ { this.Field9[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(10) this.Field10 = make([]int32, v71) for i := 0; i < v71; i++ { @@ -22132,14 +22132,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v72 := r.Intn(10) this.Field11 = make([]uint64, v72) for i := 0; i < v72; i++ { this.Field11[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v73 := r.Intn(10) this.Field12 = make([]int64, v73) for i := 0; i < v73; i++ { @@ -22149,7 +22149,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v74 := r.Intn(10) this.Field13 = make([]bool, v74) for i := 0; i < v74; i++ { @@ -22198,49 +22198,49 @@ func NewPopulatedNinOptStruct(r randyThetest, easy bool) *NinOptStruct { this := &NinOptStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v79 := float64(r.Float64()) if r.Intn(2) == 0 { v79 *= -1 } this.Field1 = &v79 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v80 := float32(r.Float32()) if r.Intn(2) == 0 { v80 *= -1 } this.Field2 = &v80 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field3 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field4 = NewPopulatedNinOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v81 := uint64(uint64(r.Uint32())) this.Field6 = &v81 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v82 := int32(r.Int31()) if r.Intn(2) == 0 { v82 *= -1 } this.Field7 = &v82 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field8 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v83 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v83 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v84 := string(randStringThetest(r)) this.Field14 = &v84 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v85 := r.Intn(100) this.Field15 = make([]byte, v85) for i := 0; i < v85; i++ { @@ -22255,7 +22255,7 @@ func NewPopulatedNidRepStruct(r randyThetest, easy bool) *NidRepStruct { this := &NidRepStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v86 := r.Intn(10) this.Field1 = make([]float64, v86) for i := 0; i < v86; i++ { @@ -22265,7 +22265,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v87 := r.Intn(10) this.Field2 = make([]float32, v87) for i := 0; i < v87; i++ { @@ -22275,7 +22275,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v88 := r.Intn(5) this.Field3 = make([]NidOptNative, v88) for i := 0; i < v88; i++ { @@ -22283,7 +22283,7 @@ this.Field3[i] = *v89 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v90 := r.Intn(5) this.Field4 = make([]NinOptNative, v90) for i := 0; i < v90; i++ { @@ -22291,14 +22291,14 @@ this.Field4[i] = *v91 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v92 := r.Intn(10) this.Field6 = make([]uint64, v92) for i := 0; i < v92; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v93 := r.Intn(10) this.Field7 = make([]int32, v93) for i := 0; i < v93; i++ { @@ -22308,7 +22308,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v94 := r.Intn(5) this.Field8 = make([]NidOptNative, v94) for i := 0; i < v94; i++ { @@ -22316,21 +22316,21 @@ this.Field8[i] = *v95 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v96 := r.Intn(10) this.Field13 = make([]bool, v96) for i := 0; i < v96; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v97 := r.Intn(10) this.Field14 = make([]string, v97) for i := 0; i < v97; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v98 := r.Intn(10) this.Field15 = make([][]byte, v98) for i := 0; i < v98; i++ { @@ -22349,7 +22349,7 @@ func NewPopulatedNinRepStruct(r randyThetest, easy bool) *NinRepStruct { this := &NinRepStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v100 := r.Intn(10) this.Field1 = make([]float64, v100) for i := 0; i < v100; i++ { @@ -22359,7 +22359,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v101 := r.Intn(10) this.Field2 = make([]float32, v101) for i := 0; i < v101; i++ { @@ -22369,28 +22369,28 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v102 := r.Intn(5) this.Field3 = make([]*NidOptNative, v102) for i := 0; i < v102; i++ { this.Field3[i] = NewPopulatedNidOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v103 := r.Intn(5) this.Field4 = make([]*NinOptNative, v103) for i := 0; i < v103; i++ { this.Field4[i] = NewPopulatedNinOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v104 := r.Intn(10) this.Field6 = make([]uint64, v104) for i := 0; i < v104; i++ { this.Field6[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v105 := r.Intn(10) this.Field7 = make([]int32, v105) for i := 0; i < v105; i++ { @@ -22400,28 +22400,28 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v106 := r.Intn(5) this.Field8 = make([]*NidOptNative, v106) for i := 0; i < v106; i++ { this.Field8[i] = NewPopulatedNidOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v107 := r.Intn(10) this.Field13 = make([]bool, v107) for i := 0; i < v107; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v108 := r.Intn(10) this.Field14 = make([]string, v108) for i := 0; i < v108; i++ { this.Field14[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v109 := r.Intn(10) this.Field15 = make([][]byte, v109) for i := 0; i < v109; i++ { @@ -22440,7 +22440,7 @@ func NewPopulatedNidEmbeddedStruct(r randyThetest, easy bool) *NidEmbeddedStruct { this := &NidEmbeddedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NidOptNative = NewPopulatedNidOptNative(r, easy) } v111 := NewPopulatedNidOptNative(r, easy) @@ -22454,13 +22454,13 @@ func NewPopulatedNinEmbeddedStruct(r randyThetest, easy bool) *NinEmbeddedStruct { this := &NinEmbeddedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NidOptNative = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field200 = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v112 := bool(bool(r.Intn(2) == 0)) this.Field210 = &v112 } @@ -22474,7 +22474,7 @@ this := &NidNestedStruct{} v113 := NewPopulatedNidOptStruct(r, easy) this.Field1 = *v113 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v114 := r.Intn(5) this.Field2 = make([]NidRepStruct, v114) for i := 0; i < v114; i++ { @@ -22490,10 +22490,10 @@ func NewPopulatedNinNestedStruct(r randyThetest, easy bool) *NinNestedStruct { this := &NinNestedStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedNinOptStruct(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v116 := r.Intn(5) this.Field2 = make([]*NinRepStruct, v116) for i := 0; i < v116; i++ { @@ -22520,7 +22520,7 @@ func NewPopulatedCustomDash(r randyThetest, easy bool) *CustomDash { this := &CustomDash{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Value = github_com_gogo_protobuf_test_custom_dash_type.NewPopulatedBytes(r) } if !easy && r.Intn(10) != 0 { @@ -22531,10 +22531,10 @@ func NewPopulatedNinOptCustom(r randyThetest, easy bool) *NinOptCustom { this := &NinOptCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Id = NewPopulatedUuid(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Value = github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r) } if !easy && r.Intn(10) != 0 { @@ -22545,7 +22545,7 @@ func NewPopulatedNidRepCustom(r randyThetest, easy bool) *NidRepCustom { this := &NidRepCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v119 := r.Intn(10) this.Id = make([]Uuid, v119) for i := 0; i < v119; i++ { @@ -22553,7 +22553,7 @@ this.Id[i] = *v120 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v121 := r.Intn(10) this.Value = make([]github_com_gogo_protobuf_test_custom.Uint128, v121) for i := 0; i < v121; i++ { @@ -22569,7 +22569,7 @@ func NewPopulatedNinRepCustom(r randyThetest, easy bool) *NinRepCustom { this := &NinRepCustom{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v123 := r.Intn(10) this.Id = make([]Uuid, v123) for i := 0; i < v123; i++ { @@ -22577,7 +22577,7 @@ this.Id[i] = *v124 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v125 := r.Intn(10) this.Value = make([]github_com_gogo_protobuf_test_custom.Uint128, v125) for i := 0; i < v125; i++ { @@ -22831,15 +22831,15 @@ func NewPopulatedNinOptEnum(r randyThetest, easy bool) *NinOptEnum { this := &NinOptEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v152 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.Field1 = &v152 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v153 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v153 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v154 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v154 } @@ -22851,21 +22851,21 @@ func NewPopulatedNidRepEnum(r randyThetest, easy bool) *NidRepEnum { this := &NidRepEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v155 := r.Intn(10) this.Field1 = make([]TheTestEnum, v155) for i := 0; i < v155; i++ { this.Field1[i] = TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v156 := r.Intn(10) this.Field2 = make([]YetAnotherTestEnum, v156) for i := 0; i < v156; i++ { this.Field2[i] = YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v157 := r.Intn(10) this.Field3 = make([]YetYetAnotherTestEnum, v157) for i := 0; i < v157; i++ { @@ -22880,21 +22880,21 @@ func NewPopulatedNinRepEnum(r randyThetest, easy bool) *NinRepEnum { this := &NinRepEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v158 := r.Intn(10) this.Field1 = make([]TheTestEnum, v158) for i := 0; i < v158; i++ { this.Field1[i] = TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v159 := r.Intn(10) this.Field2 = make([]YetAnotherTestEnum, v159) for i := 0; i < v159; i++ { this.Field2[i] = YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v160 := r.Intn(10) this.Field3 = make([]YetYetAnotherTestEnum, v160) for i := 0; i < v160; i++ { @@ -22909,15 +22909,15 @@ func NewPopulatedNinOptEnumDefault(r randyThetest, easy bool) *NinOptEnumDefault { this := &NinOptEnumDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v161 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.Field1 = &v161 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v162 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v162 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v163 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v163 } @@ -22929,15 +22929,15 @@ func NewPopulatedAnotherNinOptEnum(r randyThetest, easy bool) *AnotherNinOptEnum { this := &AnotherNinOptEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v164 := AnotherTestEnum([]int32{10, 11}[r.Intn(2)]) this.Field1 = &v164 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v165 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v165 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v166 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v166 } @@ -22949,15 +22949,15 @@ func NewPopulatedAnotherNinOptEnumDefault(r randyThetest, easy bool) *AnotherNinOptEnumDefault { this := &AnotherNinOptEnumDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v167 := AnotherTestEnum([]int32{10, 11}[r.Intn(2)]) this.Field1 = &v167 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v168 := YetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field2 = &v168 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v169 := YetYetAnotherTestEnum([]int32{0, 1}[r.Intn(2)]) this.Field3 = &v169 } @@ -22990,7 +22990,7 @@ func NewPopulatedMyExtendable(r randyThetest, easy bool) *MyExtendable { this := &MyExtendable{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v171 := int64(r.Int63()) if r.Intn(2) == 0 { v171 *= -1 @@ -23017,21 +23017,21 @@ func NewPopulatedOtherExtenable(r randyThetest, easy bool) *OtherExtenable { this := &OtherExtenable{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v172 := int64(r.Int63()) if r.Intn(2) == 0 { v172 *= -1 } this.Field2 = &v172 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v173 := int64(r.Int63()) if r.Intn(2) == 0 { v173 *= -1 } this.Field13 = &v173 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.M = NewPopulatedMyExtendable(r, easy) } if !easy && r.Intn(10) != 0 { @@ -23061,21 +23061,21 @@ func NewPopulatedNestedDefinition(r randyThetest, easy bool) *NestedDefinition { this := &NestedDefinition{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v174 := int64(r.Int63()) if r.Intn(2) == 0 { v174 *= -1 } this.Field1 = &v174 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v175 := NestedDefinition_NestedEnum([]int32{1}[r.Intn(1)]) this.EnumField = &v175 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NNM = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NM = NewPopulatedNestedDefinition_NestedMessage(r, easy) } if !easy && r.Intn(10) != 0 { @@ -23086,11 +23086,11 @@ func NewPopulatedNestedDefinition_NestedMessage(r randyThetest, easy bool) *NestedDefinition_NestedMessage { this := &NestedDefinition_NestedMessage{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v176 := uint64(uint64(r.Uint32())) this.NestedField1 = &v176 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NNM = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } if !easy && r.Intn(10) != 0 { @@ -23101,7 +23101,7 @@ func NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r randyThetest, easy bool) *NestedDefinition_NestedMessage_NestedNestedMsg { this := &NestedDefinition_NestedMessage_NestedNestedMsg{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v177 := string(randStringThetest(r)) this.NestedNestedField1 = &v177 } @@ -23113,14 +23113,14 @@ func NewPopulatedNestedScope(r randyThetest, easy bool) *NestedScope { this := &NestedScope{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.A = NewPopulatedNestedDefinition_NestedMessage_NestedNestedMsg(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v178 := NestedDefinition_NestedEnum([]int32{1}[r.Intn(1)]) this.B = &v178 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.C = NewPopulatedNestedDefinition_NestedMessage(r, easy) } if !easy && r.Intn(10) != 0 { @@ -23131,87 +23131,87 @@ func NewPopulatedNinOptNativeDefault(r randyThetest, easy bool) *NinOptNativeDefault { this := &NinOptNativeDefault{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v179 := float64(r.Float64()) if r.Intn(2) == 0 { v179 *= -1 } this.Field1 = &v179 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v180 := float32(r.Float32()) if r.Intn(2) == 0 { v180 *= -1 } this.Field2 = &v180 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v181 := int32(r.Int31()) if r.Intn(2) == 0 { v181 *= -1 } this.Field3 = &v181 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v182 := int64(r.Int63()) if r.Intn(2) == 0 { v182 *= -1 } this.Field4 = &v182 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v183 := uint32(r.Uint32()) this.Field5 = &v183 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v184 := uint64(uint64(r.Uint32())) this.Field6 = &v184 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v185 := int32(r.Int31()) if r.Intn(2) == 0 { v185 *= -1 } this.Field7 = &v185 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v186 := int64(r.Int63()) if r.Intn(2) == 0 { v186 *= -1 } this.Field8 = &v186 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v187 := uint32(r.Uint32()) this.Field9 = &v187 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v188 := int32(r.Int31()) if r.Intn(2) == 0 { v188 *= -1 } this.Field10 = &v188 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v189 := uint64(uint64(r.Uint32())) this.Field11 = &v189 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v190 := int64(r.Int63()) if r.Intn(2) == 0 { v190 *= -1 } this.Field12 = &v190 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v191 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v191 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v192 := string(randStringThetest(r)) this.Field14 = &v192 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v193 := r.Intn(100) this.Field15 = make([]byte, v193) for i := 0; i < v193; i++ { @@ -23287,87 +23287,87 @@ func NewPopulatedCustomNameNinOptNative(r randyThetest, easy bool) *CustomNameNinOptNative { this := &CustomNameNinOptNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v196 := float64(r.Float64()) if r.Intn(2) == 0 { v196 *= -1 } this.FieldA = &v196 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v197 := float32(r.Float32()) if r.Intn(2) == 0 { v197 *= -1 } this.FieldB = &v197 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v198 := int32(r.Int31()) if r.Intn(2) == 0 { v198 *= -1 } this.FieldC = &v198 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v199 := int64(r.Int63()) if r.Intn(2) == 0 { v199 *= -1 } this.FieldD = &v199 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v200 := uint32(r.Uint32()) this.FieldE = &v200 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v201 := uint64(uint64(r.Uint32())) this.FieldF = &v201 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v202 := int32(r.Int31()) if r.Intn(2) == 0 { v202 *= -1 } this.FieldG = &v202 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v203 := int64(r.Int63()) if r.Intn(2) == 0 { v203 *= -1 } this.FieldH = &v203 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v204 := uint32(r.Uint32()) this.FieldI = &v204 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v205 := int32(r.Int31()) if r.Intn(2) == 0 { v205 *= -1 } this.FieldJ = &v205 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v206 := uint64(uint64(r.Uint32())) this.FieldK = &v206 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v207 := int64(r.Int63()) if r.Intn(2) == 0 { v207 *= -1 } this.FielL = &v207 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v208 := bool(bool(r.Intn(2) == 0)) this.FieldM = &v208 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v209 := string(randStringThetest(r)) this.FieldN = &v209 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v210 := r.Intn(100) this.FieldO = make([]byte, v210) for i := 0; i < v210; i++ { @@ -23382,7 +23382,7 @@ func NewPopulatedCustomNameNinRepNative(r randyThetest, easy bool) *CustomNameNinRepNative { this := &CustomNameNinRepNative{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v211 := r.Intn(10) this.FieldA = make([]float64, v211) for i := 0; i < v211; i++ { @@ -23392,7 +23392,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v212 := r.Intn(10) this.FieldB = make([]float32, v212) for i := 0; i < v212; i++ { @@ -23402,7 +23402,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v213 := r.Intn(10) this.FieldC = make([]int32, v213) for i := 0; i < v213; i++ { @@ -23412,7 +23412,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v214 := r.Intn(10) this.FieldD = make([]int64, v214) for i := 0; i < v214; i++ { @@ -23422,21 +23422,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v215 := r.Intn(10) this.FieldE = make([]uint32, v215) for i := 0; i < v215; i++ { this.FieldE[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v216 := r.Intn(10) this.FieldF = make([]uint64, v216) for i := 0; i < v216; i++ { this.FieldF[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v217 := r.Intn(10) this.FieldG = make([]int32, v217) for i := 0; i < v217; i++ { @@ -23446,7 +23446,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v218 := r.Intn(10) this.FieldH = make([]int64, v218) for i := 0; i < v218; i++ { @@ -23456,14 +23456,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v219 := r.Intn(10) this.FieldI = make([]uint32, v219) for i := 0; i < v219; i++ { this.FieldI[i] = uint32(r.Uint32()) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v220 := r.Intn(10) this.FieldJ = make([]int32, v220) for i := 0; i < v220; i++ { @@ -23473,14 +23473,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v221 := r.Intn(10) this.FieldK = make([]uint64, v221) for i := 0; i < v221; i++ { this.FieldK[i] = uint64(uint64(r.Uint32())) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v222 := r.Intn(10) this.FieldL = make([]int64, v222) for i := 0; i < v222; i++ { @@ -23490,21 +23490,21 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v223 := r.Intn(10) this.FieldM = make([]bool, v223) for i := 0; i < v223; i++ { this.FieldM[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v224 := r.Intn(10) this.FieldN = make([]string, v224) for i := 0; i < v224; i++ { this.FieldN[i] = string(randStringThetest(r)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v225 := r.Intn(10) this.FieldO = make([][]byte, v225) for i := 0; i < v225; i++ { @@ -23523,53 +23523,53 @@ func NewPopulatedCustomNameNinStruct(r randyThetest, easy bool) *CustomNameNinStruct { this := &CustomNameNinStruct{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v227 := float64(r.Float64()) if r.Intn(2) == 0 { v227 *= -1 } this.FieldA = &v227 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v228 := float32(r.Float32()) if r.Intn(2) == 0 { v228 *= -1 } this.FieldB = &v228 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldC = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v229 := r.Intn(5) this.FieldD = make([]*NinOptNative, v229) for i := 0; i < v229; i++ { this.FieldD[i] = NewPopulatedNinOptNative(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v230 := uint64(uint64(r.Uint32())) this.FieldE = &v230 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v231 := int32(r.Int31()) if r.Intn(2) == 0 { v231 *= -1 } this.FieldF = &v231 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldG = NewPopulatedNidOptNative(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v232 := bool(bool(r.Intn(2) == 0)) this.FieldH = &v232 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v233 := string(randStringThetest(r)) this.FieldI = &v233 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v234 := r.Intn(100) this.FieldJ = make([]byte, v234) for i := 0; i < v234; i++ { @@ -23584,13 +23584,13 @@ func NewPopulatedCustomNameCustomType(r randyThetest, easy bool) *CustomNameCustomType { this := &CustomNameCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldA = NewPopulatedUuid(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.FieldB = github_com_gogo_protobuf_test_custom.NewPopulatedUint128(r) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v235 := r.Intn(10) this.FieldC = make([]Uuid, v235) for i := 0; i < v235; i++ { @@ -23598,7 +23598,7 @@ this.FieldC[i] = *v236 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v237 := r.Intn(10) this.FieldD = make([]github_com_gogo_protobuf_test_custom.Uint128, v237) for i := 0; i < v237; i++ { @@ -23629,11 +23629,11 @@ func NewPopulatedCustomNameEnum(r randyThetest, easy bool) *CustomNameEnum { this := &CustomNameEnum{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v240 := TheTestEnum([]int32{0, 1, 2}[r.Intn(3)]) this.FieldA = &v240 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v241 := r.Intn(10) this.FieldB = make([]TheTestEnum, v241) for i := 0; i < v241; i++ { @@ -23648,7 +23648,7 @@ func NewPopulatedNoExtensionsMap(r randyThetest, easy bool) *NoExtensionsMap { this := &NoExtensionsMap{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v242 := int64(r.Int63()) if r.Intn(2) == 0 { v242 *= -1 @@ -23675,7 +23675,7 @@ func NewPopulatedUnrecognized(r randyThetest, easy bool) *Unrecognized { this := &Unrecognized{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v243 := string(randStringThetest(r)) this.Field1 = &v243 } @@ -23686,14 +23686,14 @@ func NewPopulatedUnrecognizedWithInner(r randyThetest, easy bool) *UnrecognizedWithInner { this := &UnrecognizedWithInner{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v244 := r.Intn(5) this.Embedded = make([]*UnrecognizedWithInner_Inner, v244) for i := 0; i < v244; i++ { this.Embedded[i] = NewPopulatedUnrecognizedWithInner_Inner(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v245 := string(randStringThetest(r)) this.Field2 = &v245 } @@ -23705,7 +23705,7 @@ func NewPopulatedUnrecognizedWithInner_Inner(r randyThetest, easy bool) *UnrecognizedWithInner_Inner { this := &UnrecognizedWithInner_Inner{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v246 := uint32(r.Uint32()) this.Field1 = &v246 } @@ -23718,7 +23718,7 @@ this := &UnrecognizedWithEmbed{} v247 := NewPopulatedUnrecognizedWithEmbed_Embedded(r, easy) this.UnrecognizedWithEmbed_Embedded = *v247 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v248 := string(randStringThetest(r)) this.Field2 = &v248 } @@ -23730,7 +23730,7 @@ func NewPopulatedUnrecognizedWithEmbed_Embedded(r randyThetest, easy bool) *UnrecognizedWithEmbed_Embedded { this := &UnrecognizedWithEmbed_Embedded{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v249 := uint32(r.Uint32()) this.Field1 = &v249 } @@ -23741,11 +23741,11 @@ func NewPopulatedNode(r randyThetest, easy bool) *Node { this := &Node{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v250 := string(randStringThetest(r)) this.Label = &v250 } - if r.Intn(10) == 0 { + if r.Intn(5) == 0 { v251 := r.Intn(5) this.Children = make([]*Node, v251) for i := 0; i < v251; i++ { @@ -23760,7 +23760,7 @@ func NewPopulatedNonByteCustomType(r randyThetest, easy bool) *NonByteCustomType { this := &NonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedT(r) } if !easy && r.Intn(10) != 0 { @@ -23781,7 +23781,7 @@ func NewPopulatedNinOptNonByteCustomType(r randyThetest, easy bool) *NinOptNonByteCustomType { this := &NinOptNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Field1 = NewPopulatedT(r) } if !easy && r.Intn(10) != 0 { @@ -23792,7 +23792,7 @@ func NewPopulatedNidRepNonByteCustomType(r randyThetest, easy bool) *NidRepNonByteCustomType { this := &NidRepNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v253 := r.Intn(10) this.Field1 = make([]T, v253) for i := 0; i < v253; i++ { @@ -23808,7 +23808,7 @@ func NewPopulatedNinRepNonByteCustomType(r randyThetest, easy bool) *NinRepNonByteCustomType { this := &NinRepNonByteCustomType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v255 := r.Intn(10) this.Field1 = make([]T, v255) for i := 0; i < v255; i++ { @@ -23824,7 +23824,7 @@ func NewPopulatedProtoType(r randyThetest, easy bool) *ProtoType { this := &ProtoType{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v257 := string(randStringThetest(r)) this.Field2 = &v257 } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/typedecl/typedecl.pb.go golang-gogoprotobuf-1.3.1/test/typedecl/typedecl.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/typedecl/typedecl.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/typedecl/typedecl.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func (m *Dropped) Reset() { *m = Dropped{} } func (m *Dropped) String() string { return proto.CompactTextString(m) } @@ -37,7 +37,7 @@ return xxx_messageInfo_Dropped.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -84,7 +84,7 @@ return xxx_messageInfo_DroppedWithoutGetters.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -124,7 +124,7 @@ return xxx_messageInfo_Kept.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -368,7 +368,7 @@ func (m *Dropped) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -376,28 +376,34 @@ } func (m *Dropped) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Dropped) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintTypedecl(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } if m.Age != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintTypedecl(dAtA, i, uint64(m.Age)) + i-- + dAtA[i] = 0x10 } - return i, nil + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintTypedecl(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func (m *DroppedWithoutGetters) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -405,27 +411,32 @@ } func (m *DroppedWithoutGetters) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DroppedWithoutGetters) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Height != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintTypedecl(dAtA, i, uint64(m.Height)) - } if m.Width != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintTypedecl(dAtA, i, uint64(m.Width)) + i-- + dAtA[i] = 0x10 } - return i, nil + if m.Height != 0 { + i = encodeVarintTypedecl(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil } func (m *Kept) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -433,32 +444,40 @@ } func (m *Kept) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Kept) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintTypedecl(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } if m.Age != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintTypedecl(dAtA, i, uint64(m.Age)) + i-- + dAtA[i] = 0x10 } - return i, nil + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintTypedecl(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func encodeVarintTypedecl(dAtA []byte, offset int, v uint64) int { + offset -= sovTypedecl(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedDropped(r randyTypedecl, easy bool) *Dropped { this := &Dropped{} @@ -926,6 +945,7 @@ func skipTypedecl(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -957,10 +977,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -981,55 +999,30 @@ return 0, ErrInvalidLengthTypedecl } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthTypedecl - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTypedecl - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipTypedecl(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthTypedecl - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTypedecl + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthTypedecl + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthTypedecl = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTypedecl = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthTypedecl = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTypedecl = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTypedecl = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/typedecl_all/typedeclall.pb.go golang-gogoprotobuf-1.3.1/test/typedecl_all/typedeclall.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/typedecl_all/typedeclall.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/typedecl_all/typedeclall.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func (m *Dropped) Reset() { *m = Dropped{} } func (m *Dropped) String() string { return proto.CompactTextString(m) } @@ -37,7 +37,7 @@ return xxx_messageInfo_Dropped.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -84,7 +84,7 @@ return xxx_messageInfo_DroppedWithoutGetters.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -124,7 +124,7 @@ return xxx_messageInfo_Kept.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -368,7 +368,7 @@ func (m *Dropped) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -376,28 +376,34 @@ } func (m *Dropped) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Dropped) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintTypedeclall(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } if m.Age != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintTypedeclall(dAtA, i, uint64(m.Age)) + i-- + dAtA[i] = 0x10 } - return i, nil + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintTypedeclall(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func (m *DroppedWithoutGetters) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -405,27 +411,32 @@ } func (m *DroppedWithoutGetters) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DroppedWithoutGetters) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Height != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintTypedeclall(dAtA, i, uint64(m.Height)) - } if m.Width != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintTypedeclall(dAtA, i, uint64(m.Width)) + i-- + dAtA[i] = 0x10 } - return i, nil + if m.Height != 0 { + i = encodeVarintTypedeclall(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil } func (m *Kept) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -433,32 +444,40 @@ } func (m *Kept) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Kept) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintTypedeclall(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } if m.Age != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintTypedeclall(dAtA, i, uint64(m.Age)) + i-- + dAtA[i] = 0x10 } - return i, nil + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintTypedeclall(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func encodeVarintTypedeclall(dAtA []byte, offset int, v uint64) int { + offset -= sovTypedeclall(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedDropped(r randyTypedeclall, easy bool) *Dropped { this := &Dropped{} @@ -926,6 +945,7 @@ func skipTypedeclall(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -957,10 +977,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -981,55 +999,30 @@ return 0, ErrInvalidLengthTypedeclall } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthTypedeclall - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTypedeclall - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipTypedeclall(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthTypedeclall - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTypedeclall + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthTypedeclall + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthTypedeclall = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTypedeclall = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthTypedeclall = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTypedeclall = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTypedeclall = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/both/types.pb.go golang-gogoprotobuf-1.3.1/test/types/combos/both/types.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/both/types.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/types/combos/both/types.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -26,23 +26,25 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type KnownTypes struct { - Dur *types.Duration `protobuf:"bytes,1,opt,name=dur,proto3" json:"dur,omitempty"` - Ts *types.Timestamp `protobuf:"bytes,2,opt,name=ts,proto3" json:"ts,omitempty"` - Dbl *types.DoubleValue `protobuf:"bytes,3,opt,name=dbl,proto3" json:"dbl,omitempty"` - Flt *types.FloatValue `protobuf:"bytes,4,opt,name=flt,proto3" json:"flt,omitempty"` - I64 *types.Int64Value `protobuf:"bytes,5,opt,name=i64,proto3" json:"i64,omitempty"` - U64 *types.UInt64Value `protobuf:"bytes,6,opt,name=u64,proto3" json:"u64,omitempty"` - I32 *types.Int32Value `protobuf:"bytes,7,opt,name=i32,proto3" json:"i32,omitempty"` - U32 *types.UInt32Value `protobuf:"bytes,8,opt,name=u32,proto3" json:"u32,omitempty"` - Bool *types.BoolValue `protobuf:"bytes,9,opt,name=bool,proto3" json:"bool,omitempty"` - Str *types.StringValue `protobuf:"bytes,10,opt,name=str,proto3" json:"str,omitempty"` - Bytes *types.BytesValue `protobuf:"bytes,11,opt,name=bytes,proto3" json:"bytes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Dur *types.Duration `protobuf:"bytes,1,opt,name=dur,proto3" json:"dur,omitempty"` + Ts *types.Timestamp `protobuf:"bytes,2,opt,name=ts,proto3" json:"ts,omitempty"` + Dbl *types.DoubleValue `protobuf:"bytes,3,opt,name=dbl,proto3" json:"dbl,omitempty"` + Flt *types.FloatValue `protobuf:"bytes,4,opt,name=flt,proto3" json:"flt,omitempty"` + I64 *types.Int64Value `protobuf:"bytes,5,opt,name=i64,proto3" json:"i64,omitempty"` + U64 *types.UInt64Value `protobuf:"bytes,6,opt,name=u64,proto3" json:"u64,omitempty"` + I32 *types.Int32Value `protobuf:"bytes,7,opt,name=i32,proto3" json:"i32,omitempty"` + U32 *types.UInt32Value `protobuf:"bytes,8,opt,name=u32,proto3" json:"u32,omitempty"` + Bool *types.BoolValue `protobuf:"bytes,9,opt,name=bool,proto3" json:"bool,omitempty"` + Str *types.StringValue `protobuf:"bytes,10,opt,name=str,proto3" json:"str,omitempty"` + Bytes *types.BytesValue `protobuf:"bytes,11,opt,name=bytes,proto3" json:"bytes,omitempty"` + // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed + St *types.Struct `protobuf:"bytes,12,opt,name=st,proto3" json:"st,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *KnownTypes) Reset() { *m = KnownTypes{} } @@ -59,7 +61,7 @@ return xxx_messageInfo_KnownTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -155,6 +157,13 @@ return nil } +func (m *KnownTypes) GetSt() *types.Struct { + if m != nil { + return m.St + } + return nil +} + type ProtoTypes struct { NullableTimestamp *types.Timestamp `protobuf:"bytes,1,opt,name=nullableTimestamp,proto3" json:"nullableTimestamp,omitempty"` NullableDuration *types.Duration `protobuf:"bytes,2,opt,name=nullableDuration,proto3" json:"nullableDuration,omitempty"` @@ -197,7 +206,7 @@ return xxx_messageInfo_ProtoTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -412,7 +421,7 @@ return xxx_messageInfo_StdTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -627,7 +636,7 @@ return xxx_messageInfo_RepProtoTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -842,7 +851,7 @@ return xxx_messageInfo_RepStdTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1057,7 +1066,7 @@ return xxx_messageInfo_MapProtoTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1272,7 +1281,7 @@ return xxx_messageInfo_MapStdTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1478,7 +1487,7 @@ return xxx_messageInfo_OneofProtoTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1506,37 +1515,37 @@ } type OneofProtoTypes_Timestamp struct { - Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof"` + Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"` } type OneofProtoTypes_Duration struct { - Duration *types.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof"` + Duration *types.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof" json:"duration,omitempty"` } type OneofProtoTypes_RepDouble struct { - RepDouble *types.DoubleValue `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof"` + RepDouble *types.DoubleValue `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof" json:"repDouble,omitempty"` } type OneofProtoTypes_RepFloat struct { - RepFloat *types.FloatValue `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof"` + RepFloat *types.FloatValue `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof" json:"repFloat,omitempty"` } type OneofProtoTypes_RepInt64 struct { - RepInt64 *types.Int64Value `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof"` + RepInt64 *types.Int64Value `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof" json:"repInt64,omitempty"` } type OneofProtoTypes_RepUInt64 struct { - RepUInt64 *types.UInt64Value `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof"` + RepUInt64 *types.UInt64Value `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof" json:"repUInt64,omitempty"` } type OneofProtoTypes_RepInt32 struct { - RepInt32 *types.Int32Value `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof"` + RepInt32 *types.Int32Value `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof" json:"repInt32,omitempty"` } type OneofProtoTypes_RepUInt32 struct { - RepUInt32 *types.UInt32Value `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof"` + RepUInt32 *types.UInt32Value `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof" json:"repUInt32,omitempty"` } type OneofProtoTypes_RepBool struct { - RepBool *types.BoolValue `protobuf:"bytes,9,opt,name=repBool,proto3,oneof"` + RepBool *types.BoolValue `protobuf:"bytes,9,opt,name=repBool,proto3,oneof" json:"repBool,omitempty"` } type OneofProtoTypes_RepString struct { - RepString *types.StringValue `protobuf:"bytes,10,opt,name=repString,proto3,oneof"` + RepString *types.StringValue `protobuf:"bytes,10,opt,name=repString,proto3,oneof" json:"repString,omitempty"` } type OneofProtoTypes_RepBytes struct { - RepBytes *types.BytesValue `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof"` + RepBytes *types.BytesValue `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof" json:"repBytes,omitempty"` } func (*OneofProtoTypes_Timestamp) isOneofProtoTypes_OneOfProtoTimes() {} @@ -1635,9 +1644,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*OneofProtoTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _OneofProtoTypes_OneofMarshaler, _OneofProtoTypes_OneofUnmarshaler, _OneofProtoTypes_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*OneofProtoTypes) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*OneofProtoTypes_Timestamp)(nil), (*OneofProtoTypes_Duration)(nil), (*OneofProtoTypes_RepDouble)(nil), @@ -1652,234 +1661,6 @@ } } -func _OneofProtoTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*OneofProtoTypes) - // OneOfProtoTimes - switch x := m.OneOfProtoTimes.(type) { - case *OneofProtoTypes_Timestamp: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Timestamp); err != nil { - return err - } - case *OneofProtoTypes_Duration: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Duration); err != nil { - return err - } - case *OneofProtoTypes_RepDouble: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepDouble); err != nil { - return err - } - case *OneofProtoTypes_RepFloat: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepFloat); err != nil { - return err - } - case *OneofProtoTypes_RepInt64: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepInt64); err != nil { - return err - } - case *OneofProtoTypes_RepUInt64: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepUInt64); err != nil { - return err - } - case *OneofProtoTypes_RepInt32: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepInt32); err != nil { - return err - } - case *OneofProtoTypes_RepUInt32: - _ = b.EncodeVarint(8<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepUInt32); err != nil { - return err - } - case *OneofProtoTypes_RepBool: - _ = b.EncodeVarint(9<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepBool); err != nil { - return err - } - case *OneofProtoTypes_RepString: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepString); err != nil { - return err - } - case *OneofProtoTypes_RepBytes: - _ = b.EncodeVarint(11<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepBytes); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("OneofProtoTypes.OneOfProtoTimes has unexpected type %T", x) - } - return nil -} - -func _OneofProtoTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*OneofProtoTypes) - switch tag { - case 1: // OneOfProtoTimes.timestamp - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Timestamp) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_Timestamp{msg} - return true, err - case 2: // OneOfProtoTimes.duration - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Duration) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_Duration{msg} - return true, err - case 3: // OneOfProtoTimes.repDouble - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.DoubleValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepDouble{msg} - return true, err - case 4: // OneOfProtoTimes.repFloat - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.FloatValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepFloat{msg} - return true, err - case 5: // OneOfProtoTimes.repInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Int64Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepInt64{msg} - return true, err - case 6: // OneOfProtoTimes.repUInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.UInt64Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepUInt64{msg} - return true, err - case 7: // OneOfProtoTimes.repInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Int32Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepInt32{msg} - return true, err - case 8: // OneOfProtoTimes.repUInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.UInt32Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepUInt32{msg} - return true, err - case 9: // OneOfProtoTimes.repBool - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.BoolValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepBool{msg} - return true, err - case 10: // OneOfProtoTimes.repString - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.StringValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepString{msg} - return true, err - case 11: // OneOfProtoTimes.repBytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.BytesValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepBytes{msg} - return true, err - default: - return false, nil - } -} - -func _OneofProtoTypes_OneofSizer(msg proto.Message) (n int) { - m := msg.(*OneofProtoTypes) - // OneOfProtoTimes - switch x := m.OneOfProtoTimes.(type) { - case *OneofProtoTypes_Timestamp: - s := proto.Size(x.Timestamp) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_Duration: - s := proto.Size(x.Duration) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepDouble: - s := proto.Size(x.RepDouble) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepFloat: - s := proto.Size(x.RepFloat) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepInt64: - s := proto.Size(x.RepInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepUInt64: - s := proto.Size(x.RepUInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepInt32: - s := proto.Size(x.RepInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepUInt32: - s := proto.Size(x.RepUInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepBool: - s := proto.Size(x.RepBool) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepString: - s := proto.Size(x.RepString) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepBytes: - s := proto.Size(x.RepBytes) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type OneofStdTypes struct { // Types that are valid to be assigned to OneOfStdTimes: // *OneofStdTypes_Timestamp @@ -1913,7 +1694,7 @@ return xxx_messageInfo_OneofStdTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1941,37 +1722,37 @@ } type OneofStdTypes_Timestamp struct { - Timestamp *time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof,stdtime"` + Timestamp *time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof,stdtime" json:"timestamp,omitempty"` } type OneofStdTypes_Duration struct { - Duration *time.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof,stdduration"` + Duration *time.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof,stdduration" json:"duration,omitempty"` } type OneofStdTypes_RepDouble struct { - RepDouble *float64 `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof,wktptr"` + RepDouble *float64 `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof,wktptr" json:"repDouble,omitempty"` } type OneofStdTypes_RepFloat struct { - RepFloat *float32 `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof,wktptr"` + RepFloat *float32 `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof,wktptr" json:"repFloat,omitempty"` } type OneofStdTypes_RepInt64 struct { - RepInt64 *int64 `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof,wktptr"` + RepInt64 *int64 `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof,wktptr" json:"repInt64,omitempty"` } type OneofStdTypes_RepUInt64 struct { - RepUInt64 *uint64 `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof,wktptr"` + RepUInt64 *uint64 `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof,wktptr" json:"repUInt64,omitempty"` } type OneofStdTypes_RepInt32 struct { - RepInt32 *int32 `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof,wktptr"` + RepInt32 *int32 `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof,wktptr" json:"repInt32,omitempty"` } type OneofStdTypes_RepUInt32 struct { - RepUInt32 *uint32 `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof,wktptr"` + RepUInt32 *uint32 `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof,wktptr" json:"repUInt32,omitempty"` } type OneofStdTypes_RepBool struct { - RepBool *bool `protobuf:"bytes,9,opt,name=repBool,proto3,oneof,wktptr"` + RepBool *bool `protobuf:"bytes,9,opt,name=repBool,proto3,oneof,wktptr" json:"repBool,omitempty"` } type OneofStdTypes_RepString struct { - RepString *string `protobuf:"bytes,10,opt,name=repString,proto3,oneof,wktptr"` + RepString *string `protobuf:"bytes,10,opt,name=repString,proto3,oneof,wktptr" json:"repString,omitempty"` } type OneofStdTypes_RepBytes struct { - RepBytes *[]byte `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof,wktptr"` + RepBytes *[]byte `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof,wktptr" json:"repBytes,omitempty"` } func (*OneofStdTypes_Timestamp) isOneofStdTypes_OneOfStdTimes() {} @@ -2070,9 +1851,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*OneofStdTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _OneofStdTypes_OneofMarshaler, _OneofStdTypes_OneofUnmarshaler, _OneofStdTypes_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*OneofStdTypes) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*OneofStdTypes_Timestamp)(nil), (*OneofStdTypes_Duration)(nil), (*OneofStdTypes_RepDouble)(nil), @@ -2087,344 +1868,6 @@ } } -func _OneofStdTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*OneofStdTypes) - // OneOfStdTimes - switch x := m.OneOfStdTimes.(type) { - case *OneofStdTypes_Timestamp: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdTimeMarshal(*x.Timestamp) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_Duration: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdDurationMarshal(*x.Duration) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepDouble: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdDoubleMarshal(*x.RepDouble) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepFloat: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdFloatMarshal(*x.RepFloat) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepInt64: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdInt64Marshal(*x.RepInt64) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepUInt64: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdUInt64Marshal(*x.RepUInt64) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepInt32: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdInt32Marshal(*x.RepInt32) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepUInt32: - _ = b.EncodeVarint(8<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdUInt32Marshal(*x.RepUInt32) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepBool: - _ = b.EncodeVarint(9<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdBoolMarshal(*x.RepBool) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepString: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdStringMarshal(*x.RepString) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepBytes: - _ = b.EncodeVarint(11<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdBytesMarshal(*x.RepBytes) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("OneofStdTypes.OneOfStdTimes has unexpected type %T", x) - } - return nil -} - -func _OneofStdTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*OneofStdTypes) - switch tag { - case 1: // OneOfStdTimes.timestamp - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(time.Time) - if err2 := github_com_gogo_protobuf_types.StdTimeUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_Timestamp{c} - return true, err - case 2: // OneOfStdTimes.duration - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(time.Duration) - if err2 := github_com_gogo_protobuf_types.StdDurationUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_Duration{c} - return true, err - case 3: // OneOfStdTimes.repDouble - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(float64) - if err2 := github_com_gogo_protobuf_types.StdDoubleUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepDouble{c} - return true, err - case 4: // OneOfStdTimes.repFloat - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(float32) - if err2 := github_com_gogo_protobuf_types.StdFloatUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepFloat{c} - return true, err - case 5: // OneOfStdTimes.repInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(int64) - if err2 := github_com_gogo_protobuf_types.StdInt64Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepInt64{c} - return true, err - case 6: // OneOfStdTimes.repUInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(uint64) - if err2 := github_com_gogo_protobuf_types.StdUInt64Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepUInt64{c} - return true, err - case 7: // OneOfStdTimes.repInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(int32) - if err2 := github_com_gogo_protobuf_types.StdInt32Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepInt32{c} - return true, err - case 8: // OneOfStdTimes.repUInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(uint32) - if err2 := github_com_gogo_protobuf_types.StdUInt32Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepUInt32{c} - return true, err - case 9: // OneOfStdTimes.repBool - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(bool) - if err2 := github_com_gogo_protobuf_types.StdBoolUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepBool{c} - return true, err - case 10: // OneOfStdTimes.repString - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(string) - if err2 := github_com_gogo_protobuf_types.StdStringUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepString{c} - return true, err - case 11: // OneOfStdTimes.repBytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new([]byte) - if err2 := github_com_gogo_protobuf_types.StdBytesUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepBytes{c} - return true, err - default: - return false, nil - } -} - -func _OneofStdTypes_OneofSizer(msg proto.Message) (n int) { - m := msg.(*OneofStdTypes) - // OneOfStdTimes - switch x := m.OneOfStdTimes.(type) { - case *OneofStdTypes_Timestamp: - s := github_com_gogo_protobuf_types.SizeOfStdTime(*x.Timestamp) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_Duration: - s := github_com_gogo_protobuf_types.SizeOfStdDuration(*x.Duration) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepDouble: - s := github_com_gogo_protobuf_types.SizeOfStdDouble(*x.RepDouble) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepFloat: - s := github_com_gogo_protobuf_types.SizeOfStdFloat(*x.RepFloat) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepInt64: - s := github_com_gogo_protobuf_types.SizeOfStdInt64(*x.RepInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepUInt64: - s := github_com_gogo_protobuf_types.SizeOfStdUInt64(*x.RepUInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepInt32: - s := github_com_gogo_protobuf_types.SizeOfStdInt32(*x.RepInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepUInt32: - s := github_com_gogo_protobuf_types.SizeOfStdUInt32(*x.RepUInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepBool: - s := github_com_gogo_protobuf_types.SizeOfStdBool(*x.RepBool) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepString: - s := github_com_gogo_protobuf_types.SizeOfStdString(*x.RepString) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepBytes: - s := github_com_gogo_protobuf_types.SizeOfStdBytes(*x.RepBytes) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*KnownTypes)(nil), "types.KnownTypes") proto.RegisterType((*ProtoTypes)(nil), "types.ProtoTypes") @@ -2484,151 +1927,153 @@ func init() { proto.RegisterFile("combos/both/types.proto", fileDescriptor_54557d2dac6675e4) } var fileDescriptor_54557d2dac6675e4 = []byte{ - // 2294 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcf, 0x73, 0x1b, 0x49, - 0x19, 0x8d, 0x22, 0x39, 0xb1, 0xdb, 0x76, 0x62, 0x4f, 0x36, 0xcb, 0x60, 0x28, 0x25, 0x78, 0x37, - 0xd9, 0xb0, 0x5b, 0x2b, 0xb3, 0x33, 0x2e, 0x03, 0x81, 0x5d, 0xef, 0x4e, 0x25, 0x91, 0xa5, 0xb5, - 0x12, 0x45, 0xb6, 0x52, 0xb0, 0xb0, 0x80, 0xb4, 0x56, 0xbc, 0x2e, 0x14, 0x8d, 0x4a, 0x1a, 0xb1, - 0xe5, 0x1b, 0x7f, 0x00, 0x07, 0x6e, 0x50, 0xc5, 0x05, 0x6e, 0x5c, 0x39, 0x50, 0xc5, 0x91, 0xe3, - 0x1e, 0xf9, 0x0b, 0x60, 0xd7, 0x5c, 0xb8, 0x02, 0x97, 0x5c, 0xa8, 0xa2, 0xa6, 0xbb, 0x67, 0xa6, - 0x7f, 0x7c, 0xdd, 0x3d, 0x3d, 0x65, 0xdf, 0x74, 0xb3, 0xa5, 0xaf, 0xdf, 0xbc, 0xf9, 0xe6, 0x8d, - 0x5f, 0xbf, 0x6f, 0x3c, 0xe8, 0x2b, 0x9f, 0x84, 0x2f, 0xfa, 0xe1, 0x74, 0xab, 0x1f, 0x46, 0x9f, - 0x6e, 0x45, 0xa7, 0xe3, 0xc1, 0xb4, 0x36, 0x9e, 0x84, 0x51, 0xe8, 0x2c, 0xe0, 0x5f, 0x36, 0xde, - 0x3e, 0x3e, 0x89, 0x3e, 0x9d, 0xf5, 0x6b, 0x9f, 0x84, 0x2f, 0xb6, 0x8e, 0xc3, 0xe3, 0x70, 0x0b, - 0x7f, 0xdb, 0x9f, 0x3d, 0xc7, 0xbf, 0xe1, 0x5f, 0xf0, 0x4f, 0x64, 0xd5, 0x46, 0xf5, 0x38, 0x0c, - 0x8f, 0x87, 0x83, 0xac, 0xea, 0x68, 0x36, 0xe9, 0x45, 0x27, 0xe1, 0x88, 0x7e, 0x7f, 0x4b, 0xfc, - 0x3e, 0x3a, 0x79, 0x31, 0x98, 0x46, 0xbd, 0x17, 0x63, 0x15, 0xc0, 0x67, 0x93, 0xde, 0x78, 0x3c, - 0x98, 0x50, 0x5a, 0x9b, 0xbf, 0xab, 0x20, 0xf4, 0xe1, 0x28, 0xfc, 0x6c, 0x74, 0x18, 0xd3, 0x73, - 0xde, 0x42, 0xe5, 0xa3, 0xd9, 0xc4, 0x2d, 0xdd, 0x2e, 0xdd, 0x5b, 0xf6, 0xbe, 0x5a, 0x23, 0x8b, - 0x6b, 0xc9, 0xe2, 0xda, 0x03, 0x7a, 0xf4, 0x4e, 0x5c, 0xe5, 0xbc, 0x89, 0x2e, 0x47, 0x53, 0xf7, - 0x32, 0xae, 0xdd, 0x90, 0x6a, 0x0f, 0x13, 0x26, 0x9d, 0xcb, 0xd1, 0xd4, 0xa9, 0xa1, 0xf2, 0x51, - 0x7f, 0xe8, 0x96, 0x71, 0xf1, 0xd7, 0x65, 0xe0, 0x70, 0xd6, 0x1f, 0x0e, 0x9e, 0xf5, 0x86, 0xb3, - 0x41, 0x27, 0x2e, 0x74, 0xde, 0x46, 0xe5, 0xe7, 0xc3, 0xc8, 0xad, 0xe0, 0xfa, 0xaf, 0x49, 0xf5, - 0x8f, 0x86, 0x61, 0x2f, 0xa2, 0xe5, 0xcf, 0x87, 0x51, 0x5c, 0x7e, 0xb2, 0xb3, 0xed, 0x2e, 0x28, - 0xca, 0x1b, 0xa3, 0x68, 0x67, 0x9b, 0x96, 0x9f, 0xec, 0x6c, 0xc7, 0x6c, 0x66, 0x3b, 0xdb, 0xee, - 0x15, 0x05, 0x9b, 0x2e, 0x5b, 0x3f, 0xdb, 0xd9, 0xc6, 0xf0, 0xbe, 0xe7, 0x5e, 0x55, 0xc3, 0xfb, - 0x5e, 0x02, 0xef, 0x7b, 0x18, 0xde, 0xf7, 0xdc, 0x45, 0x0d, 0x7c, 0x5a, 0x3f, 0xc3, 0xf5, 0x95, - 0x7e, 0x18, 0x0e, 0xdd, 0x25, 0x45, 0x2b, 0x83, 0x30, 0x1c, 0x92, 0x72, 0x5c, 0x17, 0xe3, 0x4f, - 0xa3, 0x89, 0x8b, 0x14, 0xf8, 0x07, 0xd1, 0xe4, 0x64, 0x74, 0x4c, 0xf1, 0xa7, 0xd1, 0xc4, 0x79, - 0x07, 0x2d, 0xf4, 0x4f, 0xa3, 0xc1, 0xd4, 0x5d, 0x56, 0x9c, 0x40, 0x10, 0x7f, 0x4b, 0x16, 0x90, - 0xca, 0xfb, 0x95, 0x7f, 0xfd, 0xe1, 0x56, 0x69, 0xf3, 0x57, 0x2b, 0x08, 0xb5, 0xe3, 0x22, 0xa2, - 0x8e, 0x3d, 0xb4, 0x3e, 0x9a, 0x0d, 0x87, 0xbd, 0xfe, 0x70, 0x90, 0x5e, 0x5d, 0xaa, 0x15, 0xdd, - 0xf5, 0x97, 0x17, 0x39, 0x0f, 0xd1, 0x5a, 0xf2, 0x61, 0xa2, 0x29, 0x2a, 0x24, 0x8d, 0xe8, 0xa4, - 0x25, 0xce, 0x03, 0x74, 0x2d, 0xfd, 0x0c, 0x2b, 0x28, 0x97, 0xc0, 0x84, 0x35, 0xce, 0x07, 0x68, - 0x35, 0xf9, 0x04, 0xeb, 0x2a, 0x8f, 0xea, 0xf8, 0x15, 0x2c, 0x04, 0xd6, 0x4e, 0x1e, 0x25, 0xf2, - 0x2b, 0xd8, 0x73, 0x21, 0xfa, 0xcb, 0x25, 0x4f, 0x61, 0x8d, 0x40, 0x24, 0x9f, 0x66, 0xf9, 0x15, - 0x22, 0x91, 0x9c, 0x42, 0x16, 0xd6, 0x38, 0xef, 0xa1, 0x95, 0xe4, 0x93, 0x20, 0x9f, 0xb6, 0xb9, - 0x7a, 0x96, 0x05, 0xd1, 0x73, 0x2e, 0xb9, 0x0b, 0x6b, 0xd8, 0x76, 0x04, 0x79, 0xef, 0x00, 0x7e, - 0x85, 0xf3, 0x1e, 0x5a, 0x4a, 0xff, 0xa8, 0xba, 0x2b, 0x26, 0xb1, 0x07, 0x95, 0xcf, 0xff, 0x7e, - 0xeb, 0x52, 0x27, 0x5b, 0xe2, 0x7c, 0x0f, 0x2d, 0x26, 0x7f, 0xb4, 0xdd, 0x55, 0x83, 0xc4, 0xe9, - 0xea, 0x74, 0x81, 0xb3, 0x87, 0x56, 0x47, 0xe1, 0x28, 0x26, 0x44, 0xf5, 0x7d, 0xcd, 0xac, 0x6f, - 0x0a, 0xc2, 0x2f, 0x74, 0x1e, 0xa2, 0x15, 0xfa, 0x01, 0xd1, 0xf8, 0x75, 0xa3, 0xc6, 0x29, 0x0e, - 0xb7, 0x8c, 0x81, 0x21, 0x1a, 0x5d, 0x33, 0xea, 0x5c, 0x80, 0x21, 0x32, 0xcd, 0xce, 0x8b, 0x6a, - 0x7d, 0xdd, 0xac, 0x75, 0xe1, 0xbc, 0xa8, 0xe0, 0x39, 0x42, 0xbe, 0xe7, 0x3a, 0x46, 0xbd, 0xcb, - 0x84, 0x7c, 0x4f, 0x20, 0xe4, 0x7b, 0xee, 0x0d, 0xb3, 0xe6, 0x01, 0x42, 0xbe, 0xe7, 0x04, 0x68, - 0x99, 0x7e, 0x80, 0x75, 0xff, 0x8a, 0x49, 0xf7, 0x14, 0x85, 0x5d, 0xc4, 0xb0, 0xa1, 0xda, 0xbf, - 0x69, 0xd6, 0xbe, 0xc0, 0x86, 0xde, 0x00, 0x59, 0x7b, 0x88, 0xfe, 0x5f, 0x35, 0xea, 0x5f, 0x68, - 0x4f, 0xc0, 0xd8, 0xc1, 0x7f, 0x56, 0xd0, 0xe2, 0x41, 0x74, 0x44, 0xcc, 0xe0, 0x71, 0x21, 0x33, - 0x08, 0x2a, 0xbf, 0xfe, 0xc7, 0xad, 0x12, 0x64, 0x09, 0x1f, 0x16, 0xb0, 0x84, 0xa0, 0xf2, 0xdb, - 0x18, 0x4d, 0x36, 0x86, 0x66, 0x11, 0x63, 0x08, 0x2a, 0xbf, 0x8f, 0xd1, 0x44, 0x7b, 0xa8, 0xdb, - 0xdb, 0x03, 0x45, 0x12, 0x4c, 0xa2, 0x6e, 0x6f, 0x12, 0x22, 0x10, 0xd1, 0x7c, 0xb3, 0x88, 0x55, - 0x88, 0x67, 0x47, 0xef, 0x9f, 0xba, 0xbd, 0x61, 0x00, 0xa4, 0x7c, 0x4f, 0x24, 0x95, 0xcf, 0x36, - 0x20, 0x52, 0xd8, 0x82, 0x2c, 0xcd, 0x83, 0xe2, 0xf0, 0x16, 0xd2, 0x2c, 0x62, 0x21, 0x22, 0x23, - 0x7a, 0x1f, 0xd5, 0xed, 0x8d, 0x44, 0x6c, 0x13, 0xb1, 0x93, 0xc0, 0xce, 0x4e, 0x16, 0xe3, 0x9b, - 0x11, 0xdf, 0x32, 0x8c, 0xa5, 0xec, 0xda, 0x58, 0x0a, 0x46, 0xc0, 0xb7, 0x49, 0x66, 0x2b, 0xfb, - 0x45, 0x6c, 0x05, 0x03, 0xd1, 0x53, 0xe2, 0xac, 0xa5, 0x61, 0x6f, 0x2d, 0x19, 0x16, 0x6f, 0x2f, - 0x0d, 0x7b, 0x7b, 0x91, 0xa1, 0x88, 0xb0, 0xf7, 0x8b, 0x58, 0x8c, 0x7c, 0x8e, 0xf4, 0x36, 0x69, - 0xd8, 0xdb, 0x0c, 0x48, 0xcc, 0xf7, 0x04, 0x62, 0x39, 0xad, 0x06, 0x26, 0xe6, 0x7b, 0xce, 0x23, - 0x5b, 0xbb, 0xc9, 0x90, 0x38, 0xcb, 0xd9, 0x2f, 0x62, 0x39, 0x32, 0x2b, 0x7a, 0xbb, 0x34, 0xec, - 0x6d, 0x47, 0x6e, 0x17, 0xfe, 0x72, 0xf3, 0x37, 0x2b, 0x68, 0xb5, 0x33, 0x18, 0x33, 0x31, 0xa4, - 0x89, 0x1c, 0xc9, 0x3e, 0xa6, 0x6e, 0xe9, 0x76, 0xd9, 0x90, 0x43, 0x80, 0x55, 0x4e, 0x3d, 0x73, - 0xb1, 0xe4, 0x8e, 0x89, 0x23, 0x6d, 0x59, 0x9f, 0x44, 0xe4, 0x35, 0xce, 0xfb, 0x08, 0x45, 0x19, - 0x99, 0xb2, 0x89, 0x0c, 0x75, 0x59, 0x66, 0x8d, 0xf3, 0x2e, 0x5a, 0x3a, 0x4a, 0x29, 0x54, 0x0c, - 0x14, 0x92, 0x7d, 0x66, 0xba, 0x02, 0xc8, 0x42, 0x0b, 0x18, 0xc3, 0x2e, 0x0b, 0x49, 0x1b, 0xce, - 0x2b, 0x66, 0x10, 0x78, 0xc3, 0x29, 0xa5, 0xaa, 0xab, 0x18, 0xc9, 0x26, 0x55, 0x89, 0x7b, 0xd6, - 0x45, 0x23, 0x02, 0xb8, 0x67, 0x95, 0xc2, 0xd9, 0x92, 0x02, 0x47, 0x1d, 0xce, 0xc4, 0x6d, 0x2f, - 0x32, 0x22, 0x80, 0xdb, 0x5e, 0x39, 0xe3, 0x2d, 0x2b, 0xda, 0xab, 0xcb, 0x78, 0xd2, 0xe6, 0x79, - 0xc5, 0x0c, 0x02, 0x6f, 0x9e, 0xa5, 0xb4, 0xb8, 0xaa, 0x3e, 0x2f, 0x45, 0x5a, 0x14, 0xf7, 0xdf, - 0xd7, 0x8c, 0x08, 0xe0, 0xfe, 0x5b, 0x0e, 0x9d, 0xd7, 0x35, 0x27, 0xa5, 0x0a, 0x9d, 0xd2, 0x2e, - 0x7e, 0xcd, 0x0c, 0x02, 0xef, 0xe2, 0xc5, 0xf8, 0xba, 0xae, 0xb8, 0xa1, 0x55, 0xf1, 0x55, 0x48, - 0x01, 0x8e, 0x69, 0x39, 0x94, 0x02, 0xe4, 0x08, 0x7c, 0x43, 0x71, 0x3a, 0xba, 0x08, 0x2c, 0x65, - 0x89, 0x57, 0xcc, 0x20, 0x70, 0x96, 0x90, 0xc2, 0xf4, 0x4d, 0xc5, 0xb5, 0x56, 0x87, 0x69, 0x39, - 0x8e, 0x94, 0x8b, 0xc7, 0x91, 0xff, 0xad, 0xa0, 0xe5, 0xce, 0x60, 0x9c, 0x26, 0x92, 0x76, 0x31, - 0x5f, 0xa0, 0x91, 0x04, 0x72, 0x87, 0x56, 0x11, 0x77, 0xa0, 0xa1, 0x04, 0xf0, 0x88, 0x07, 0x96, - 0x1e, 0x91, 0x6d, 0xfe, 0x58, 0x9f, 0xf8, 0xc0, 0xca, 0x27, 0xb2, 0xed, 0x1f, 0xe3, 0x15, 0xcd, - 0x22, 0x5e, 0xa1, 0x88, 0x47, 0xfb, 0x45, 0x1c, 0x43, 0xb9, 0x97, 0xac, 0xdb, 0xbb, 0x06, 0x1c, - 0xb6, 0x1a, 0xf6, 0xde, 0xa1, 0xda, 0x94, 0xd6, 0xed, 0xfd, 0x03, 0xce, 0x6d, 0x0d, 0x7b, 0x17, - 0x51, 0xed, 0x6e, 0x9b, 0x45, 0x9c, 0x44, 0x11, 0x01, 0xf7, 0x8b, 0xf8, 0x89, 0x72, 0xa7, 0x5c, - 0xb7, 0xf7, 0x14, 0x38, 0x50, 0x36, 0xec, 0x9d, 0x45, 0xb5, 0xe5, 0x6e, 0x16, 0x71, 0x17, 0x45, - 0x36, 0xdd, 0x2f, 0xe2, 0x31, 0xca, 0xed, 0xfb, 0x03, 0x5b, 0x9f, 0x01, 0x93, 0xee, 0x23, 0x5b, - 0xb7, 0x51, 0x84, 0x80, 0x66, 0x11, 0xc7, 0x51, 0x24, 0xe6, 0xfd, 0x22, 0xbe, 0xa3, 0x0c, 0x14, - 0x75, 0x7b, 0xef, 0x81, 0xf3, 0x77, 0xc3, 0xde, 0x81, 0x54, 0xc9, 0xe4, 0x4f, 0x55, 0xb4, 0xda, - 0xea, 0xb1, 0xc9, 0xe4, 0x87, 0xf0, 0x4c, 0x2c, 0x3e, 0xc2, 0x5b, 0x35, 0xf2, 0x34, 0x90, 0x5b, - 0x50, 0x7b, 0x2c, 0x56, 0x3f, 0x1c, 0x45, 0x93, 0x53, 0x68, 0x3c, 0x56, 0x67, 0xe7, 0x06, 0xc4, - 0x82, 0x5e, 0x03, 0x21, 0x79, 0x28, 0x79, 0x1e, 0xfd, 0x0c, 0x98, 0xb3, 0x11, 0x2b, 0x7a, 0x53, - 0x4b, 0x31, 0x29, 0x26, 0x0c, 0xa1, 0x67, 0x31, 0xd9, 0x50, 0x82, 0xb8, 0xd2, 0x26, 0x88, 0xc7, - 0xe1, 0x48, 0x03, 0xef, 0xb6, 0xc2, 0x99, 0xee, 0xe9, 0xb9, 0xe1, 0x52, 0xc2, 0x4c, 0xf4, 0xa7, - 0x03, 0xd8, 0x9f, 0xde, 0x80, 0x01, 0xd9, 0x4a, 0x96, 0xa1, 0x60, 0x53, 0x2d, 0xd8, 0xa6, 0xde, - 0xd0, 0xb2, 0xc4, 0x95, 0x84, 0xa4, 0x60, 0x56, 0x6d, 0xd0, 0xac, 0xee, 0xea, 0x28, 0x66, 0x60, - 0x60, 0xe6, 0x69, 0xc1, 0x9e, 0xa5, 0x27, 0x88, 0x2b, 0x05, 0x82, 0xe4, 0x8f, 0x7a, 0x1b, 0x74, - 0x2e, 0x2d, 0xc1, 0x0c, 0x0c, 0x8c, 0x42, 0x6d, 0x85, 0x81, 0xe9, 0x2f, 0x74, 0x97, 0xa1, 0x28, - 0xda, 0xd8, 0x01, 0x6c, 0x63, 0xda, 0x0b, 0xdd, 0x95, 0x58, 0x0a, 0x6e, 0xd6, 0x82, 0xdd, 0xcc, - 0xd8, 0x47, 0xdf, 0x93, 0xfb, 0xe8, 0x7b, 0x7c, 0x1f, 0x53, 0x4f, 0x33, 0xf5, 0x91, 0x82, 0x81, - 0xc1, 0xa9, 0xad, 0xb0, 0x36, 0x73, 0x1f, 0x13, 0x8a, 0xa2, 0xc1, 0x1d, 0xc0, 0x06, 0x67, 0xec, - 0x23, 0xcf, 0x52, 0xf0, 0xb9, 0x26, 0xe8, 0x73, 0x77, 0xb5, 0x24, 0xe3, 0x42, 0x42, 0x91, 0x77, - 0xbb, 0x16, 0xe4, 0x76, 0x77, 0x74, 0xf4, 0x52, 0x24, 0x28, 0x66, 0xb5, 0x15, 0xa6, 0xa7, 0xef, - 0x20, 0x29, 0x15, 0x3a, 0x48, 0xcd, 0xea, 0x00, 0xb6, 0x3e, 0x6d, 0x07, 0x19, 0x3c, 0x38, 0x7d, - 0xb5, 0x60, 0x07, 0xd4, 0x2b, 0x11, 0x57, 0x0a, 0x4a, 0x24, 0x3e, 0xd8, 0x06, 0x7d, 0x50, 0xab, - 0xc4, 0x0c, 0x0c, 0x0a, 0x65, 0x1b, 0x3f, 0x43, 0xaf, 0xc2, 0x76, 0xe6, 0xac, 0xa1, 0xf2, 0xcf, - 0x07, 0xa7, 0xf8, 0xe1, 0xd0, 0x42, 0x27, 0xfe, 0xd1, 0xf9, 0x16, 0x5a, 0xf8, 0x45, 0xec, 0xad, - 0x39, 0xfe, 0x7b, 0x84, 0x14, 0xde, 0xbf, 0xfc, 0x9d, 0xd2, 0xc6, 0x0f, 0xd0, 0xb5, 0x0b, 0x42, - 0xfe, 0x09, 0xba, 0x09, 0xfa, 0x1c, 0x70, 0x80, 0x2d, 0xfe, 0x00, 0x9a, 0x29, 0x21, 0x83, 0xff, - 0x0c, 0xad, 0x5e, 0x08, 0xee, 0x4f, 0xd1, 0x0d, 0xc0, 0x03, 0x01, 0x74, 0x8f, 0x47, 0xd7, 0x0f, - 0x05, 0xb9, 0xc6, 0x38, 0xb2, 0x27, 0x9e, 0x23, 0xfe, 0xc7, 0xc8, 0x91, 0xed, 0x11, 0xc0, 0x7f, - 0x87, 0xc7, 0xd7, 0x4e, 0x11, 0x19, 0xf8, 0x1f, 0xa3, 0x75, 0xc9, 0x2f, 0xcf, 0x0f, 0x9d, 0x21, - 0x9f, 0xf9, 0x48, 0x11, 0x78, 0x66, 0xd8, 0x07, 0x92, 0xbf, 0x08, 0x74, 0x46, 0x3a, 0x5d, 0x2d, - 0xbe, 0xf1, 0xd2, 0x76, 0xe1, 0x03, 0x64, 0xd2, 0xb9, 0x18, 0x7c, 0xbe, 0xfb, 0xd4, 0x7d, 0x0a, - 0xf6, 0x27, 0x19, 0x28, 0xaa, 0xba, 0x7f, 0xee, 0xe8, 0x42, 0xf7, 0xd5, 0xf8, 0xb9, 0xba, 0x03, - 0x1c, 0x80, 0xef, 0xfe, 0xf9, 0xe3, 0xff, 0x08, 0xad, 0x4b, 0x3e, 0x5d, 0xe4, 0xcf, 0x71, 0x36, - 0x40, 0x65, 0xc0, 0x3f, 0x42, 0x6b, 0xa2, 0x73, 0x9f, 0x1b, 0x36, 0xd3, 0x79, 0xc6, 0x73, 0x8b, - 0x74, 0x86, 0x9d, 0xba, 0x82, 0x9d, 0xbf, 0x18, 0x7c, 0x46, 0xf7, 0x99, 0x23, 0x17, 0x51, 0x26, - 0xfb, 0x5f, 0x7f, 0x90, 0xee, 0x2f, 0x00, 0x7d, 0xf3, 0xdf, 0x55, 0xb4, 0xdc, 0xea, 0x65, 0x33, - 0xdb, 0x8f, 0xd5, 0x89, 0xf9, 0x9b, 0xd9, 0x5e, 0x24, 0x29, 0x57, 0xe4, 0x65, 0xf5, 0x3f, 0x95, - 0x34, 0xe4, 0xd4, 0xfc, 0x0d, 0x00, 0x56, 0x80, 0x03, 0x1f, 0xba, 0x7f, 0xa4, 0xcc, 0xcd, 0xf7, - 0x34, 0x44, 0x85, 0xb4, 0xab, 0xf8, 0x77, 0x95, 0x47, 0x52, 0x76, 0xbe, 0x0d, 0x60, 0xf2, 0x58, - 0xd0, 0x73, 0xfd, 0x43, 0x45, 0x7a, 0xbe, 0xab, 0x63, 0xc8, 0x66, 0x5d, 0x70, 0xc2, 0xdb, 0x85, - 0x13, 0xf4, 0x1d, 0x08, 0x54, 0xce, 0xcf, 0xca, 0x51, 0xef, 0x53, 0x38, 0x43, 0xdf, 0xd1, 0x70, - 0x65, 0x43, 0x2f, 0x34, 0xf4, 0xed, 0x80, 0x39, 0xfa, 0x75, 0x35, 0x51, 0x06, 0x50, 0x35, 0xfd, - 0x7d, 0x0a, 0x27, 0x69, 0x1d, 0x4d, 0x36, 0x54, 0x42, 0x73, 0xe0, 0x0e, 0x98, 0xa6, 0x35, 0x34, - 0x19, 0x40, 0xd5, 0x40, 0xf8, 0x50, 0x91, 0xa7, 0x75, 0x97, 0xbe, 0x2b, 0x11, 0x15, 0x33, 0x75, - 0x17, 0xce, 0xd4, 0x9a, 0x4b, 0xdf, 0x05, 0xb9, 0x0a, 0xa9, 0xfa, 0x29, 0x9c, 0xaa, 0x0d, 0x3d, - 0x4d, 0x03, 0x26, 0x34, 0x2d, 0xee, 0x80, 0xc9, 0x5a, 0xdf, 0xd3, 0x04, 0x50, 0x35, 0x36, 0x3e, - 0x54, 0x64, 0x6b, 0x53, 0x4f, 0x79, 0xa2, 0x62, 0xbe, 0xee, 0xc2, 0xf9, 0xda, 0xd0, 0x53, 0x99, - 0xab, 0x90, 0xb0, 0x1f, 0x83, 0x09, 0xfb, 0x75, 0x0d, 0x55, 0x26, 0x15, 0x03, 0x33, 0xe5, 0x27, - 0x50, 0xca, 0x7e, 0x4d, 0x4d, 0x32, 0x43, 0x53, 0x0c, 0x97, 0x0f, 0x15, 0x39, 0x5b, 0xd7, 0x4d, - 0x2e, 0x15, 0x83, 0x63, 0xe6, 0x2e, 0x9c, 0xb5, 0x35, 0xdd, 0x64, 0x31, 0x95, 0xf3, 0xe6, 0xa7, - 0x70, 0xda, 0xd6, 0x29, 0x94, 0x8d, 0xc7, 0xd0, 0xe4, 0xb9, 0x03, 0x26, 0x6e, 0x8d, 0x42, 0x19, - 0x40, 0xc5, 0x08, 0x7a, 0x9e, 0xb9, 0xe7, 0x99, 0x7b, 0x9e, 0xb9, 0xe7, 0x99, 0x7b, 0x9e, 0xb9, - 0xe7, 0x99, 0x7b, 0x9e, 0xb9, 0xe7, 0x99, 0x1b, 0xce, 0xdc, 0x7f, 0x5e, 0x40, 0xd7, 0x9f, 0x8c, - 0x06, 0xe1, 0x73, 0xe6, 0x49, 0xf5, 0x7d, 0x36, 0x18, 0x1b, 0xdf, 0xda, 0xd8, 0xe3, 0x9e, 0x20, - 0x7f, 0x9b, 0x49, 0xab, 0x26, 0xe3, 0xdc, 0x63, 0x1f, 0xee, 0x7e, 0x1f, 0x2d, 0x4d, 0x06, 0xe3, - 0xfc, 0x2f, 0x64, 0xc4, 0x87, 0x4d, 0x17, 0x38, 0xdf, 0x45, 0x8b, 0x93, 0xc1, 0x38, 0xef, 0x2b, - 0x18, 0xf1, 0x81, 0x93, 0x72, 0xba, 0x34, 0xef, 0x4b, 0x17, 0x74, 0x29, 0x89, 0x2a, 0x84, 0x73, - 0xfe, 0xd7, 0x2c, 0x28, 0x67, 0x1a, 0x74, 0xd2, 0x03, 0xe7, 0x7a, 0xb1, 0x22, 0x3b, 0xb0, 0xef, - 0x31, 0x07, 0xce, 0xf7, 0x2a, 0x05, 0x73, 0x60, 0xdf, 0x73, 0x76, 0xd0, 0xd5, 0xc9, 0x60, 0x9c, - 0xef, 0xe5, 0x89, 0xbd, 0x4b, 0x9d, 0xa4, 0x98, 0x1e, 0x35, 0xff, 0xeb, 0x12, 0xf4, 0xa8, 0x74, - 0xd7, 0x4c, 0x4e, 0x37, 0xef, 0x0b, 0x12, 0xf4, 0x74, 0xf1, 0x07, 0xc1, 0x3a, 0xd6, 0xe8, 0x13, - 0xaa, 0xd1, 0x58, 0x6b, 0x9b, 0xff, 0x5d, 0x40, 0xab, 0x58, 0xb7, 0xe9, 0xb4, 0xe8, 0x7d, 0x2b, - 0xd5, 0x92, 0xb1, 0x10, 0xaf, 0xdd, 0x77, 0x2d, 0xb4, 0x4b, 0xc6, 0x35, 0x9c, 0x82, 0x03, 0x4b, - 0x05, 0x93, 0x24, 0xc0, 0xeb, 0x78, 0xd7, 0x4a, 0xc7, 0x29, 0x42, 0xa6, 0xe6, 0x5d, 0x2b, 0x35, - 0x73, 0x00, 0x44, 0x95, 0x81, 0xa5, 0xa6, 0xb9, 0xb3, 0xa0, 0xca, 0xde, 0xb5, 0x52, 0xb6, 0x48, - 0x02, 0xbf, 0x27, 0x67, 0xa7, 0x6f, 0x89, 0x04, 0xbe, 0x47, 0xf2, 0xab, 0x3c, 0x5d, 0x9f, 0x6a, - 0x3d, 0xb0, 0xd4, 0x3a, 0xc7, 0x80, 0x2a, 0x7e, 0xd7, 0x4a, 0xf1, 0x5c, 0x1b, 0x88, 0xee, 0xaf, - 0x63, 0x8d, 0x3f, 0xc1, 0x1a, 0x8f, 0x55, 0x1a, 0xdc, 0xfb, 0xe2, 0xcb, 0x6a, 0xe9, 0xe5, 0x97, - 0xd5, 0xd2, 0x1f, 0xcf, 0xaa, 0xa5, 0xbf, 0x9c, 0x55, 0x4b, 0x7f, 0x3d, 0xab, 0x96, 0x3e, 0x3f, - 0xab, 0x96, 0xfe, 0x76, 0x56, 0x2d, 0x7d, 0x71, 0x56, 0x2d, 0xbd, 0x3c, 0xab, 0x5e, 0xfa, 0xe5, - 0x3f, 0xab, 0x97, 0xfa, 0x57, 0xf0, 0x11, 0xfc, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0xa6, 0xb3, - 0x35, 0x4d, 0x74, 0x40, 0x00, 0x00, + // 2323 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcf, 0x73, 0x23, 0x47, + 0x19, 0x5d, 0x59, 0xd2, 0xae, 0xdd, 0x96, 0x76, 0xed, 0xd9, 0x6c, 0x32, 0x98, 0x94, 0x76, 0x71, + 0xb2, 0x3f, 0x48, 0x2a, 0x32, 0x99, 0x71, 0x19, 0x58, 0x48, 0x9c, 0xa8, 0x76, 0x57, 0x96, 0x62, + 0xed, 0xca, 0xb2, 0xb5, 0x05, 0x81, 0x00, 0x92, 0x2d, 0x3b, 0x2e, 0x64, 0x8d, 0x4a, 0x1a, 0x91, + 0xf2, 0x8d, 0x3f, 0x80, 0x03, 0x37, 0x38, 0xc2, 0x8d, 0x2b, 0x07, 0xaa, 0x38, 0x72, 0xe0, 0x90, + 0x23, 0x7f, 0x01, 0x24, 0xe6, 0xc2, 0x15, 0xb8, 0xe4, 0x42, 0x15, 0x35, 0xdd, 0x3d, 0x33, 0xfd, + 0xe3, 0xeb, 0x9e, 0xe9, 0x29, 0xfb, 0xa6, 0x9b, 0xad, 0xf9, 0xfa, 0xcd, 0x9b, 0x4f, 0x6f, 0xfc, + 0xfa, 0x7d, 0xe3, 0x41, 0xaf, 0x1d, 0x7a, 0x67, 0x7d, 0x6f, 0xba, 0xd1, 0xf7, 0xfc, 0x4f, 0x37, + 0xfc, 0xf3, 0xf1, 0x60, 0x5a, 0x1d, 0x4f, 0x3c, 0xdf, 0xb3, 0x8a, 0xf8, 0x97, 0xb5, 0x77, 0x4e, + 0x4e, 0xfd, 0x4f, 0x67, 0xfd, 0xea, 0xa1, 0x77, 0xb6, 0x71, 0xe2, 0x9d, 0x78, 0x1b, 0xf8, 0x68, + 0x7f, 0x76, 0x8c, 0x7f, 0xc3, 0xbf, 0xe0, 0x9f, 0xc8, 0xaa, 0xb5, 0xca, 0x89, 0xe7, 0x9d, 0x0c, + 0x07, 0x71, 0xd5, 0xd1, 0x6c, 0xd2, 0xf3, 0x4f, 0xbd, 0x11, 0x3d, 0xfe, 0xba, 0x78, 0x7c, 0xea, + 0x4f, 0x66, 0x87, 0x3e, 0x3d, 0x7a, 0x57, 0x3c, 0xea, 0x9f, 0x9e, 0x0d, 0xa6, 0x7e, 0xef, 0x6c, + 0xac, 0x82, 0xff, 0x6c, 0xd2, 0x1b, 0x8f, 0x07, 0x13, 0x4a, 0x7a, 0xfd, 0xaf, 0x05, 0x84, 0x3e, + 0x1a, 0x79, 0x9f, 0x8d, 0x0e, 0x02, 0xf2, 0xd6, 0xdb, 0x28, 0x7f, 0x34, 0x9b, 0xd8, 0xb9, 0x7b, + 0xb9, 0x47, 0xcb, 0xce, 0xd7, 0xaa, 0x64, 0x71, 0x35, 0x5c, 0x5c, 0x7d, 0x42, 0xb9, 0x75, 0x82, + 0x2a, 0xeb, 0x2d, 0xb4, 0xe0, 0x4f, 0xed, 0x05, 0x5c, 0xbb, 0x26, 0xd5, 0x1e, 0x84, 0x4c, 0x3a, + 0x0b, 0xfe, 0xd4, 0xaa, 0xa2, 0xfc, 0x51, 0x7f, 0x68, 0xe7, 0x71, 0xf1, 0xeb, 0x32, 0xb0, 0x37, + 0xeb, 0x0f, 0x07, 0x2f, 0x7b, 0xc3, 0xd9, 0xa0, 0x13, 0x14, 0x5a, 0xef, 0xa0, 0xfc, 0xf1, 0xd0, + 0xb7, 0x0b, 0xb8, 0xfe, 0xeb, 0x52, 0xfd, 0xb3, 0xa1, 0xd7, 0xf3, 0x69, 0xf9, 0xf1, 0xd0, 0x0f, + 0xca, 0x4f, 0xb7, 0x36, 0xed, 0xa2, 0xa2, 0xbc, 0x31, 0xf2, 0xb7, 0x36, 0x69, 0xf9, 0xe9, 0xd6, + 0x66, 0xc0, 0x66, 0xb6, 0xb5, 0x69, 0x5f, 0x57, 0xb0, 0xe9, 0xb2, 0xf5, 0xb3, 0xad, 0x4d, 0x0c, + 0xef, 0x3a, 0xf6, 0x0d, 0x35, 0xbc, 0xeb, 0x84, 0xf0, 0xae, 0x83, 0xe1, 0x5d, 0xc7, 0x5e, 0xd4, + 0xc0, 0x47, 0xf5, 0x33, 0x5c, 0x5f, 0xe8, 0x7b, 0xde, 0xd0, 0x5e, 0x52, 0xb4, 0xb2, 0xe6, 0x79, + 0x43, 0x52, 0x8e, 0xeb, 0x02, 0xfc, 0xa9, 0x3f, 0xb1, 0x91, 0x02, 0x7f, 0xdf, 0x9f, 0x9c, 0x8e, + 0x4e, 0x28, 0xfe, 0xd4, 0x9f, 0x58, 0xef, 0xa2, 0x62, 0xff, 0xdc, 0x1f, 0x4c, 0xed, 0x65, 0xc5, + 0x05, 0xd4, 0x82, 0xa3, 0x64, 0x01, 0xa9, 0xb4, 0x1e, 0xa2, 0x85, 0xa9, 0x6f, 0x97, 0x70, 0xfd, + 0x6b, 0xd0, 0x19, 0x66, 0x87, 0x7e, 0x67, 0x61, 0xea, 0x3f, 0x2e, 0xfc, 0xeb, 0xf7, 0x77, 0x73, + 0xeb, 0xbf, 0x2a, 0x21, 0xd4, 0x0e, 0x8e, 0x12, 0x19, 0xed, 0xa0, 0xd5, 0xd1, 0x6c, 0x38, 0xec, + 0xf5, 0x87, 0x83, 0x48, 0x06, 0x54, 0x54, 0x3a, 0xa1, 0xc8, 0x8b, 0xac, 0xa7, 0x68, 0x25, 0xfc, + 0x30, 0x14, 0x1f, 0x55, 0x9c, 0x46, 0x9d, 0xd2, 0x12, 0xeb, 0x09, 0xba, 0x19, 0x7d, 0x86, 0xa5, + 0x96, 0x4a, 0x89, 0xc2, 0x1a, 0xeb, 0x43, 0x54, 0x0e, 0x3f, 0xc1, 0x02, 0x4c, 0x23, 0x4f, 0x7e, + 0x05, 0x0b, 0x81, 0x45, 0x96, 0x46, 0xb2, 0xfc, 0x0a, 0xf6, 0x5a, 0x88, 0x50, 0x53, 0xe9, 0x58, + 0x58, 0x23, 0x10, 0x49, 0x27, 0x6e, 0x7e, 0x85, 0x48, 0x24, 0xa5, 0xe2, 0x85, 0x35, 0xd6, 0xfb, + 0xa8, 0x14, 0x7e, 0x52, 0x4b, 0x77, 0x13, 0x70, 0xf5, 0x2c, 0x0b, 0x22, 0xfc, 0x54, 0xf7, 0x85, + 0xb0, 0x86, 0x6d, 0x47, 0x2d, 0xed, 0xad, 0xc2, 0xaf, 0xb0, 0xde, 0x47, 0x4b, 0xd1, 0x5f, 0x5f, + 0x7a, 0xe7, 0x68, 0xc4, 0x5e, 0x2b, 0x7c, 0xfe, 0xf7, 0xbb, 0xd7, 0x3a, 0xf1, 0x12, 0xeb, 0x7b, + 0x68, 0x31, 0xfc, 0xdb, 0x6f, 0x97, 0x13, 0x24, 0x4e, 0x57, 0x47, 0x0b, 0xac, 0x1d, 0x54, 0x1e, + 0x79, 0xa3, 0x80, 0x10, 0xd5, 0xf7, 0xcd, 0x64, 0x7d, 0x53, 0x10, 0x7e, 0xa1, 0xf5, 0x14, 0x95, + 0xe8, 0x07, 0x44, 0xe3, 0xb7, 0x12, 0x35, 0x4e, 0x71, 0xb8, 0x65, 0x0c, 0x0c, 0xd1, 0xe8, 0x4a, + 0xa2, 0xce, 0x05, 0x18, 0x22, 0xd3, 0xf8, 0xba, 0xa8, 0xd6, 0x57, 0x93, 0xb5, 0x2e, 0x5c, 0x17, + 0x15, 0x3c, 0x47, 0xc8, 0x75, 0x6c, 0x2b, 0x51, 0xef, 0x32, 0x21, 0xd7, 0x11, 0x08, 0xb9, 0x8e, + 0x7d, 0x3b, 0x59, 0xf3, 0x00, 0x21, 0xd7, 0xb1, 0x6a, 0x68, 0x99, 0x7e, 0x80, 0x75, 0xff, 0x4a, + 0x92, 0xee, 0x29, 0x0a, 0xbb, 0x88, 0x61, 0x43, 0xb5, 0x7f, 0x27, 0x59, 0xfb, 0x02, 0x1b, 0x7a, + 0x03, 0xc4, 0xed, 0x21, 0xfa, 0x7f, 0x35, 0x51, 0xff, 0x42, 0x7b, 0xf0, 0x01, 0x6a, 0x07, 0xff, + 0x29, 0xa1, 0xc5, 0x7d, 0xff, 0x88, 0x98, 0xc1, 0xf3, 0x4c, 0x66, 0x50, 0x2b, 0xfc, 0xfa, 0x1f, + 0x77, 0x73, 0x90, 0x25, 0x7c, 0x94, 0xc1, 0x12, 0x6a, 0x85, 0xdf, 0x06, 0x68, 0xb2, 0x31, 0x34, + 0xb3, 0x18, 0x43, 0xad, 0xf0, 0xbb, 0x00, 0x4d, 0xb4, 0x87, 0xba, 0xb9, 0x3d, 0x50, 0x24, 0xc1, + 0x24, 0xea, 0xe6, 0x26, 0x21, 0x02, 0x11, 0xcd, 0x37, 0xb3, 0x58, 0x85, 0x78, 0x75, 0xf4, 0xfe, + 0xa9, 0x9b, 0x1b, 0x06, 0x40, 0xca, 0x75, 0x44, 0x52, 0xe9, 0x6c, 0x03, 0x22, 0x85, 0x2d, 0xc8, + 0xd0, 0x3c, 0x28, 0x0e, 0x6f, 0x21, 0xcd, 0x2c, 0x16, 0x22, 0x32, 0xa2, 0xf7, 0x51, 0xdd, 0xdc, + 0x48, 0xc4, 0x36, 0x11, 0x3b, 0xa9, 0x99, 0xd9, 0xc9, 0x62, 0x70, 0x33, 0xe2, 0x5b, 0x86, 0xb1, + 0x94, 0x6d, 0x13, 0x4b, 0xc1, 0x08, 0xf8, 0x36, 0x89, 0x6d, 0x65, 0x37, 0x8b, 0xad, 0x60, 0x20, + 0x7a, 0x49, 0x9c, 0xb5, 0x34, 0xcc, 0xad, 0x25, 0xc6, 0xe2, 0xed, 0xa5, 0x61, 0x6e, 0x2f, 0x32, + 0x14, 0x11, 0xf6, 0x6e, 0x16, 0x8b, 0x91, 0xaf, 0x91, 0xde, 0x26, 0x0d, 0x73, 0x9b, 0x01, 0x89, + 0xb9, 0x8e, 0x40, 0x2c, 0xa5, 0xd5, 0xc0, 0xc4, 0x5c, 0xc7, 0x7a, 0x66, 0x6a, 0x37, 0x31, 0x12, + 0x67, 0x39, 0xbb, 0x59, 0x2c, 0x47, 0x66, 0x45, 0x6f, 0x97, 0x86, 0xb9, 0xed, 0xc8, 0xed, 0xc2, + 0x07, 0xd7, 0x7f, 0x53, 0x42, 0xe5, 0xce, 0x60, 0xcc, 0xc4, 0x90, 0x26, 0xb2, 0x24, 0xfb, 0x98, + 0xda, 0xb9, 0x7b, 0xf9, 0x84, 0x1c, 0x02, 0xac, 0xb2, 0xea, 0xb1, 0x8b, 0x85, 0x77, 0x4c, 0x90, + 0x7d, 0xf3, 0xfa, 0x24, 0x22, 0xaf, 0xb1, 0x3e, 0x40, 0xc8, 0x8f, 0xc9, 0xe4, 0x93, 0xc8, 0x50, + 0x97, 0x65, 0xd6, 0x58, 0xef, 0xa1, 0xa5, 0xa3, 0x88, 0x42, 0x21, 0x81, 0x42, 0xb8, 0xcf, 0x8c, + 0x56, 0x00, 0x59, 0xa8, 0x88, 0x31, 0xcc, 0xb2, 0x90, 0xb4, 0xe1, 0xbc, 0x9e, 0x0c, 0x02, 0x6f, + 0x38, 0xa5, 0x54, 0x75, 0x03, 0x23, 0x99, 0xa4, 0x2a, 0x71, 0xcf, 0xba, 0x98, 0x88, 0x00, 0xee, + 0x59, 0xa5, 0x70, 0xb6, 0xa4, 0xc0, 0x51, 0x87, 0x33, 0x71, 0xdb, 0x8b, 0x12, 0x11, 0xc0, 0x6d, + 0xaf, 0x9c, 0xf1, 0x96, 0x15, 0xed, 0xd5, 0x65, 0x3c, 0x69, 0xf3, 0x5c, 0x4a, 0x06, 0x81, 0x37, + 0xcf, 0x52, 0x5a, 0x2c, 0xab, 0xaf, 0x4b, 0x91, 0x16, 0xc5, 0xfd, 0xf7, 0xcd, 0x44, 0x04, 0x70, + 0xff, 0x2d, 0x87, 0xce, 0x5b, 0x9a, 0x8b, 0x52, 0x85, 0x4e, 0x69, 0x17, 0xbf, 0x92, 0x0c, 0x02, + 0xef, 0xe2, 0xc5, 0xf8, 0xba, 0xaa, 0xb8, 0xa1, 0x55, 0xf1, 0x55, 0x48, 0x01, 0x56, 0xd2, 0x72, + 0x28, 0x05, 0xc8, 0x11, 0xf8, 0xb6, 0xe2, 0x72, 0x74, 0x11, 0x58, 0xca, 0x12, 0xaf, 0x24, 0x83, + 0xc0, 0x59, 0x42, 0x0a, 0xd3, 0x77, 0x14, 0xdf, 0xb5, 0x3a, 0x4c, 0xcb, 0x71, 0x24, 0x9f, 0x3d, + 0x8e, 0xfc, 0xaf, 0x84, 0x96, 0x3b, 0x83, 0x71, 0x94, 0x48, 0xda, 0xd9, 0x7c, 0x81, 0x46, 0x12, + 0xc8, 0x1d, 0x5a, 0x59, 0xdc, 0x81, 0x86, 0x12, 0xc0, 0x23, 0x9e, 0x18, 0x7a, 0x44, 0xbc, 0xf9, + 0x63, 0x7d, 0xe2, 0x43, 0x23, 0x9f, 0x88, 0xb7, 0x7f, 0x8c, 0x57, 0x34, 0xb3, 0x78, 0x85, 0x22, + 0x1e, 0xed, 0x66, 0x71, 0x0c, 0xe5, 0x5e, 0xb2, 0x6e, 0xee, 0x1a, 0x70, 0xd8, 0x6a, 0x98, 0x7b, + 0x87, 0x6a, 0x53, 0x5a, 0x37, 0xf7, 0x0f, 0x38, 0xb7, 0x35, 0xcc, 0x5d, 0x44, 0xb5, 0xbb, 0x6d, + 0x66, 0x71, 0x12, 0x45, 0x04, 0xdc, 0xcd, 0xe2, 0x27, 0xca, 0x9d, 0x72, 0xdd, 0xdc, 0x53, 0xe0, + 0x40, 0xd9, 0x30, 0x77, 0x16, 0xd5, 0x96, 0xbb, 0x99, 0xc5, 0x5d, 0x14, 0xd9, 0x74, 0x37, 0x8b, + 0xc7, 0x28, 0xb7, 0xef, 0x4f, 0x4c, 0x7d, 0x06, 0x4c, 0xba, 0xcf, 0x4c, 0xdd, 0x46, 0x11, 0x02, + 0x9a, 0x59, 0x1c, 0x47, 0x91, 0x98, 0x77, 0xb3, 0xf8, 0x8e, 0x32, 0x50, 0xd4, 0xcd, 0xbd, 0x07, + 0xce, 0xdf, 0x0d, 0x73, 0x07, 0x52, 0x25, 0x93, 0x3f, 0x56, 0x50, 0xb9, 0xd5, 0x63, 0x93, 0xc9, + 0x0f, 0xe1, 0x99, 0x58, 0x70, 0x86, 0xb7, 0xab, 0xe4, 0xa1, 0x22, 0xb7, 0xa0, 0xfa, 0x5c, 0xac, + 0x7e, 0x3a, 0xf2, 0x27, 0xe7, 0xd0, 0x78, 0xac, 0xce, 0xce, 0x0d, 0x88, 0x05, 0xbd, 0x01, 0x42, + 0xf2, 0x50, 0xf2, 0x3c, 0xfa, 0x25, 0x30, 0x67, 0x23, 0x56, 0xf4, 0x96, 0x96, 0x62, 0x58, 0x4c, + 0x18, 0x42, 0xcf, 0x62, 0xe2, 0xa1, 0x04, 0x71, 0xa5, 0x75, 0x10, 0x8f, 0xc3, 0x91, 0x06, 0xde, + 0x6d, 0x85, 0x33, 0x3d, 0xd2, 0x73, 0xc3, 0xa5, 0x84, 0x99, 0xe8, 0x4f, 0xfb, 0xb0, 0x3f, 0x3d, + 0x84, 0x01, 0xd9, 0x4a, 0x96, 0xa1, 0x60, 0x53, 0x2d, 0xd8, 0xa6, 0x1e, 0x6a, 0x59, 0xe2, 0x4a, + 0x42, 0x52, 0x30, 0xab, 0x36, 0x68, 0x56, 0x0f, 0x74, 0x14, 0x63, 0x30, 0x30, 0xf3, 0xb4, 0x60, + 0xcf, 0xd2, 0x13, 0xc4, 0x95, 0x02, 0x41, 0xf2, 0x47, 0xbd, 0x0d, 0x3a, 0x97, 0x96, 0x60, 0x0c, + 0x06, 0x46, 0xa1, 0xb6, 0xc2, 0xc0, 0xf4, 0x5f, 0x74, 0x97, 0xa1, 0x28, 0xda, 0xd8, 0x3e, 0x6c, + 0x63, 0xda, 0x2f, 0xba, 0x2b, 0xb1, 0x14, 0xdc, 0xac, 0x05, 0xbb, 0x59, 0x62, 0x1f, 0x5d, 0x47, + 0xee, 0xa3, 0xeb, 0xf0, 0x7d, 0x8c, 0x3c, 0x2d, 0xa9, 0x8f, 0x14, 0x0c, 0x0c, 0x4e, 0x6d, 0x85, + 0xb5, 0x25, 0xf7, 0x31, 0xa4, 0x28, 0x1a, 0xdc, 0x3e, 0x6c, 0x70, 0x89, 0x7d, 0xe4, 0x59, 0x0a, + 0x3e, 0xd7, 0x04, 0x7d, 0xee, 0x81, 0x96, 0x64, 0x50, 0x48, 0x28, 0xf2, 0x6e, 0xd7, 0x82, 0xdc, + 0xee, 0xbe, 0x8e, 0x5e, 0x84, 0x04, 0xc5, 0xac, 0xb6, 0xc2, 0xf4, 0xf4, 0x1d, 0x24, 0xa5, 0x42, + 0x07, 0xa9, 0x59, 0xed, 0xc3, 0xd6, 0xa7, 0xed, 0x20, 0x83, 0x07, 0xa7, 0xaf, 0x16, 0xec, 0x80, + 0x7a, 0x25, 0xe2, 0x4a, 0x41, 0x89, 0xc4, 0x07, 0xdb, 0xa0, 0x0f, 0x6a, 0x95, 0x18, 0x83, 0x41, + 0xa1, 0x6c, 0xed, 0x67, 0xe8, 0x55, 0xd8, 0xce, 0xac, 0x15, 0x94, 0xff, 0xf9, 0xe0, 0x1c, 0x3f, + 0x1c, 0x2a, 0x76, 0x82, 0x1f, 0xad, 0x6f, 0xa1, 0xe2, 0x2f, 0x02, 0x6f, 0x4d, 0xf1, 0x6f, 0x26, + 0xa4, 0xf0, 0xf1, 0xc2, 0x77, 0x72, 0x6b, 0x3f, 0x40, 0x37, 0xaf, 0x08, 0xf9, 0x27, 0xe8, 0x0e, + 0xe8, 0x73, 0xc0, 0x09, 0x36, 0xf8, 0x13, 0x68, 0xa6, 0x84, 0x0c, 0xfe, 0x4b, 0x54, 0xbe, 0x12, + 0xdc, 0x9f, 0xa2, 0xdb, 0x80, 0x07, 0x02, 0xe8, 0x0e, 0x8f, 0xae, 0x1f, 0x0a, 0x72, 0x8d, 0xb1, + 0x64, 0x4f, 0xbc, 0x44, 0xfc, 0x4f, 0x90, 0x25, 0xdb, 0x23, 0x80, 0xff, 0x2e, 0x8f, 0xaf, 0x9d, + 0x22, 0x32, 0xf0, 0x3f, 0x46, 0xab, 0x92, 0x5f, 0x5e, 0x1e, 0x3a, 0x43, 0x3e, 0xf6, 0x91, 0x2c, + 0xf0, 0xcc, 0xb0, 0x0f, 0x24, 0x7f, 0x15, 0xe8, 0x8c, 0x74, 0xba, 0x5a, 0xfc, 0xc4, 0xaf, 0xb6, + 0x0b, 0x9f, 0x20, 0x96, 0xce, 0xd5, 0xe0, 0xf3, 0xdd, 0xa7, 0xee, 0x93, 0xb1, 0x3f, 0xe1, 0x40, + 0x51, 0xd5, 0xfd, 0x4b, 0x47, 0x17, 0xba, 0xaf, 0xc6, 0x4f, 0xd5, 0x1d, 0xe0, 0x04, 0x7c, 0xf7, + 0x2f, 0x1f, 0xff, 0x47, 0x68, 0x55, 0xf2, 0xe9, 0x2c, 0x7f, 0x8e, 0xe3, 0x01, 0x2a, 0x03, 0xfe, + 0x31, 0x5a, 0x11, 0x9d, 0xfb, 0xd2, 0xb0, 0x99, 0xce, 0x33, 0x9e, 0x9b, 0xa5, 0x33, 0xec, 0xd4, + 0x15, 0xec, 0xfc, 0xd5, 0xe0, 0x33, 0xba, 0x8f, 0x1d, 0x39, 0x8b, 0x32, 0xd9, 0x7f, 0x0f, 0x84, + 0x74, 0x7f, 0x05, 0xe8, 0xeb, 0xff, 0xae, 0xa0, 0xe5, 0x56, 0x2f, 0x9e, 0xd9, 0x7e, 0xa2, 0x4e, + 0xcc, 0xdf, 0x8c, 0xf7, 0x22, 0x61, 0xb9, 0x22, 0x2f, 0xab, 0xff, 0xa9, 0xa4, 0x21, 0xa7, 0xe6, + 0x6f, 0x00, 0xb0, 0x02, 0x1c, 0xf8, 0xd0, 0xfd, 0x63, 0x65, 0x6e, 0x7e, 0xa4, 0x21, 0x2a, 0xa4, + 0x5d, 0xc5, 0xbf, 0xab, 0x3c, 0x93, 0xb2, 0xf3, 0x3d, 0x00, 0x93, 0xc7, 0x82, 0x9e, 0xeb, 0x1f, + 0x28, 0xd2, 0xf3, 0x03, 0x1d, 0x43, 0x36, 0xeb, 0x82, 0x13, 0xde, 0x2e, 0x9c, 0xa0, 0xef, 0x43, + 0xa0, 0x72, 0x7e, 0x56, 0x8e, 0x7a, 0xf7, 0xe0, 0x0c, 0x7d, 0x5f, 0xc3, 0x95, 0x0d, 0xbd, 0xd0, + 0xd0, 0xb7, 0x03, 0xe6, 0xe8, 0x37, 0xd5, 0x44, 0x19, 0x40, 0xd5, 0xf4, 0x77, 0x0f, 0x4e, 0xd2, + 0x3a, 0x9a, 0x6c, 0xa8, 0x84, 0xe6, 0xc0, 0x1d, 0x30, 0x4d, 0x6b, 0x68, 0x32, 0x80, 0xaa, 0x81, + 0xf0, 0x81, 0x22, 0x4f, 0xeb, 0xbe, 0xfa, 0xae, 0x44, 0x54, 0xcc, 0xd4, 0x5d, 0x38, 0x53, 0x6b, + 0xbe, 0xfa, 0x2e, 0xc8, 0x55, 0x48, 0xd5, 0x7b, 0x70, 0xaa, 0x4e, 0xe8, 0x69, 0x14, 0x30, 0xa1, + 0x69, 0x71, 0x07, 0x4c, 0xd6, 0xfa, 0x9e, 0x86, 0x80, 0xaa, 0xb1, 0xf1, 0x81, 0x22, 0x5b, 0x27, + 0xf5, 0x94, 0x27, 0x2a, 0xe6, 0xeb, 0x2e, 0x9c, 0xaf, 0x13, 0x7a, 0x2a, 0x73, 0x15, 0x12, 0xf6, + 0x73, 0x30, 0x61, 0xbf, 0xa9, 0xa1, 0xca, 0xa4, 0x62, 0x60, 0xa6, 0xfc, 0x02, 0x4a, 0xd9, 0x6f, + 0xa8, 0x49, 0xc6, 0x68, 0x8a, 0xe1, 0xf2, 0x81, 0x22, 0x67, 0xeb, 0xba, 0xc9, 0xa5, 0x62, 0x70, + 0xcc, 0xdc, 0x85, 0xb3, 0xb6, 0xa6, 0x9b, 0x2c, 0xa6, 0x72, 0xde, 0xbc, 0x07, 0xa7, 0x6d, 0x9d, + 0x42, 0xd9, 0x78, 0x0c, 0x4d, 0x9e, 0x3b, 0x60, 0xe2, 0xd6, 0x28, 0x94, 0x01, 0x54, 0x8c, 0xa0, + 0xe7, 0x99, 0x7b, 0x9e, 0xb9, 0xe7, 0x99, 0x7b, 0x9e, 0xb9, 0xe7, 0x99, 0x7b, 0x9e, 0xb9, 0xe7, + 0x99, 0x7b, 0x9e, 0xb9, 0xe1, 0xcc, 0xfd, 0xa7, 0x22, 0xba, 0xf5, 0x62, 0x34, 0xf0, 0x8e, 0x99, + 0x27, 0xd5, 0x8f, 0xd9, 0x60, 0x9c, 0xf8, 0xd6, 0xc6, 0x0e, 0xf7, 0x04, 0xf9, 0xdb, 0x4c, 0x5a, + 0x4d, 0x32, 0xce, 0x1d, 0xf6, 0xe1, 0xee, 0xf7, 0xd1, 0xd2, 0x64, 0x30, 0x4e, 0xff, 0x42, 0x46, + 0x70, 0xda, 0x68, 0x81, 0xf5, 0x5d, 0xb4, 0x38, 0x19, 0x8c, 0xd3, 0xbe, 0x82, 0x11, 0x9c, 0x38, + 0x2c, 0xa7, 0x4b, 0xd3, 0xbe, 0x74, 0x41, 0x97, 0x92, 0xa8, 0x42, 0x38, 0xa7, 0x7f, 0xcd, 0x82, + 0x72, 0xa6, 0x41, 0x27, 0x3a, 0x71, 0xaa, 0x17, 0x2b, 0xe2, 0x13, 0xbb, 0x0e, 0x73, 0xe2, 0x74, + 0xaf, 0x52, 0x30, 0x27, 0x76, 0x1d, 0x6b, 0x0b, 0xdd, 0x98, 0x0c, 0xc6, 0xe9, 0x5e, 0x9e, 0xd8, + 0xb9, 0xd6, 0x09, 0x8b, 0xe9, 0x59, 0xd3, 0xbf, 0x2e, 0x41, 0xcf, 0x4a, 0x77, 0xcd, 0xe4, 0x72, + 0xd3, 0xbe, 0x20, 0x41, 0x2f, 0x17, 0x7f, 0x50, 0x5b, 0xc5, 0x1a, 0x7d, 0x41, 0x35, 0x1a, 0x68, + 0x6d, 0xfd, 0xbf, 0x45, 0x54, 0xc6, 0xba, 0x8d, 0xa6, 0x45, 0x1f, 0x18, 0xa9, 0x96, 0x8c, 0x85, + 0x78, 0xed, 0xbe, 0x67, 0xa0, 0x5d, 0x32, 0xae, 0xe1, 0x14, 0x5c, 0x33, 0x54, 0x30, 0x49, 0x02, + 0xbc, 0x8e, 0xb7, 0x8d, 0x74, 0x1c, 0x21, 0xc4, 0x6a, 0xde, 0x36, 0x52, 0x33, 0x07, 0x40, 0x54, + 0x59, 0x33, 0xd4, 0x34, 0x77, 0x15, 0x54, 0xd9, 0xdb, 0x46, 0xca, 0x16, 0x49, 0xe0, 0xf7, 0xe4, + 0xcc, 0xf4, 0x2d, 0x91, 0xc0, 0xf7, 0x48, 0x7a, 0x95, 0x47, 0xeb, 0x23, 0xad, 0xd7, 0x0c, 0xb5, + 0xce, 0x31, 0xa0, 0x8a, 0xdf, 0x36, 0x52, 0x3c, 0xd7, 0x06, 0xa2, 0xfb, 0x5b, 0x58, 0xe3, 0x2f, + 0xb0, 0xc6, 0x03, 0x95, 0xd6, 0x1e, 0x7d, 0xf1, 0x65, 0x25, 0xf7, 0xd5, 0x97, 0x95, 0xdc, 0x1f, + 0x2e, 0x2a, 0xb9, 0x3f, 0x5f, 0x54, 0x72, 0x7f, 0xb9, 0xa8, 0xe4, 0x3e, 0xbf, 0xa8, 0xe4, 0xfe, + 0x76, 0x51, 0xc9, 0x7d, 0x71, 0x51, 0xc9, 0x7d, 0x75, 0x51, 0xb9, 0xf6, 0xcb, 0x7f, 0x56, 0xae, + 0xf5, 0xaf, 0xe3, 0x33, 0xb8, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x9a, 0x66, 0x06, 0xbb, + 0x40, 0x00, 0x00, } func (this *KnownTypes) Compare(that interface{}) int { @@ -2689,6 +2134,9 @@ if c := this.Bytes.Compare(that1.Bytes); c != 0 { return c } + if c := this.St.Compare(that1.St); c != 0 { + return c + } if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { return c } @@ -3120,6 +2568,9 @@ if !this.Bytes.Equal(that1.Bytes) { return fmt.Errorf("Bytes this(%v) Not Equal that(%v)", this.Bytes, that1.Bytes) } + if !this.St.Equal(that1.St) { + return fmt.Errorf("St this(%v) Not Equal that(%v)", this.St, that1.St) + } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized) } @@ -3177,6 +2628,9 @@ if !this.Bytes.Equal(that1.Bytes) { return false } + if !this.St.Equal(that1.St) { + return false + } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return false } @@ -6877,7 +6331,7 @@ func (m *KnownTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -6885,130 +6339,170 @@ } func (m *KnownTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *KnownTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Dur != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Dur.Size())) - n1, err1 := m.Dur.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 - } - i += n1 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Ts != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Ts.Size())) - n2, err2 := m.Ts.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + if m.St != nil { + { + size, err := m.St.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n2 + i-- + dAtA[i] = 0x62 } - if m.Dbl != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Dbl.Size())) - n3, err3 := m.Dbl.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + if m.Bytes != nil { + { + size, err := m.Bytes.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n3 + i-- + dAtA[i] = 0x5a } - if m.Flt != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Flt.Size())) - n4, err4 := m.Flt.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 + if m.Str != nil { + { + size, err := m.Str.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n4 + i-- + dAtA[i] = 0x52 } - if m.I64 != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.I64.Size())) - n5, err5 := m.I64.MarshalTo(dAtA[i:]) - if err5 != nil { - return 0, err5 + if m.Bool != nil { + { + size, err := m.Bool.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n5 + i-- + dAtA[i] = 0x4a } - if m.U64 != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.U64.Size())) - n6, err6 := m.U64.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 + if m.U32 != nil { + { + size, err := m.U32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n6 + i-- + dAtA[i] = 0x42 } if m.I32 != nil { + { + size, err := m.I32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.I32.Size())) - n7, err7 := m.I32.MarshalTo(dAtA[i:]) - if err7 != nil { - return 0, err7 + } + if m.U64 != nil { + { + size, err := m.U64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n7 + i-- + dAtA[i] = 0x32 } - if m.U32 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.U32.Size())) - n8, err8 := m.U32.MarshalTo(dAtA[i:]) - if err8 != nil { - return 0, err8 + if m.I64 != nil { + { + size, err := m.I64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n8 + i-- + dAtA[i] = 0x2a } - if m.Bool != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Bool.Size())) - n9, err9 := m.Bool.MarshalTo(dAtA[i:]) - if err9 != nil { - return 0, err9 + if m.Flt != nil { + { + size, err := m.Flt.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n9 + i-- + dAtA[i] = 0x22 } - if m.Str != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Str.Size())) - n10, err10 := m.Str.MarshalTo(dAtA[i:]) - if err10 != nil { - return 0, err10 + if m.Dbl != nil { + { + size, err := m.Dbl.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n10 + i-- + dAtA[i] = 0x1a } - if m.Bytes != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Bytes.Size())) - n11, err11 := m.Bytes.MarshalTo(dAtA[i:]) - if err11 != nil { - return 0, err11 + if m.Ts != nil { + { + size, err := m.Ts.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n11 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Dur != nil { + { + size, err := m.Dur.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *ProtoTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -7016,232 +6510,282 @@ } func (m *ProtoTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ProtoTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NullableTimestamp != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableTimestamp.Size())) - n12, err12 := m.NullableTimestamp.MarshalTo(dAtA[i:]) - if err12 != nil { - return 0, err12 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + { + size, err := m.NonnullBytes.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n12 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableDuration != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableDuration.Size())) - n13, err13 := m.NullableDuration.MarshalTo(dAtA[i:]) - if err13 != nil { - return 0, err13 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 + { + size, err := m.NonnullString.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n13 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableDouble != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableDouble.Size())) - n14, err14 := m.NullableDouble.MarshalTo(dAtA[i:]) - if err14 != nil { - return 0, err14 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa + { + size, err := m.NonnullBool.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n14 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableFloat != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableFloat.Size())) - n15, err15 := m.NullableFloat.MarshalTo(dAtA[i:]) - if err15 != nil { - return 0, err15 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 + { + size, err := m.NonnullUInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n15 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableInt64 != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableInt64.Size())) - n16, err16 := m.NullableInt64.MarshalTo(dAtA[i:]) - if err16 != nil { - return 0, err16 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a + { + size, err := m.NonnullInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n16 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableUInt64 != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableUInt64.Size())) - n17, err17 := m.NullableUInt64.MarshalTo(dAtA[i:]) - if err17 != nil { - return 0, err17 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + { + size, err := m.NonnullUInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n17 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableInt32 != nil { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableInt32.Size())) - n18, err18 := m.NullableInt32.MarshalTo(dAtA[i:]) - if err18 != nil { - return 0, err18 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + { + size, err := m.NonnullInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n18 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableUInt32 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableUInt32.Size())) - n19, err19 := m.NullableUInt32.MarshalTo(dAtA[i:]) - if err19 != nil { - return 0, err19 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + { + size, err := m.NonnullFloat.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n19 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableBool != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableBool.Size())) - n20, err20 := m.NullableBool.MarshalTo(dAtA[i:]) - if err20 != nil { - return 0, err20 + i-- + dAtA[i] = 0x7a + { + size, err := m.NonnullDouble.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n20 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableString != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableString.Size())) - n21, err21 := m.NullableString.MarshalTo(dAtA[i:]) - if err21 != nil { - return 0, err21 + i-- + dAtA[i] = 0x72 + { + size, err := m.Duration.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n21 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableBytes != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableBytes.Size())) - n22, err22 := m.NullableBytes.MarshalTo(dAtA[i:]) - if err22 != nil { - return 0, err22 + i-- + dAtA[i] = 0x6a + { + size, err := m.Timestamp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n22 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } + i-- dAtA[i] = 0x62 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Timestamp.Size())) - n23, err23 := m.Timestamp.MarshalTo(dAtA[i:]) - if err23 != nil { - return 0, err23 + if m.NullableBytes != nil { + { + size, err := m.NullableBytes.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x5a } - i += n23 - dAtA[i] = 0x6a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Duration.Size())) - n24, err24 := m.Duration.MarshalTo(dAtA[i:]) - if err24 != nil { - return 0, err24 - } - i += n24 - dAtA[i] = 0x72 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullDouble.Size())) - n25, err25 := m.NonnullDouble.MarshalTo(dAtA[i:]) - if err25 != nil { - return 0, err25 + if m.NullableString != nil { + { + size, err := m.NullableString.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x52 } - i += n25 - dAtA[i] = 0x7a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullFloat.Size())) - n26, err26 := m.NonnullFloat.MarshalTo(dAtA[i:]) - if err26 != nil { - return 0, err26 + if m.NullableBool != nil { + { + size, err := m.NullableBool.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a } - i += n26 - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullInt64.Size())) - n27, err27 := m.NonnullInt64.MarshalTo(dAtA[i:]) - if err27 != nil { - return 0, err27 + if m.NullableUInt32 != nil { + { + size, err := m.NullableUInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 } - i += n27 - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullUInt64.Size())) - n28, err28 := m.NonnullUInt64.MarshalTo(dAtA[i:]) - if err28 != nil { - return 0, err28 + if m.NullableInt32 != nil { + { + size, err := m.NullableInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a } - i += n28 - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullInt32.Size())) - n29, err29 := m.NonnullInt32.MarshalTo(dAtA[i:]) - if err29 != nil { - return 0, err29 + if m.NullableUInt64 != nil { + { + size, err := m.NullableUInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 } - i += n29 - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullUInt32.Size())) - n30, err30 := m.NonnullUInt32.MarshalTo(dAtA[i:]) - if err30 != nil { - return 0, err30 + if m.NullableInt64 != nil { + { + size, err := m.NullableInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a } - i += n30 - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullBool.Size())) - n31, err31 := m.NonnullBool.MarshalTo(dAtA[i:]) - if err31 != nil { - return 0, err31 + if m.NullableFloat != nil { + { + size, err := m.NullableFloat.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 } - i += n31 - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullString.Size())) - n32, err32 := m.NonnullString.MarshalTo(dAtA[i:]) - if err32 != nil { - return 0, err32 + if m.NullableDouble != nil { + { + size, err := m.NullableDouble.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } - i += n32 - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullBytes.Size())) - n33, err33 := m.NonnullBytes.MarshalTo(dAtA[i:]) - if err33 != nil { - return 0, err33 + if m.NullableDuration != nil { + { + size, err := m.NullableDuration.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - i += n33 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.NullableTimestamp != nil { + { + size, err := m.NullableTimestamp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *StdTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -7249,232 +6793,238 @@ } func (m *StdTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *StdTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NullableTimestamp != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.NullableTimestamp))) - n34, err34 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.NullableTimestamp, dAtA[i:]) - if err34 != nil { - return 0, err34 - } - i += n34 - } - if m.NullableDuration != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*m.NullableDuration))) - n35, err35 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.NullableDuration, dAtA[i:]) - if err35 != nil { - return 0, err35 - } - i += n35 - } - if m.NullableDouble != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(*m.NullableDouble))) - n36, err36 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*m.NullableDouble, dAtA[i:]) - if err36 != nil { - return 0, err36 - } - i += n36 - } - if m.NullableFloat != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(*m.NullableFloat))) - n37, err37 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.NullableFloat, dAtA[i:]) - if err37 != nil { - return 0, err37 - } - i += n37 - } - if m.NullableInt64 != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(*m.NullableInt64))) - n38, err38 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*m.NullableInt64, dAtA[i:]) - if err38 != nil { - return 0, err38 - } - i += n38 - } - if m.NullableUInt64 != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(*m.NullableUInt64))) - n39, err39 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*m.NullableUInt64, dAtA[i:]) - if err39 != nil { - return 0, err39 - } - i += n39 - } - if m.NullableInt32 != nil { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(*m.NullableInt32))) - n40, err40 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.NullableInt32, dAtA[i:]) - if err40 != nil { - return 0, err40 - } - i += n40 - } - if m.NullableUInt32 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(*m.NullableUInt32))) - n41, err41 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*m.NullableUInt32, dAtA[i:]) - if err41 != nil { - return 0, err41 - } - i += n41 - } - if m.NullableBool != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(*m.NullableBool))) - n42, err42 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.NullableBool, dAtA[i:]) - if err42 != nil { - return 0, err42 - } - i += n42 - } - if m.NullableString != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(*m.NullableString))) - n43, err43 := github_com_gogo_protobuf_types.StdStringMarshalTo(*m.NullableString, dAtA[i:]) - if err43 != nil { - return 0, err43 - } - i += n43 - } - if m.NullableBytes != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(*m.NullableBytes))) - n44, err44 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*m.NullableBytes, dAtA[i:]) - if err44 != nil { - return 0, err44 - } - i += n44 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - dAtA[i] = 0x62 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp))) - n45, err45 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i:]) + n35, err35 := github_com_gogo_protobuf_types.StdBytesMarshalTo(m.NonnullBytes, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes(m.NonnullBytes):]) + if err35 != nil { + return 0, err35 + } + i -= n35 + i = encodeVarintTypes(dAtA, i, uint64(n35)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 + n36, err36 := github_com_gogo_protobuf_types.StdStringMarshalTo(m.NonnullString, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString(m.NonnullString):]) + if err36 != nil { + return 0, err36 + } + i -= n36 + i = encodeVarintTypes(dAtA, i, uint64(n36)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa + n37, err37 := github_com_gogo_protobuf_types.StdBoolMarshalTo(m.NonnullBool, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(m.NonnullBool):]) + if err37 != nil { + return 0, err37 + } + i -= n37 + i = encodeVarintTypes(dAtA, i, uint64(n37)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 + n38, err38 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(m.NonnullUInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32(m.NonnullUInt32):]) + if err38 != nil { + return 0, err38 + } + i -= n38 + i = encodeVarintTypes(dAtA, i, uint64(n38)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a + n39, err39 := github_com_gogo_protobuf_types.StdInt32MarshalTo(m.NonnullInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(m.NonnullInt32):]) + if err39 != nil { + return 0, err39 + } + i -= n39 + i = encodeVarintTypes(dAtA, i, uint64(n39)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + n40, err40 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(m.NonnullUInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64(m.NonnullUInt64):]) + if err40 != nil { + return 0, err40 + } + i -= n40 + i = encodeVarintTypes(dAtA, i, uint64(n40)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + n41, err41 := github_com_gogo_protobuf_types.StdInt64MarshalTo(m.NonnullInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64(m.NonnullInt64):]) + if err41 != nil { + return 0, err41 + } + i -= n41 + i = encodeVarintTypes(dAtA, i, uint64(n41)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + n42, err42 := github_com_gogo_protobuf_types.StdFloatMarshalTo(m.NonnullFloat, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(m.NonnullFloat):]) + if err42 != nil { + return 0, err42 + } + i -= n42 + i = encodeVarintTypes(dAtA, i, uint64(n42)) + i-- + dAtA[i] = 0x7a + n43, err43 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(m.NonnullDouble, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble(m.NonnullDouble):]) + if err43 != nil { + return 0, err43 + } + i -= n43 + i = encodeVarintTypes(dAtA, i, uint64(n43)) + i-- + dAtA[i] = 0x72 + n44, err44 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.Duration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.Duration):]) + if err44 != nil { + return 0, err44 + } + i -= n44 + i = encodeVarintTypes(dAtA, i, uint64(n44)) + i-- + dAtA[i] = 0x6a + n45, err45 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err45 != nil { return 0, err45 } - i += n45 - dAtA[i] = 0x6a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(m.Duration))) - n46, err46 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.Duration, dAtA[i:]) - if err46 != nil { - return 0, err46 + i -= n45 + i = encodeVarintTypes(dAtA, i, uint64(n45)) + i-- + dAtA[i] = 0x62 + if m.NullableBytes != nil { + n46, err46 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*m.NullableBytes, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes(*m.NullableBytes):]) + if err46 != nil { + return 0, err46 + } + i -= n46 + i = encodeVarintTypes(dAtA, i, uint64(n46)) + i-- + dAtA[i] = 0x5a } - i += n46 - dAtA[i] = 0x72 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(m.NonnullDouble))) - n47, err47 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(m.NonnullDouble, dAtA[i:]) - if err47 != nil { - return 0, err47 + if m.NullableString != nil { + n47, err47 := github_com_gogo_protobuf_types.StdStringMarshalTo(*m.NullableString, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString(*m.NullableString):]) + if err47 != nil { + return 0, err47 + } + i -= n47 + i = encodeVarintTypes(dAtA, i, uint64(n47)) + i-- + dAtA[i] = 0x52 } - i += n47 - dAtA[i] = 0x7a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(m.NonnullFloat))) - n48, err48 := github_com_gogo_protobuf_types.StdFloatMarshalTo(m.NonnullFloat, dAtA[i:]) - if err48 != nil { - return 0, err48 + if m.NullableBool != nil { + n48, err48 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.NullableBool, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.NullableBool):]) + if err48 != nil { + return 0, err48 + } + i -= n48 + i = encodeVarintTypes(dAtA, i, uint64(n48)) + i-- + dAtA[i] = 0x4a } - i += n48 - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(m.NonnullInt64))) - n49, err49 := github_com_gogo_protobuf_types.StdInt64MarshalTo(m.NonnullInt64, dAtA[i:]) - if err49 != nil { - return 0, err49 + if m.NullableUInt32 != nil { + n49, err49 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*m.NullableUInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32(*m.NullableUInt32):]) + if err49 != nil { + return 0, err49 + } + i -= n49 + i = encodeVarintTypes(dAtA, i, uint64(n49)) + i-- + dAtA[i] = 0x42 } - i += n49 - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(m.NonnullUInt64))) - n50, err50 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(m.NonnullUInt64, dAtA[i:]) - if err50 != nil { - return 0, err50 + if m.NullableInt32 != nil { + n50, err50 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.NullableInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(*m.NullableInt32):]) + if err50 != nil { + return 0, err50 + } + i -= n50 + i = encodeVarintTypes(dAtA, i, uint64(n50)) + i-- + dAtA[i] = 0x3a } - i += n50 - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(m.NonnullInt32))) - n51, err51 := github_com_gogo_protobuf_types.StdInt32MarshalTo(m.NonnullInt32, dAtA[i:]) - if err51 != nil { - return 0, err51 + if m.NullableUInt64 != nil { + n51, err51 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*m.NullableUInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64(*m.NullableUInt64):]) + if err51 != nil { + return 0, err51 + } + i -= n51 + i = encodeVarintTypes(dAtA, i, uint64(n51)) + i-- + dAtA[i] = 0x32 } - i += n51 - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(m.NonnullUInt32))) - n52, err52 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(m.NonnullUInt32, dAtA[i:]) - if err52 != nil { - return 0, err52 + if m.NullableInt64 != nil { + n52, err52 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*m.NullableInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64(*m.NullableInt64):]) + if err52 != nil { + return 0, err52 + } + i -= n52 + i = encodeVarintTypes(dAtA, i, uint64(n52)) + i-- + dAtA[i] = 0x2a } - i += n52 - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(m.NonnullBool))) - n53, err53 := github_com_gogo_protobuf_types.StdBoolMarshalTo(m.NonnullBool, dAtA[i:]) - if err53 != nil { - return 0, err53 + if m.NullableFloat != nil { + n53, err53 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.NullableFloat, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(*m.NullableFloat):]) + if err53 != nil { + return 0, err53 + } + i -= n53 + i = encodeVarintTypes(dAtA, i, uint64(n53)) + i-- + dAtA[i] = 0x22 } - i += n53 - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(m.NonnullString))) - n54, err54 := github_com_gogo_protobuf_types.StdStringMarshalTo(m.NonnullString, dAtA[i:]) - if err54 != nil { - return 0, err54 + if m.NullableDouble != nil { + n54, err54 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*m.NullableDouble, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble(*m.NullableDouble):]) + if err54 != nil { + return 0, err54 + } + i -= n54 + i = encodeVarintTypes(dAtA, i, uint64(n54)) + i-- + dAtA[i] = 0x1a } - i += n54 - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(m.NonnullBytes))) - n55, err55 := github_com_gogo_protobuf_types.StdBytesMarshalTo(m.NonnullBytes, dAtA[i:]) - if err55 != nil { - return 0, err55 + if m.NullableDuration != nil { + n55, err55 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.NullableDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.NullableDuration):]) + if err55 != nil { + return 0, err55 + } + i -= n55 + i = encodeVarintTypes(dAtA, i, uint64(n55)) + i-- + dAtA[i] = 0x12 } - i += n55 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.NullableTimestamp != nil { + n56, err56 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.NullableTimestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.NullableTimestamp):]) + if err56 != nil { + return 0, err56 + } + i -= n56 + i = encodeVarintTypes(dAtA, i, uint64(n56)) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *RepProtoTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -7482,298 +7032,348 @@ } func (m *RepProtoTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RepProtoTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.NullableTimestamps) > 0 { - for _, msg := range m.NullableTimestamps { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.NullableDurations) > 0 { - for _, msg := range m.NullableDurations { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullBytes) > 0 { + for iNdEx := len(m.NonnullBytes) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullBytes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 } } - if len(m.Timestamps) > 0 { - for _, msg := range m.Timestamps { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableBytes) > 0 { + for iNdEx := len(m.NullableBytes) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableBytes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa } } - if len(m.Durations) > 0 { - for _, msg := range m.Durations { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullString) > 0 { + for iNdEx := len(m.NonnullString) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullString[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 } } - if len(m.NullableDouble) > 0 { - for _, msg := range m.NullableDouble { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableString) > 0 { + for iNdEx := len(m.NullableString) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableString[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a } } - if len(m.NonnullDouble) > 0 { - for _, msg := range m.NonnullDouble { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullBool) > 0 { + for iNdEx := len(m.NonnullBool) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullBool[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 } } - if len(m.NullableFloat) > 0 { - for _, msg := range m.NullableFloat { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableBool) > 0 { + for iNdEx := len(m.NullableBool) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableBool[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.NonnullFloat) > 0 { - for _, msg := range m.NonnullFloat { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullUInt32) > 0 { + for iNdEx := len(m.NonnullUInt32) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullUInt32[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.NullableInt64) > 0 { - for _, msg := range m.NullableInt64 { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableUInt32) > 0 { + for iNdEx := len(m.NullableUInt32) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableUInt32[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x7a } } - if len(m.NonnullInt64) > 0 { - for _, msg := range m.NonnullInt64 { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullInt32) > 0 { + for iNdEx := len(m.NonnullInt32) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullInt32[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x72 } } - if len(m.NullableUInt64) > 0 { - for _, msg := range m.NullableUInt64 { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableInt32) > 0 { + for iNdEx := len(m.NullableInt32) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableInt32[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x6a } } if len(m.NonnullUInt64) > 0 { - for _, msg := range m.NonnullUInt64 { - dAtA[i] = 0x62 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.NonnullUInt64) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullUInt64[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x62 } } - if len(m.NullableInt32) > 0 { - for _, msg := range m.NullableInt32 { - dAtA[i] = 0x6a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableUInt64) > 0 { + for iNdEx := len(m.NullableUInt64) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableUInt64[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x5a } } - if len(m.NonnullInt32) > 0 { - for _, msg := range m.NonnullInt32 { - dAtA[i] = 0x72 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullInt64) > 0 { + for iNdEx := len(m.NonnullInt64) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullInt64[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x52 } } - if len(m.NullableUInt32) > 0 { - for _, msg := range m.NullableUInt32 { - dAtA[i] = 0x7a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableInt64) > 0 { + for iNdEx := len(m.NullableInt64) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableInt64[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x4a } } - if len(m.NonnullUInt32) > 0 { - for _, msg := range m.NonnullUInt32 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullFloat) > 0 { + for iNdEx := len(m.NonnullFloat) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullFloat[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x42 } } - if len(m.NullableBool) > 0 { - for _, msg := range m.NullableBool { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableFloat) > 0 { + for iNdEx := len(m.NullableFloat) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableFloat[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x3a } } - if len(m.NonnullBool) > 0 { - for _, msg := range m.NonnullBool { - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullDouble) > 0 { + for iNdEx := len(m.NonnullDouble) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullDouble[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x32 } } - if len(m.NullableString) > 0 { - for _, msg := range m.NullableString { - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableDouble) > 0 { + for iNdEx := len(m.NullableDouble) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableDouble[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x2a } } - if len(m.NonnullString) > 0 { - for _, msg := range m.NonnullString { - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Durations) > 0 { + for iNdEx := len(m.Durations) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Durations[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x22 } } - if len(m.NullableBytes) > 0 { - for _, msg := range m.NullableBytes { - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Timestamps) > 0 { + for iNdEx := len(m.Timestamps) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Timestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1a } } - if len(m.NonnullBytes) > 0 { - for _, msg := range m.NonnullBytes { - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableDurations) > 0 { + for iNdEx := len(m.NullableDurations) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableDurations[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.NullableTimestamps) > 0 { + for iNdEx := len(m.NullableTimestamps) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableTimestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *RepStdTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -7781,298 +7381,304 @@ } func (m *RepStdTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RepStdTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.NullableTimestamps) > 0 { - for _, msg := range m.NullableTimestamps { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*msg))) - n, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*msg, dAtA[i:]) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.NonnullBytes) > 0 { + for iNdEx := len(m.NonnullBytes) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdBytesMarshalTo(m.NonnullBytes[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes(m.NonnullBytes[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 } } - if len(m.NullableDurations) > 0 { - for _, msg := range m.NullableDurations { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*msg))) - n, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(*msg, dAtA[i:]) + if len(m.NullableBytes) > 0 { + for iNdEx := len(m.NullableBytes) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdBytesMarshalTo(*m.NullableBytes[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes(*m.NullableBytes[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa } } - if len(m.Timestamps) > 0 { - for _, msg := range m.Timestamps { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(msg))) - n, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(msg, dAtA[i:]) + if len(m.NonnullString) > 0 { + for iNdEx := len(m.NonnullString) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdStringMarshalTo(m.NonnullString[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString(m.NonnullString[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 } } - if len(m.Durations) > 0 { - for _, msg := range m.Durations { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(msg))) - n, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(msg, dAtA[i:]) + if len(m.NullableString) > 0 { + for iNdEx := len(m.NullableString) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdStringMarshalTo(*m.NullableString[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString(*m.NullableString[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a } } - if len(m.NullableDouble) > 0 { - for _, msg := range m.NullableDouble { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(*msg))) - n, err := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*msg, dAtA[i:]) + if len(m.NonnullBool) > 0 { + for iNdEx := len(m.NonnullBool) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdBoolMarshalTo(m.NonnullBool[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(m.NonnullBool[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 } } - if len(m.NonnullDouble) > 0 { - for _, msg := range m.NonnullDouble { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(msg))) - n, err := github_com_gogo_protobuf_types.StdDoubleMarshalTo(msg, dAtA[i:]) + if len(m.NullableBool) > 0 { + for iNdEx := len(m.NullableBool) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.NullableBool[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.NullableBool[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.NullableFloat) > 0 { - for _, msg := range m.NullableFloat { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(*msg))) - n, err := github_com_gogo_protobuf_types.StdFloatMarshalTo(*msg, dAtA[i:]) + if len(m.NonnullUInt32) > 0 { + for iNdEx := len(m.NonnullUInt32) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdUInt32MarshalTo(m.NonnullUInt32[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32(m.NonnullUInt32[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.NonnullFloat) > 0 { - for _, msg := range m.NonnullFloat { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(msg))) - n, err := github_com_gogo_protobuf_types.StdFloatMarshalTo(msg, dAtA[i:]) + if len(m.NullableUInt32) > 0 { + for iNdEx := len(m.NullableUInt32) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*m.NullableUInt32[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32(*m.NullableUInt32[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x7a } } - if len(m.NullableInt64) > 0 { - for _, msg := range m.NullableInt64 { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(*msg))) - n, err := github_com_gogo_protobuf_types.StdInt64MarshalTo(*msg, dAtA[i:]) + if len(m.NonnullInt32) > 0 { + for iNdEx := len(m.NonnullInt32) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdInt32MarshalTo(m.NonnullInt32[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(m.NonnullInt32[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x72 } } - if len(m.NonnullInt64) > 0 { - for _, msg := range m.NonnullInt64 { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(msg))) - n, err := github_com_gogo_protobuf_types.StdInt64MarshalTo(msg, dAtA[i:]) + if len(m.NullableInt32) > 0 { + for iNdEx := len(m.NullableInt32) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.NullableInt32[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(*m.NullableInt32[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x6a } } - if len(m.NullableUInt64) > 0 { - for _, msg := range m.NullableUInt64 { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(*msg))) - n, err := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*msg, dAtA[i:]) + if len(m.NonnullUInt64) > 0 { + for iNdEx := len(m.NonnullUInt64) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdUInt64MarshalTo(m.NonnullUInt64[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64(m.NonnullUInt64[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x62 } } - if len(m.NonnullUInt64) > 0 { - for _, msg := range m.NonnullUInt64 { - dAtA[i] = 0x62 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(msg))) - n, err := github_com_gogo_protobuf_types.StdUInt64MarshalTo(msg, dAtA[i:]) + if len(m.NullableUInt64) > 0 { + for iNdEx := len(m.NullableUInt64) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*m.NullableUInt64[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64(*m.NullableUInt64[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x5a } } - if len(m.NullableInt32) > 0 { - for _, msg := range m.NullableInt32 { - dAtA[i] = 0x6a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(*msg))) - n, err := github_com_gogo_protobuf_types.StdInt32MarshalTo(*msg, dAtA[i:]) + if len(m.NonnullInt64) > 0 { + for iNdEx := len(m.NonnullInt64) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdInt64MarshalTo(m.NonnullInt64[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64(m.NonnullInt64[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x52 } } - if len(m.NonnullInt32) > 0 { - for _, msg := range m.NonnullInt32 { - dAtA[i] = 0x72 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(msg))) - n, err := github_com_gogo_protobuf_types.StdInt32MarshalTo(msg, dAtA[i:]) + if len(m.NullableInt64) > 0 { + for iNdEx := len(m.NullableInt64) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdInt64MarshalTo(*m.NullableInt64[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64(*m.NullableInt64[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x4a } } - if len(m.NullableUInt32) > 0 { - for _, msg := range m.NullableUInt32 { - dAtA[i] = 0x7a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(*msg))) - n, err := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*msg, dAtA[i:]) + if len(m.NonnullFloat) > 0 { + for iNdEx := len(m.NonnullFloat) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdFloatMarshalTo(m.NonnullFloat[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(m.NonnullFloat[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x42 } } - if len(m.NonnullUInt32) > 0 { - for _, msg := range m.NonnullUInt32 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(msg))) - n, err := github_com_gogo_protobuf_types.StdUInt32MarshalTo(msg, dAtA[i:]) + if len(m.NullableFloat) > 0 { + for iNdEx := len(m.NullableFloat) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.NullableFloat[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(*m.NullableFloat[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x3a } } - if len(m.NullableBool) > 0 { - for _, msg := range m.NullableBool { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(*msg))) - n, err := github_com_gogo_protobuf_types.StdBoolMarshalTo(*msg, dAtA[i:]) + if len(m.NonnullDouble) > 0 { + for iNdEx := len(m.NonnullDouble) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdDoubleMarshalTo(m.NonnullDouble[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble(m.NonnullDouble[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x32 } } - if len(m.NonnullBool) > 0 { - for _, msg := range m.NonnullBool { - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(msg))) - n, err := github_com_gogo_protobuf_types.StdBoolMarshalTo(msg, dAtA[i:]) + if len(m.NullableDouble) > 0 { + for iNdEx := len(m.NullableDouble) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*m.NullableDouble[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble(*m.NullableDouble[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x2a } } - if len(m.NullableString) > 0 { - for _, msg := range m.NullableString { - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(*msg))) - n, err := github_com_gogo_protobuf_types.StdStringMarshalTo(*msg, dAtA[i:]) + if len(m.Durations) > 0 { + for iNdEx := len(m.Durations) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.Durations[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.Durations[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x22 } } - if len(m.NonnullString) > 0 { - for _, msg := range m.NonnullString { - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(msg))) - n, err := github_com_gogo_protobuf_types.StdStringMarshalTo(msg, dAtA[i:]) + if len(m.Timestamps) > 0 { + for iNdEx := len(m.Timestamps) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamps[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamps[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1a } } - if len(m.NullableBytes) > 0 { - for _, msg := range m.NullableBytes { - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(*msg))) - n, err := github_com_gogo_protobuf_types.StdBytesMarshalTo(*msg, dAtA[i:]) + if len(m.NullableDurations) > 0 { + for iNdEx := len(m.NullableDurations) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.NullableDurations[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.NullableDurations[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x12 } } - if len(m.NonnullBytes) > 0 { - for _, msg := range m.NonnullBytes { - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(msg))) - n, err := github_com_gogo_protobuf_types.StdBytesMarshalTo(msg, dAtA[i:]) + if len(m.NullableTimestamps) > 0 { + for iNdEx := len(m.NullableTimestamps) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.NullableTimestamps[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.NullableTimestamps[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *MapProtoTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -8080,606 +7686,546 @@ } func (m *MapProtoTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MapProtoTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.NullableTimestamp) > 0 { - for k := range m.NullableTimestamp { - dAtA[i] = 0xa - i++ - v := m.NullableTimestamp[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n56, err56 := v.MarshalTo(dAtA[i:]) - if err56 != nil { - return 0, err56 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.NonnullBytes) > 0 { + for k := range m.NonnullBytes { + v := m.NonnullBytes[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n56 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - } - } - if len(m.Timestamp) > 0 { - for k := range m.Timestamp { + i-- dAtA[i] = 0x12 - i++ - v := m.Timestamp[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n57, err57 := (&v).MarshalTo(dAtA[i:]) - if err57 != nil { - return 0, err57 - } - i += n57 + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 } } - if len(m.NullableDuration) > 0 { - for k := range m.NullableDuration { - dAtA[i] = 0x1a - i++ - v := m.NullableDuration[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableBytes) > 0 { + for k := range m.NullableBytes { + v := m.NullableBytes[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n58, err58 := v.MarshalTo(dAtA[i:]) - if err58 != nil { - return 0, err58 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n58 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa } } - if len(m.Duration) > 0 { - for k := range m.Duration { - dAtA[i] = 0x22 - i++ - v := m.Duration[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullString) > 0 { + for k := range m.NonnullString { + v := m.NonnullString[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n59, err59 := (&v).MarshalTo(dAtA[i:]) - if err59 != nil { - return 0, err59 - } - i += n59 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 } } - if len(m.NullableDouble) > 0 { - for k := range m.NullableDouble { - dAtA[i] = 0x2a - i++ - v := m.NullableDouble[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableString) > 0 { + for k := range m.NullableString { + v := m.NullableString[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n60, err60 := v.MarshalTo(dAtA[i:]) - if err60 != nil { - return 0, err60 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n60 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a } } - if len(m.NonnullDouble) > 0 { - for k := range m.NonnullDouble { - dAtA[i] = 0x32 - i++ - v := m.NonnullDouble[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullBool) > 0 { + for k := range m.NonnullBool { + v := m.NonnullBool[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n61, err61 := (&v).MarshalTo(dAtA[i:]) - if err61 != nil { - return 0, err61 - } - i += n61 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 } } - if len(m.NullableFloat) > 0 { - for k := range m.NullableFloat { - dAtA[i] = 0x3a - i++ - v := m.NullableFloat[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableBool) > 0 { + for k := range m.NullableBool { + v := m.NullableBool[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n62, err62 := v.MarshalTo(dAtA[i:]) - if err62 != nil { - return 0, err62 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n62 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.NonnullFloat) > 0 { - for k := range m.NonnullFloat { - dAtA[i] = 0x42 - i++ - v := m.NonnullFloat[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullUInt32) > 0 { + for k := range m.NonnullUInt32 { + v := m.NonnullUInt32[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n63, err63 := (&v).MarshalTo(dAtA[i:]) - if err63 != nil { - return 0, err63 - } - i += n63 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.NullableInt64) > 0 { - for k := range m.NullableInt64 { - dAtA[i] = 0x4a - i++ - v := m.NullableInt64[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableUInt32) > 0 { + for k := range m.NullableUInt32 { + v := m.NullableUInt32[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n64, err64 := v.MarshalTo(dAtA[i:]) - if err64 != nil { - return 0, err64 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n64 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.NonnullInt64) > 0 { - for k := range m.NonnullInt64 { - dAtA[i] = 0x52 - i++ - v := m.NonnullInt64[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullInt32) > 0 { + for k := range m.NonnullInt32 { + v := m.NonnullInt32[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n65, err65 := (&v).MarshalTo(dAtA[i:]) - if err65 != nil { - return 0, err65 - } - i += n65 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.NullableUInt64) > 0 { - for k := range m.NullableUInt64 { - dAtA[i] = 0x5a - i++ - v := m.NullableUInt64[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableInt32) > 0 { + for k := range m.NullableInt32 { + v := m.NullableInt32[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n66, err66 := v.MarshalTo(dAtA[i:]) - if err66 != nil { - return 0, err66 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n66 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } if len(m.NonnullUInt64) > 0 { for k := range m.NonnullUInt64 { - dAtA[i] = 0x62 - i++ v := m.NonnullUInt64[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n67, err67 := (&v).MarshalTo(dAtA[i:]) - if err67 != nil { - return 0, err67 - } - i += n67 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.NullableInt32) > 0 { - for k := range m.NullableInt32 { - dAtA[i] = 0x6a - i++ - v := m.NullableInt32[k] - msgSize := 0 + if len(m.NullableUInt64) > 0 { + for k := range m.NullableUInt64 { + v := m.NullableUInt64[k] + baseI := i if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintTypes(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n68, err68 := v.MarshalTo(dAtA[i:]) - if err68 != nil { - return 0, err68 + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a + } + } + if len(m.NonnullInt64) > 0 { + for k := range m.NonnullInt64 { + v := m.NonnullInt64[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n68 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } - if len(m.NonnullInt32) > 0 { - for k := range m.NonnullInt32 { - dAtA[i] = 0x72 - i++ - v := m.NonnullInt32[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NullableInt64) > 0 { + for k := range m.NullableInt64 { + v := m.NullableInt64[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n69, err69 := (&v).MarshalTo(dAtA[i:]) - if err69 != nil { - return 0, err69 - } - i += n69 + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } - if len(m.NullableUInt32) > 0 { - for k := range m.NullableUInt32 { - dAtA[i] = 0x7a - i++ - v := m.NullableUInt32[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullFloat) > 0 { + for k := range m.NonnullFloat { + v := m.NonnullFloat[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ + i-- + dAtA[i] = 0x12 i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 + } + } + if len(m.NullableFloat) > 0 { + for k := range m.NullableFloat { + v := m.NullableFloat[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n70, err70 := v.MarshalTo(dAtA[i:]) - if err70 != nil { - return 0, err70 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n70 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.NonnullUInt32) > 0 { - for k := range m.NonnullUInt32 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullUInt32[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullDouble) > 0 { + for k := range m.NonnullDouble { + v := m.NonnullDouble[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n71, err71 := (&v).MarshalTo(dAtA[i:]) - if err71 != nil { - return 0, err71 - } - i += n71 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.NullableBool) > 0 { - for k := range m.NullableBool { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableBool[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableDouble) > 0 { + for k := range m.NullableDouble { + v := m.NullableDouble[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n72, err72 := v.MarshalTo(dAtA[i:]) - if err72 != nil { - return 0, err72 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n72 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.NonnullBool) > 0 { - for k := range m.NonnullBool { - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullBool[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.Duration) > 0 { + for k := range m.Duration { + v := m.Duration[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n73, err73 := (&v).MarshalTo(dAtA[i:]) - if err73 != nil { - return 0, err73 - } - i += n73 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.NullableString) > 0 { - for k := range m.NullableString { - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableString[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableDuration) > 0 { + for k := range m.NullableDuration { + v := m.NullableDuration[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n74, err74 := v.MarshalTo(dAtA[i:]) - if err74 != nil { - return 0, err74 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n74 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.NonnullString) > 0 { - for k := range m.NonnullString { - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullString[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.Timestamp) > 0 { + for k := range m.Timestamp { + v := m.Timestamp[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ + i-- + dAtA[i] = 0x12 i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n75, err75 := (&v).MarshalTo(dAtA[i:]) - if err75 != nil { - return 0, err75 - } - i += n75 } } - if len(m.NullableBytes) > 0 { - for k := range m.NullableBytes { - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableBytes[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableTimestamp) > 0 { + for k := range m.NullableTimestamp { + v := m.NullableTimestamp[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n76, err76 := v.MarshalTo(dAtA[i:]) - if err76 != nil { - return 0, err76 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n76 - } - } - } - if len(m.NonnullBytes) > 0 { - for k := range m.NonnullBytes { - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullBytes[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + i-- + dAtA[i] = 0x12 } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n77, err77 := (&v).MarshalTo(dAtA[i:]) - if err77 != nil { - return 0, err77 - } - i += n77 + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *MapStdTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -8687,606 +8233,502 @@ } func (m *MapStdTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MapStdTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.NullableTimestamp) > 0 { - for k := range m.NullableTimestamp { - dAtA[i] = 0xa - i++ - v := m.NullableTimestamp[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdTime(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*v))) - n78, err78 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*v, dAtA[i:]) - if err78 != nil { - return 0, err78 - } - i += n78 - } - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Timestamp) > 0 { - for k := range m.Timestamp { - dAtA[i] = 0x12 - i++ - v := m.Timestamp[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdTime(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*(&v)))) - n79, err79 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullBytes) > 0 { + for k := range m.NonnullBytes { + v := m.NonnullBytes[k] + baseI := i + n79, err79 := github_com_gogo_protobuf_types.StdBytesMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes((*(&v))):]) if err79 != nil { return 0, err79 } - i += n79 + i -= n79 + i = encodeVarintTypes(dAtA, i, uint64(n79)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 } } - if len(m.NullableDuration) > 0 { - for k := range m.NullableDuration { - dAtA[i] = 0x1a - i++ - v := m.NullableDuration[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdDuration(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableBytes) > 0 { + for k := range m.NullableBytes { + v := m.NullableBytes[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*v))) - n80, err80 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*v, dAtA[i:]) + n80, err80 := github_com_gogo_protobuf_types.StdBytesMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes((*v)):]) if err80 != nil { return 0, err80 } - i += n80 + i -= n80 + i = encodeVarintTypes(dAtA, i, uint64(n80)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa } } - if len(m.Duration) > 0 { - for k := range m.Duration { - dAtA[i] = 0x22 - i++ - v := m.Duration[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdDuration(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*(&v)))) - n81, err81 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullString) > 0 { + for k := range m.NonnullString { + v := m.NonnullString[k] + baseI := i + n81, err81 := github_com_gogo_protobuf_types.StdStringMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString((*(&v))):]) if err81 != nil { return 0, err81 } - i += n81 + i -= n81 + i = encodeVarintTypes(dAtA, i, uint64(n81)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 } } - if len(m.NullableDouble) > 0 { - for k := range m.NullableDouble { - dAtA[i] = 0x2a - i++ - v := m.NullableDouble[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdDouble(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableString) > 0 { + for k := range m.NullableString { + v := m.NullableString[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(*v))) - n82, err82 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*v, dAtA[i:]) + n82, err82 := github_com_gogo_protobuf_types.StdStringMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString((*v)):]) if err82 != nil { return 0, err82 } - i += n82 + i -= n82 + i = encodeVarintTypes(dAtA, i, uint64(n82)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a } } - if len(m.NonnullDouble) > 0 { - for k := range m.NonnullDouble { - dAtA[i] = 0x32 - i++ - v := m.NonnullDouble[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdDouble(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(*(&v)))) - n83, err83 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullBool) > 0 { + for k := range m.NonnullBool { + v := m.NonnullBool[k] + baseI := i + n83, err83 := github_com_gogo_protobuf_types.StdBoolMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool((*(&v))):]) if err83 != nil { return 0, err83 } - i += n83 + i -= n83 + i = encodeVarintTypes(dAtA, i, uint64(n83)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 } } - if len(m.NullableFloat) > 0 { - for k := range m.NullableFloat { - dAtA[i] = 0x3a - i++ - v := m.NullableFloat[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdFloat(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableBool) > 0 { + for k := range m.NullableBool { + v := m.NullableBool[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(*v))) - n84, err84 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*v, dAtA[i:]) + n84, err84 := github_com_gogo_protobuf_types.StdBoolMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool((*v)):]) if err84 != nil { return 0, err84 } - i += n84 - } - } - } - if len(m.NonnullFloat) > 0 { - for k := range m.NonnullFloat { - dAtA[i] = 0x42 - i++ - v := m.NonnullFloat[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdFloat(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) + i -= n84 + i = encodeVarintTypes(dAtA, i, uint64(n84)) + i-- + dAtA[i] = 0x12 } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(*(&v)))) - n85, err85 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*(&v), dAtA[i:]) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } + } + if len(m.NonnullUInt32) > 0 { + for k := range m.NonnullUInt32 { + v := m.NonnullUInt32[k] + baseI := i + n85, err85 := github_com_gogo_protobuf_types.StdUInt32MarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32((*(&v))):]) if err85 != nil { return 0, err85 } - i += n85 + i -= n85 + i = encodeVarintTypes(dAtA, i, uint64(n85)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.NullableInt64) > 0 { - for k := range m.NullableInt64 { - dAtA[i] = 0x4a - i++ - v := m.NullableInt64[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdInt64(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableUInt32) > 0 { + for k := range m.NullableUInt32 { + v := m.NullableUInt32[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(*v))) - n86, err86 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*v, dAtA[i:]) + n86, err86 := github_com_gogo_protobuf_types.StdUInt32MarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32((*v)):]) if err86 != nil { return 0, err86 } - i += n86 + i -= n86 + i = encodeVarintTypes(dAtA, i, uint64(n86)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.NonnullInt64) > 0 { - for k := range m.NonnullInt64 { - dAtA[i] = 0x52 - i++ - v := m.NonnullInt64[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdInt64(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(*(&v)))) - n87, err87 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullInt32) > 0 { + for k := range m.NonnullInt32 { + v := m.NonnullInt32[k] + baseI := i + n87, err87 := github_com_gogo_protobuf_types.StdInt32MarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32((*(&v))):]) if err87 != nil { return 0, err87 } - i += n87 + i -= n87 + i = encodeVarintTypes(dAtA, i, uint64(n87)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.NullableUInt64) > 0 { - for k := range m.NullableUInt64 { - dAtA[i] = 0x5a - i++ - v := m.NullableUInt64[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdUInt64(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableInt32) > 0 { + for k := range m.NullableInt32 { + v := m.NullableInt32[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(*v))) - n88, err88 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*v, dAtA[i:]) + n88, err88 := github_com_gogo_protobuf_types.StdInt32MarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32((*v)):]) if err88 != nil { return 0, err88 } - i += n88 + i -= n88 + i = encodeVarintTypes(dAtA, i, uint64(n88)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } if len(m.NonnullUInt64) > 0 { for k := range m.NonnullUInt64 { - dAtA[i] = 0x62 - i++ v := m.NonnullUInt64[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdUInt64(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(*(&v)))) - n89, err89 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*(&v), dAtA[i:]) + baseI := i + n89, err89 := github_com_gogo_protobuf_types.StdUInt64MarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64((*(&v))):]) if err89 != nil { return 0, err89 } - i += n89 + i -= n89 + i = encodeVarintTypes(dAtA, i, uint64(n89)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.NullableInt32) > 0 { - for k := range m.NullableInt32 { - dAtA[i] = 0x6a - i++ - v := m.NullableInt32[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdInt32(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableUInt64) > 0 { + for k := range m.NullableUInt64 { + v := m.NullableUInt64[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(*v))) - n90, err90 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*v, dAtA[i:]) + n90, err90 := github_com_gogo_protobuf_types.StdUInt64MarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64((*v)):]) if err90 != nil { return 0, err90 } - i += n90 + i -= n90 + i = encodeVarintTypes(dAtA, i, uint64(n90)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a } } - if len(m.NonnullInt32) > 0 { - for k := range m.NonnullInt32 { - dAtA[i] = 0x72 - i++ - v := m.NonnullInt32[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdInt32(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(*(&v)))) - n91, err91 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullInt64) > 0 { + for k := range m.NonnullInt64 { + v := m.NonnullInt64[k] + baseI := i + n91, err91 := github_com_gogo_protobuf_types.StdInt64MarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64((*(&v))):]) if err91 != nil { return 0, err91 } - i += n91 + i -= n91 + i = encodeVarintTypes(dAtA, i, uint64(n91)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } - if len(m.NullableUInt32) > 0 { - for k := range m.NullableUInt32 { - dAtA[i] = 0x7a - i++ - v := m.NullableUInt32[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdUInt32(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableInt64) > 0 { + for k := range m.NullableInt64 { + v := m.NullableInt64[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(*v))) - n92, err92 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*v, dAtA[i:]) + n92, err92 := github_com_gogo_protobuf_types.StdInt64MarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64((*v)):]) if err92 != nil { return 0, err92 } - i += n92 + i -= n92 + i = encodeVarintTypes(dAtA, i, uint64(n92)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } - if len(m.NonnullUInt32) > 0 { - for k := range m.NonnullUInt32 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullUInt32[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdUInt32(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(*(&v)))) - n93, err93 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullFloat) > 0 { + for k := range m.NonnullFloat { + v := m.NonnullFloat[k] + baseI := i + n93, err93 := github_com_gogo_protobuf_types.StdFloatMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat((*(&v))):]) if err93 != nil { return 0, err93 } - i += n93 + i -= n93 + i = encodeVarintTypes(dAtA, i, uint64(n93)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.NullableBool) > 0 { - for k := range m.NullableBool { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableBool[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdBool(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableFloat) > 0 { + for k := range m.NullableFloat { + v := m.NullableFloat[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(*v))) - n94, err94 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*v, dAtA[i:]) + n94, err94 := github_com_gogo_protobuf_types.StdFloatMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat((*v)):]) if err94 != nil { return 0, err94 } - i += n94 + i -= n94 + i = encodeVarintTypes(dAtA, i, uint64(n94)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.NonnullBool) > 0 { - for k := range m.NonnullBool { - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullBool[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdBool(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(*(&v)))) - n95, err95 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullDouble) > 0 { + for k := range m.NonnullDouble { + v := m.NonnullDouble[k] + baseI := i + n95, err95 := github_com_gogo_protobuf_types.StdDoubleMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble((*(&v))):]) if err95 != nil { return 0, err95 } - i += n95 + i -= n95 + i = encodeVarintTypes(dAtA, i, uint64(n95)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.NullableString) > 0 { - for k := range m.NullableString { - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableString[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdString(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableDouble) > 0 { + for k := range m.NullableDouble { + v := m.NullableDouble[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(*v))) - n96, err96 := github_com_gogo_protobuf_types.StdStringMarshalTo(*v, dAtA[i:]) + n96, err96 := github_com_gogo_protobuf_types.StdDoubleMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble((*v)):]) if err96 != nil { return 0, err96 } - i += n96 + i -= n96 + i = encodeVarintTypes(dAtA, i, uint64(n96)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.NonnullString) > 0 { - for k := range m.NonnullString { - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullString[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdString(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(*(&v)))) - n97, err97 := github_com_gogo_protobuf_types.StdStringMarshalTo(*(&v), dAtA[i:]) + if len(m.Duration) > 0 { + for k := range m.Duration { + v := m.Duration[k] + baseI := i + n97, err97 := github_com_gogo_protobuf_types.StdDurationMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration((*(&v))):]) if err97 != nil { return 0, err97 } - i += n97 + i -= n97 + i = encodeVarintTypes(dAtA, i, uint64(n97)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.NullableBytes) > 0 { - for k := range m.NullableBytes { - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableBytes[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdBytes(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableDuration) > 0 { + for k := range m.NullableDuration { + v := m.NullableDuration[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(*v))) - n98, err98 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*v, dAtA[i:]) + n98, err98 := github_com_gogo_protobuf_types.StdDurationMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration((*v)):]) if err98 != nil { return 0, err98 } - i += n98 + i -= n98 + i = encodeVarintTypes(dAtA, i, uint64(n98)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.NonnullBytes) > 0 { - for k := range m.NonnullBytes { - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullBytes[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdBytes(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(*(&v)))) - n99, err99 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*(&v), dAtA[i:]) + if len(m.Timestamp) > 0 { + for k := range m.Timestamp { + v := m.Timestamp[k] + baseI := i + n99, err99 := github_com_gogo_protobuf_types.StdTimeMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime((*(&v))):]) if err99 != nil { return 0, err99 } - i += n99 + i -= n99 + i = encodeVarintTypes(dAtA, i, uint64(n99)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.NullableTimestamp) > 0 { + for k := range m.NullableTimestamp { + v := m.NullableTimestamp[k] + baseI := i + if v != nil { + n100, err100 := github_com_gogo_protobuf_types.StdTimeMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime((*v)):]) + if err100 != nil { + return 0, err100 + } + i -= n100 + i = encodeVarintTypes(dAtA, i, uint64(n100)) + i-- + dAtA[i] = 0x12 + } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -9294,181 +8736,266 @@ } func (m *OneofProtoTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.OneOfProtoTimes != nil { - nn100, err100 := m.OneOfProtoTimes.MarshalTo(dAtA[i:]) - if err100 != nil { - return 0, err100 + { + size := m.OneOfProtoTimes.Size() + i -= size + if _, err := m.OneOfProtoTimes.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn100 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_Timestamp) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_Timestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Timestamp != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Timestamp.Size())) - n101, err101 := m.Timestamp.MarshalTo(dAtA[i:]) - if err101 != nil { - return 0, err101 + { + size, err := m.Timestamp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n101 + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_Duration) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_Duration) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Duration != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Duration.Size())) - n102, err102 := m.Duration.MarshalTo(dAtA[i:]) - if err102 != nil { - return 0, err102 + { + size, err := m.Duration.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n102 + i-- + dAtA[i] = 0x12 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepDouble) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepDouble) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepDouble != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepDouble.Size())) - n103, err103 := m.RepDouble.MarshalTo(dAtA[i:]) - if err103 != nil { - return 0, err103 + { + size, err := m.RepDouble.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n103 + i-- + dAtA[i] = 0x1a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepFloat) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepFloat) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepFloat != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepFloat.Size())) - n104, err104 := m.RepFloat.MarshalTo(dAtA[i:]) - if err104 != nil { - return 0, err104 + { + size, err := m.RepFloat.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n104 + i-- + dAtA[i] = 0x22 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepInt64) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepInt64) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepInt64 != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepInt64.Size())) - n105, err105 := m.RepInt64.MarshalTo(dAtA[i:]) - if err105 != nil { - return 0, err105 + { + size, err := m.RepInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n105 + i-- + dAtA[i] = 0x2a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepUInt64) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepUInt64) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepUInt64 != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepUInt64.Size())) - n106, err106 := m.RepUInt64.MarshalTo(dAtA[i:]) - if err106 != nil { - return 0, err106 + { + size, err := m.RepUInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n106 + i-- + dAtA[i] = 0x32 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepInt32) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepInt32) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepInt32 != nil { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepInt32.Size())) - n107, err107 := m.RepInt32.MarshalTo(dAtA[i:]) - if err107 != nil { - return 0, err107 + { + size, err := m.RepInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n107 + i-- + dAtA[i] = 0x3a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepUInt32) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepUInt32) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepUInt32 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepUInt32.Size())) - n108, err108 := m.RepUInt32.MarshalTo(dAtA[i:]) - if err108 != nil { - return 0, err108 + { + size, err := m.RepUInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n108 + i-- + dAtA[i] = 0x42 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepBool) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepBool) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepBool != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepBool.Size())) - n109, err109 := m.RepBool.MarshalTo(dAtA[i:]) - if err109 != nil { - return 0, err109 + { + size, err := m.RepBool.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n109 + i-- + dAtA[i] = 0x4a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepString) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepString) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepString != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepString.Size())) - n110, err110 := m.RepString.MarshalTo(dAtA[i:]) - if err110 != nil { - return 0, err110 + { + size, err := m.RepString.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n110 + i-- + dAtA[i] = 0x52 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepBytes) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepBytes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepBytes != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepBytes.Size())) - n111, err111 := m.RepBytes.MarshalTo(dAtA[i:]) - if err111 != nil { - return 0, err111 + { + size, err := m.RepBytes.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n111 + i-- + dAtA[i] = 0x5a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -9476,260 +9003,328 @@ } func (m *OneofStdTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.OneOfStdTimes != nil { - nn112, err112 := m.OneOfStdTimes.MarshalTo(dAtA[i:]) - if err112 != nil { - return 0, err112 + { + size := m.OneOfStdTimes.Size() + i -= size + if _, err := m.OneOfStdTimes.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn112 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_Timestamp) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_Timestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Timestamp != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.Timestamp))) - n113, err113 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.Timestamp, dAtA[i:]) - if err113 != nil { - return 0, err113 + n112, err112 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.Timestamp):]) + if err112 != nil { + return 0, err112 } - i += n113 + i -= n112 + i = encodeVarintTypes(dAtA, i, uint64(n112)) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_Duration) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_Duration) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Duration != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Duration))) - n114, err114 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Duration, dAtA[i:]) - if err114 != nil { - return 0, err114 + n113, err113 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Duration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Duration):]) + if err113 != nil { + return 0, err113 } - i += n114 + i -= n113 + i = encodeVarintTypes(dAtA, i, uint64(n113)) + i-- + dAtA[i] = 0x12 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepDouble) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepDouble) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepDouble != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(*m.RepDouble))) - n115, err115 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*m.RepDouble, dAtA[i:]) - if err115 != nil { - return 0, err115 + n114, err114 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*m.RepDouble, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble(*m.RepDouble):]) + if err114 != nil { + return 0, err114 } - i += n115 + i -= n114 + i = encodeVarintTypes(dAtA, i, uint64(n114)) + i-- + dAtA[i] = 0x1a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepFloat) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepFloat) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepFloat != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(*m.RepFloat))) - n116, err116 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.RepFloat, dAtA[i:]) - if err116 != nil { - return 0, err116 + n115, err115 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.RepFloat, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(*m.RepFloat):]) + if err115 != nil { + return 0, err115 } - i += n116 + i -= n115 + i = encodeVarintTypes(dAtA, i, uint64(n115)) + i-- + dAtA[i] = 0x22 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepInt64) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepInt64) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepInt64 != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(*m.RepInt64))) - n117, err117 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*m.RepInt64, dAtA[i:]) - if err117 != nil { - return 0, err117 + n116, err116 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*m.RepInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64(*m.RepInt64):]) + if err116 != nil { + return 0, err116 } - i += n117 + i -= n116 + i = encodeVarintTypes(dAtA, i, uint64(n116)) + i-- + dAtA[i] = 0x2a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepUInt64) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepUInt64) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepUInt64 != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(*m.RepUInt64))) - n118, err118 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*m.RepUInt64, dAtA[i:]) - if err118 != nil { - return 0, err118 + n117, err117 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*m.RepUInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64(*m.RepUInt64):]) + if err117 != nil { + return 0, err117 } - i += n118 + i -= n117 + i = encodeVarintTypes(dAtA, i, uint64(n117)) + i-- + dAtA[i] = 0x32 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepInt32) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepInt32) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepInt32 != nil { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(*m.RepInt32))) - n119, err119 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.RepInt32, dAtA[i:]) - if err119 != nil { - return 0, err119 + n118, err118 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.RepInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(*m.RepInt32):]) + if err118 != nil { + return 0, err118 } - i += n119 + i -= n118 + i = encodeVarintTypes(dAtA, i, uint64(n118)) + i-- + dAtA[i] = 0x3a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepUInt32) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepUInt32) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepUInt32 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(*m.RepUInt32))) - n120, err120 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*m.RepUInt32, dAtA[i:]) - if err120 != nil { - return 0, err120 + n119, err119 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*m.RepUInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32(*m.RepUInt32):]) + if err119 != nil { + return 0, err119 } - i += n120 + i -= n119 + i = encodeVarintTypes(dAtA, i, uint64(n119)) + i-- + dAtA[i] = 0x42 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepBool) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepBool) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepBool != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(*m.RepBool))) - n121, err121 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.RepBool, dAtA[i:]) - if err121 != nil { - return 0, err121 + n120, err120 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.RepBool, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.RepBool):]) + if err120 != nil { + return 0, err120 } - i += n121 + i -= n120 + i = encodeVarintTypes(dAtA, i, uint64(n120)) + i-- + dAtA[i] = 0x4a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepString) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepString) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepString != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(*m.RepString))) - n122, err122 := github_com_gogo_protobuf_types.StdStringMarshalTo(*m.RepString, dAtA[i:]) - if err122 != nil { - return 0, err122 + n121, err121 := github_com_gogo_protobuf_types.StdStringMarshalTo(*m.RepString, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString(*m.RepString):]) + if err121 != nil { + return 0, err121 } - i += n122 + i -= n121 + i = encodeVarintTypes(dAtA, i, uint64(n121)) + i-- + dAtA[i] = 0x52 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepBytes) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepBytes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepBytes != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(*m.RepBytes))) - n123, err123 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*m.RepBytes, dAtA[i:]) - if err123 != nil { - return 0, err123 + n122, err122 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*m.RepBytes, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes(*m.RepBytes):]) + if err122 != nil { + return 0, err122 } - i += n123 + i -= n122 + i = encodeVarintTypes(dAtA, i, uint64(n122)) + i-- + dAtA[i] = 0x5a } - return i, nil + return len(dAtA) - i, nil } func encodeVarintTypes(dAtA []byte, offset int, v uint64) int { + offset -= sovTypes(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedKnownTypes(r randyTypes, easy bool) *KnownTypes { this := &KnownTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Dur = types.NewPopulatedDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Ts = types.NewPopulatedTimestamp(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Dbl = types.NewPopulatedDoubleValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Flt = types.NewPopulatedFloatValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.I64 = types.NewPopulatedInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.U64 = types.NewPopulatedUInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.I32 = types.NewPopulatedInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.U32 = types.NewPopulatedUInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bool = types.NewPopulatedBoolValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Str = types.NewPopulatedStringValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bytes = types.NewPopulatedBytesValue(r, easy) } + if r.Intn(5) != 0 { + this.St = types.NewPopulatedStruct(r, easy) + } if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedTypes(r, 12) + this.XXX_unrecognized = randUnrecognizedTypes(r, 13) } return this } func NewPopulatedProtoTypes(r randyTypes, easy bool) *ProtoTypes { this := &ProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableTimestamp = types.NewPopulatedTimestamp(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDuration = types.NewPopulatedDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDouble = types.NewPopulatedDoubleValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableFloat = types.NewPopulatedFloatValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt64 = types.NewPopulatedInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt64 = types.NewPopulatedUInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt32 = types.NewPopulatedInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt32 = types.NewPopulatedUInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBool = types.NewPopulatedBoolValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableString = types.NewPopulatedStringValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBytes = types.NewPopulatedBytesValue(r, easy) } v1 := types.NewPopulatedTimestamp(r, easy) @@ -9762,37 +9357,37 @@ func NewPopulatedStdTypes(r randyTypes, easy bool) *StdTypes { this := &StdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableTimestamp = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDuration = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDouble = github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableFloat = github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt64 = github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt64 = github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt32 = github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt32 = github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBool = github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableString = github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBytes = github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) } v12 := github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) @@ -9825,21 +9420,21 @@ func NewPopulatedRepProtoTypes(r randyTypes, easy bool) *RepProtoTypes { this := &RepProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(5) this.NullableTimestamps = make([]*types.Timestamp, v23) for i := 0; i < v23; i++ { this.NullableTimestamps[i] = types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(5) this.NullableDurations = make([]*types.Duration, v24) for i := 0; i < v24; i++ { this.NullableDurations[i] = types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(5) this.Timestamps = make([]types.Timestamp, v25) for i := 0; i < v25; i++ { @@ -9847,7 +9442,7 @@ this.Timestamps[i] = *v26 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(5) this.Durations = make([]types.Duration, v27) for i := 0; i < v27; i++ { @@ -9855,14 +9450,14 @@ this.Durations[i] = *v28 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(5) this.NullableDouble = make([]*types.DoubleValue, v29) for i := 0; i < v29; i++ { this.NullableDouble[i] = types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(5) this.NonnullDouble = make([]types.DoubleValue, v30) for i := 0; i < v30; i++ { @@ -9870,14 +9465,14 @@ this.NonnullDouble[i] = *v31 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(5) this.NullableFloat = make([]*types.FloatValue, v32) for i := 0; i < v32; i++ { this.NullableFloat[i] = types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(5) this.NonnullFloat = make([]types.FloatValue, v33) for i := 0; i < v33; i++ { @@ -9885,14 +9480,14 @@ this.NonnullFloat[i] = *v34 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(5) this.NullableInt64 = make([]*types.Int64Value, v35) for i := 0; i < v35; i++ { this.NullableInt64[i] = types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(5) this.NonnullInt64 = make([]types.Int64Value, v36) for i := 0; i < v36; i++ { @@ -9900,14 +9495,14 @@ this.NonnullInt64[i] = *v37 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(5) this.NullableUInt64 = make([]*types.UInt64Value, v38) for i := 0; i < v38; i++ { this.NullableUInt64[i] = types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(5) this.NonnullUInt64 = make([]types.UInt64Value, v39) for i := 0; i < v39; i++ { @@ -9915,14 +9510,14 @@ this.NonnullUInt64[i] = *v40 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(5) this.NullableInt32 = make([]*types.Int32Value, v41) for i := 0; i < v41; i++ { this.NullableInt32[i] = types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(5) this.NonnullInt32 = make([]types.Int32Value, v42) for i := 0; i < v42; i++ { @@ -9930,14 +9525,14 @@ this.NonnullInt32[i] = *v43 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(5) this.NullableUInt32 = make([]*types.UInt32Value, v44) for i := 0; i < v44; i++ { this.NullableUInt32[i] = types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(5) this.NonnullUInt32 = make([]types.UInt32Value, v45) for i := 0; i < v45; i++ { @@ -9945,14 +9540,14 @@ this.NonnullUInt32[i] = *v46 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(5) this.NullableBool = make([]*types.BoolValue, v47) for i := 0; i < v47; i++ { this.NullableBool[i] = types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v48 := r.Intn(5) this.NonnullBool = make([]types.BoolValue, v48) for i := 0; i < v48; i++ { @@ -9960,14 +9555,14 @@ this.NonnullBool[i] = *v49 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(5) this.NullableString = make([]*types.StringValue, v50) for i := 0; i < v50; i++ { this.NullableString[i] = types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(5) this.NonnullString = make([]types.StringValue, v51) for i := 0; i < v51; i++ { @@ -9975,14 +9570,14 @@ this.NonnullString[i] = *v52 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(5) this.NullableBytes = make([]*types.BytesValue, v53) for i := 0; i < v53; i++ { this.NullableBytes[i] = types.NewPopulatedBytesValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(5) this.NonnullBytes = make([]types.BytesValue, v54) for i := 0; i < v54; i++ { @@ -9998,21 +9593,21 @@ func NewPopulatedRepStdTypes(r randyTypes, easy bool) *RepStdTypes { this := &RepStdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(5) this.NullableTimestamps = make([]*time.Time, v56) for i := 0; i < v56; i++ { this.NullableTimestamps[i] = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(5) this.NullableDurations = make([]*time.Duration, v57) for i := 0; i < v57; i++ { this.NullableDurations[i] = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(5) this.Timestamps = make([]time.Time, v58) for i := 0; i < v58; i++ { @@ -10020,7 +9615,7 @@ this.Timestamps[i] = *v59 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(5) this.Durations = make([]time.Duration, v60) for i := 0; i < v60; i++ { @@ -10028,14 +9623,14 @@ this.Durations[i] = *v61 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(5) this.NullableDouble = make([]*float64, v62) for i := 0; i < v62; i++ { this.NullableDouble[i] = github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(5) this.NonnullDouble = make([]float64, v63) for i := 0; i < v63; i++ { @@ -10043,14 +9638,14 @@ this.NonnullDouble[i] = *v64 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(5) this.NullableFloat = make([]*float32, v65) for i := 0; i < v65; i++ { this.NullableFloat[i] = github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v66 := r.Intn(5) this.NonnullFloat = make([]float32, v66) for i := 0; i < v66; i++ { @@ -10058,14 +9653,14 @@ this.NonnullFloat[i] = *v67 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(5) this.NullableInt64 = make([]*int64, v68) for i := 0; i < v68; i++ { this.NullableInt64[i] = github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(5) this.NonnullInt64 = make([]int64, v69) for i := 0; i < v69; i++ { @@ -10073,14 +9668,14 @@ this.NonnullInt64[i] = *v70 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(5) this.NullableUInt64 = make([]*uint64, v71) for i := 0; i < v71; i++ { this.NullableUInt64[i] = github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v72 := r.Intn(5) this.NonnullUInt64 = make([]uint64, v72) for i := 0; i < v72; i++ { @@ -10088,14 +9683,14 @@ this.NonnullUInt64[i] = *v73 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v74 := r.Intn(5) this.NullableInt32 = make([]*int32, v74) for i := 0; i < v74; i++ { this.NullableInt32[i] = github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v75 := r.Intn(5) this.NonnullInt32 = make([]int32, v75) for i := 0; i < v75; i++ { @@ -10103,14 +9698,14 @@ this.NonnullInt32[i] = *v76 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v77 := r.Intn(5) this.NullableUInt32 = make([]*uint32, v77) for i := 0; i < v77; i++ { this.NullableUInt32[i] = github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v78 := r.Intn(5) this.NonnullUInt32 = make([]uint32, v78) for i := 0; i < v78; i++ { @@ -10118,14 +9713,14 @@ this.NonnullUInt32[i] = *v79 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v80 := r.Intn(5) this.NullableBool = make([]*bool, v80) for i := 0; i < v80; i++ { this.NullableBool[i] = github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v81 := r.Intn(5) this.NonnullBool = make([]bool, v81) for i := 0; i < v81; i++ { @@ -10133,14 +9728,14 @@ this.NonnullBool[i] = *v82 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v83 := r.Intn(5) this.NullableString = make([]*string, v83) for i := 0; i < v83; i++ { this.NullableString[i] = github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v84 := r.Intn(5) this.NonnullString = make([]string, v84) for i := 0; i < v84; i++ { @@ -10148,14 +9743,14 @@ this.NonnullString[i] = *v85 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v86 := r.Intn(5) this.NullableBytes = make([]*[]byte, v86) for i := 0; i < v86; i++ { this.NullableBytes[i] = github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v87 := r.Intn(5) this.NonnullBytes = make([][]byte, v87) for i := 0; i < v87; i++ { @@ -10171,154 +9766,154 @@ func NewPopulatedMapProtoTypes(r randyTypes, easy bool) *MapProtoTypes { this := &MapProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v89 := r.Intn(10) this.NullableTimestamp = make(map[int32]*types.Timestamp) for i := 0; i < v89; i++ { this.NullableTimestamp[int32(r.Int31())] = types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v90 := r.Intn(10) this.Timestamp = make(map[int32]types.Timestamp) for i := 0; i < v90; i++ { this.Timestamp[int32(r.Int31())] = *types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v91 := r.Intn(10) this.NullableDuration = make(map[int32]*types.Duration) for i := 0; i < v91; i++ { this.NullableDuration[int32(r.Int31())] = types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v92 := r.Intn(10) this.Duration = make(map[int32]types.Duration) for i := 0; i < v92; i++ { this.Duration[int32(r.Int31())] = *types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v93 := r.Intn(10) this.NullableDouble = make(map[int32]*types.DoubleValue) for i := 0; i < v93; i++ { this.NullableDouble[int32(r.Int31())] = types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v94 := r.Intn(10) this.NonnullDouble = make(map[int32]types.DoubleValue) for i := 0; i < v94; i++ { this.NonnullDouble[int32(r.Int31())] = *types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v95 := r.Intn(10) this.NullableFloat = make(map[int32]*types.FloatValue) for i := 0; i < v95; i++ { this.NullableFloat[int32(r.Int31())] = types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v96 := r.Intn(10) this.NonnullFloat = make(map[int32]types.FloatValue) for i := 0; i < v96; i++ { this.NonnullFloat[int32(r.Int31())] = *types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v97 := r.Intn(10) this.NullableInt64 = make(map[int32]*types.Int64Value) for i := 0; i < v97; i++ { this.NullableInt64[int32(r.Int31())] = types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v98 := r.Intn(10) this.NonnullInt64 = make(map[int32]types.Int64Value) for i := 0; i < v98; i++ { this.NonnullInt64[int32(r.Int31())] = *types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v99 := r.Intn(10) this.NullableUInt64 = make(map[int32]*types.UInt64Value) for i := 0; i < v99; i++ { this.NullableUInt64[int32(r.Int31())] = types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v100 := r.Intn(10) this.NonnullUInt64 = make(map[int32]types.UInt64Value) for i := 0; i < v100; i++ { this.NonnullUInt64[int32(r.Int31())] = *types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v101 := r.Intn(10) this.NullableInt32 = make(map[int32]*types.Int32Value) for i := 0; i < v101; i++ { this.NullableInt32[int32(r.Int31())] = types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v102 := r.Intn(10) this.NonnullInt32 = make(map[int32]types.Int32Value) for i := 0; i < v102; i++ { this.NonnullInt32[int32(r.Int31())] = *types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v103 := r.Intn(10) this.NullableUInt32 = make(map[int32]*types.UInt32Value) for i := 0; i < v103; i++ { this.NullableUInt32[int32(r.Int31())] = types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v104 := r.Intn(10) this.NonnullUInt32 = make(map[int32]types.UInt32Value) for i := 0; i < v104; i++ { this.NonnullUInt32[int32(r.Int31())] = *types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v105 := r.Intn(10) this.NullableBool = make(map[int32]*types.BoolValue) for i := 0; i < v105; i++ { this.NullableBool[int32(r.Int31())] = types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v106 := r.Intn(10) this.NonnullBool = make(map[int32]types.BoolValue) for i := 0; i < v106; i++ { this.NonnullBool[int32(r.Int31())] = *types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v107 := r.Intn(10) this.NullableString = make(map[int32]*types.StringValue) for i := 0; i < v107; i++ { this.NullableString[int32(r.Int31())] = types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v108 := r.Intn(10) this.NonnullString = make(map[int32]types.StringValue) for i := 0; i < v108; i++ { this.NonnullString[int32(r.Int31())] = *types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v109 := r.Intn(10) this.NullableBytes = make(map[int32]*types.BytesValue) for i := 0; i < v109; i++ { this.NullableBytes[int32(r.Int31())] = types.NewPopulatedBytesValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v110 := r.Intn(10) this.NonnullBytes = make(map[int32]types.BytesValue) for i := 0; i < v110; i++ { @@ -10333,154 +9928,154 @@ func NewPopulatedMapStdTypes(r randyTypes, easy bool) *MapStdTypes { this := &MapStdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v111 := r.Intn(10) this.NullableTimestamp = make(map[int32]*time.Time) for i := 0; i < v111; i++ { this.NullableTimestamp[int32(r.Int31())] = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v112 := r.Intn(10) this.Timestamp = make(map[int32]time.Time) for i := 0; i < v112; i++ { this.Timestamp[int32(r.Int31())] = *github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v113 := r.Intn(10) this.NullableDuration = make(map[int32]*time.Duration) for i := 0; i < v113; i++ { this.NullableDuration[int32(r.Int31())] = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v114 := r.Intn(10) this.Duration = make(map[int32]time.Duration) for i := 0; i < v114; i++ { this.Duration[int32(r.Int31())] = *github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v115 := r.Intn(10) this.NullableDouble = make(map[int32]*float64) for i := 0; i < v115; i++ { this.NullableDouble[int32(r.Int31())] = (*float64)(github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v116 := r.Intn(10) this.NonnullDouble = make(map[int32]float64) for i := 0; i < v116; i++ { this.NonnullDouble[int32(r.Int31())] = (float64)(*github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v117 := r.Intn(10) this.NullableFloat = make(map[int32]*float32) for i := 0; i < v117; i++ { this.NullableFloat[int32(r.Int31())] = (*float32)(github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v118 := r.Intn(10) this.NonnullFloat = make(map[int32]float32) for i := 0; i < v118; i++ { this.NonnullFloat[int32(r.Int31())] = (float32)(*github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v119 := r.Intn(10) this.NullableInt64 = make(map[int32]*int64) for i := 0; i < v119; i++ { this.NullableInt64[int32(r.Int31())] = (*int64)(github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v120 := r.Intn(10) this.NonnullInt64 = make(map[int32]int64) for i := 0; i < v120; i++ { this.NonnullInt64[int32(r.Int31())] = (int64)(*github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v121 := r.Intn(10) this.NullableUInt64 = make(map[int32]*uint64) for i := 0; i < v121; i++ { this.NullableUInt64[int32(r.Int31())] = (*uint64)(github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v122 := r.Intn(10) this.NonnullUInt64 = make(map[int32]uint64) for i := 0; i < v122; i++ { this.NonnullUInt64[int32(r.Int31())] = (uint64)(*github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v123 := r.Intn(10) this.NullableInt32 = make(map[int32]*int32) for i := 0; i < v123; i++ { this.NullableInt32[int32(r.Int31())] = (*int32)(github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v124 := r.Intn(10) this.NonnullInt32 = make(map[int32]int32) for i := 0; i < v124; i++ { this.NonnullInt32[int32(r.Int31())] = (int32)(*github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v125 := r.Intn(10) this.NullableUInt32 = make(map[int32]*uint32) for i := 0; i < v125; i++ { this.NullableUInt32[int32(r.Int31())] = (*uint32)(github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v126 := r.Intn(10) this.NonnullUInt32 = make(map[int32]uint32) for i := 0; i < v126; i++ { this.NonnullUInt32[int32(r.Int31())] = (uint32)(*github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v127 := r.Intn(10) this.NullableBool = make(map[int32]*bool) for i := 0; i < v127; i++ { this.NullableBool[int32(r.Int31())] = (*bool)(github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v128 := r.Intn(10) this.NonnullBool = make(map[int32]bool) for i := 0; i < v128; i++ { this.NonnullBool[int32(r.Int31())] = (bool)(*github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v129 := r.Intn(10) this.NullableString = make(map[int32]*string) for i := 0; i < v129; i++ { this.NullableString[int32(r.Int31())] = (*string)(github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v130 := r.Intn(10) this.NonnullString = make(map[int32]string) for i := 0; i < v130; i++ { this.NonnullString[int32(r.Int31())] = (string)(*github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v131 := r.Intn(10) this.NullableBytes = make(map[int32]*[]byte) for i := 0; i < v131; i++ { this.NullableBytes[int32(r.Int31())] = (*[]byte)(github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v132 := r.Intn(10) this.NonnullBytes = make(map[int32][]byte) for i := 0; i < v132; i++ { @@ -10792,6 +10387,10 @@ l = m.Bytes.Size() n += 1 + l + sovTypes(uint64(l)) } + if m.St != nil { + l = m.St.Size() + n += 1 + l + sovTypes(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -12476,6 +12075,42 @@ return err } iNdEx = postIndex + case 12: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field St", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.St == nil { + m.St = &types.Struct{} + } + if err := m.St.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -21758,6 +21393,7 @@ func skipTypes(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -21789,10 +21425,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -21813,55 +21447,30 @@ return 0, ErrInvalidLengthTypes } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthTypes - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTypes - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipTypes(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthTypes - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTypes + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthTypes + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTypes = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/both/types.proto golang-gogoprotobuf-1.3.1/test/types/combos/both/types.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/both/types.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/types/combos/both/types.proto 2020-05-17 12:22:58.000000000 +0000 @@ -34,7 +34,7 @@ //import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; -//import "google/protobuf/struct.proto"; +import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; @@ -64,7 +64,7 @@ google.protobuf.BytesValue bytes = 11; // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed - // google.protobuf.Struct st = 12; + google.protobuf.Struct st = 12; // google.protobuf.Any an = 14; } @@ -134,7 +134,7 @@ repeated google.protobuf.FloatValue nullableFloat = 7; repeated google.protobuf.FloatValue nonnullFloat = 8 [(gogoproto.nullable) = false]; - + repeated google.protobuf.Int64Value nullableInt64 = 9; repeated google.protobuf.Int64Value nonnullInt64 = 10 [(gogoproto.nullable) = false]; diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/marshaler/types.pb.go golang-gogoprotobuf-1.3.1/test/types/combos/marshaler/types.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/marshaler/types.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/types/combos/marshaler/types.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -25,23 +25,25 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type KnownTypes struct { - Dur *types.Duration `protobuf:"bytes,1,opt,name=dur,proto3" json:"dur,omitempty"` - Ts *types.Timestamp `protobuf:"bytes,2,opt,name=ts,proto3" json:"ts,omitempty"` - Dbl *types.DoubleValue `protobuf:"bytes,3,opt,name=dbl,proto3" json:"dbl,omitempty"` - Flt *types.FloatValue `protobuf:"bytes,4,opt,name=flt,proto3" json:"flt,omitempty"` - I64 *types.Int64Value `protobuf:"bytes,5,opt,name=i64,proto3" json:"i64,omitempty"` - U64 *types.UInt64Value `protobuf:"bytes,6,opt,name=u64,proto3" json:"u64,omitempty"` - I32 *types.Int32Value `protobuf:"bytes,7,opt,name=i32,proto3" json:"i32,omitempty"` - U32 *types.UInt32Value `protobuf:"bytes,8,opt,name=u32,proto3" json:"u32,omitempty"` - Bool *types.BoolValue `protobuf:"bytes,9,opt,name=bool,proto3" json:"bool,omitempty"` - Str *types.StringValue `protobuf:"bytes,10,opt,name=str,proto3" json:"str,omitempty"` - Bytes *types.BytesValue `protobuf:"bytes,11,opt,name=bytes,proto3" json:"bytes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Dur *types.Duration `protobuf:"bytes,1,opt,name=dur,proto3" json:"dur,omitempty"` + Ts *types.Timestamp `protobuf:"bytes,2,opt,name=ts,proto3" json:"ts,omitempty"` + Dbl *types.DoubleValue `protobuf:"bytes,3,opt,name=dbl,proto3" json:"dbl,omitempty"` + Flt *types.FloatValue `protobuf:"bytes,4,opt,name=flt,proto3" json:"flt,omitempty"` + I64 *types.Int64Value `protobuf:"bytes,5,opt,name=i64,proto3" json:"i64,omitempty"` + U64 *types.UInt64Value `protobuf:"bytes,6,opt,name=u64,proto3" json:"u64,omitempty"` + I32 *types.Int32Value `protobuf:"bytes,7,opt,name=i32,proto3" json:"i32,omitempty"` + U32 *types.UInt32Value `protobuf:"bytes,8,opt,name=u32,proto3" json:"u32,omitempty"` + Bool *types.BoolValue `protobuf:"bytes,9,opt,name=bool,proto3" json:"bool,omitempty"` + Str *types.StringValue `protobuf:"bytes,10,opt,name=str,proto3" json:"str,omitempty"` + Bytes *types.BytesValue `protobuf:"bytes,11,opt,name=bytes,proto3" json:"bytes,omitempty"` + // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed + St *types.Struct `protobuf:"bytes,12,opt,name=st,proto3" json:"st,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *KnownTypes) Reset() { *m = KnownTypes{} } @@ -58,7 +60,7 @@ return xxx_messageInfo_KnownTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -154,6 +156,13 @@ return nil } +func (m *KnownTypes) GetSt() *types.Struct { + if m != nil { + return m.St + } + return nil +} + type ProtoTypes struct { NullableTimestamp *types.Timestamp `protobuf:"bytes,1,opt,name=nullableTimestamp,proto3" json:"nullableTimestamp,omitempty"` NullableDuration *types.Duration `protobuf:"bytes,2,opt,name=nullableDuration,proto3" json:"nullableDuration,omitempty"` @@ -196,7 +205,7 @@ return xxx_messageInfo_ProtoTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -411,7 +420,7 @@ return xxx_messageInfo_StdTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -626,7 +635,7 @@ return xxx_messageInfo_RepProtoTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -841,7 +850,7 @@ return xxx_messageInfo_RepStdTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1056,7 +1065,7 @@ return xxx_messageInfo_MapProtoTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1271,7 +1280,7 @@ return xxx_messageInfo_MapStdTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1477,7 +1486,7 @@ return xxx_messageInfo_OneofProtoTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1505,37 +1514,37 @@ } type OneofProtoTypes_Timestamp struct { - Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof"` + Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"` } type OneofProtoTypes_Duration struct { - Duration *types.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof"` + Duration *types.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof" json:"duration,omitempty"` } type OneofProtoTypes_RepDouble struct { - RepDouble *types.DoubleValue `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof"` + RepDouble *types.DoubleValue `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof" json:"repDouble,omitempty"` } type OneofProtoTypes_RepFloat struct { - RepFloat *types.FloatValue `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof"` + RepFloat *types.FloatValue `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof" json:"repFloat,omitempty"` } type OneofProtoTypes_RepInt64 struct { - RepInt64 *types.Int64Value `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof"` + RepInt64 *types.Int64Value `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof" json:"repInt64,omitempty"` } type OneofProtoTypes_RepUInt64 struct { - RepUInt64 *types.UInt64Value `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof"` + RepUInt64 *types.UInt64Value `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof" json:"repUInt64,omitempty"` } type OneofProtoTypes_RepInt32 struct { - RepInt32 *types.Int32Value `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof"` + RepInt32 *types.Int32Value `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof" json:"repInt32,omitempty"` } type OneofProtoTypes_RepUInt32 struct { - RepUInt32 *types.UInt32Value `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof"` + RepUInt32 *types.UInt32Value `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof" json:"repUInt32,omitempty"` } type OneofProtoTypes_RepBool struct { - RepBool *types.BoolValue `protobuf:"bytes,9,opt,name=repBool,proto3,oneof"` + RepBool *types.BoolValue `protobuf:"bytes,9,opt,name=repBool,proto3,oneof" json:"repBool,omitempty"` } type OneofProtoTypes_RepString struct { - RepString *types.StringValue `protobuf:"bytes,10,opt,name=repString,proto3,oneof"` + RepString *types.StringValue `protobuf:"bytes,10,opt,name=repString,proto3,oneof" json:"repString,omitempty"` } type OneofProtoTypes_RepBytes struct { - RepBytes *types.BytesValue `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof"` + RepBytes *types.BytesValue `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof" json:"repBytes,omitempty"` } func (*OneofProtoTypes_Timestamp) isOneofProtoTypes_OneOfProtoTimes() {} @@ -1634,9 +1643,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*OneofProtoTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _OneofProtoTypes_OneofMarshaler, _OneofProtoTypes_OneofUnmarshaler, _OneofProtoTypes_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*OneofProtoTypes) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*OneofProtoTypes_Timestamp)(nil), (*OneofProtoTypes_Duration)(nil), (*OneofProtoTypes_RepDouble)(nil), @@ -1651,234 +1660,6 @@ } } -func _OneofProtoTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*OneofProtoTypes) - // OneOfProtoTimes - switch x := m.OneOfProtoTimes.(type) { - case *OneofProtoTypes_Timestamp: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Timestamp); err != nil { - return err - } - case *OneofProtoTypes_Duration: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Duration); err != nil { - return err - } - case *OneofProtoTypes_RepDouble: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepDouble); err != nil { - return err - } - case *OneofProtoTypes_RepFloat: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepFloat); err != nil { - return err - } - case *OneofProtoTypes_RepInt64: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepInt64); err != nil { - return err - } - case *OneofProtoTypes_RepUInt64: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepUInt64); err != nil { - return err - } - case *OneofProtoTypes_RepInt32: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepInt32); err != nil { - return err - } - case *OneofProtoTypes_RepUInt32: - _ = b.EncodeVarint(8<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepUInt32); err != nil { - return err - } - case *OneofProtoTypes_RepBool: - _ = b.EncodeVarint(9<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepBool); err != nil { - return err - } - case *OneofProtoTypes_RepString: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepString); err != nil { - return err - } - case *OneofProtoTypes_RepBytes: - _ = b.EncodeVarint(11<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepBytes); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("OneofProtoTypes.OneOfProtoTimes has unexpected type %T", x) - } - return nil -} - -func _OneofProtoTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*OneofProtoTypes) - switch tag { - case 1: // OneOfProtoTimes.timestamp - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Timestamp) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_Timestamp{msg} - return true, err - case 2: // OneOfProtoTimes.duration - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Duration) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_Duration{msg} - return true, err - case 3: // OneOfProtoTimes.repDouble - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.DoubleValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepDouble{msg} - return true, err - case 4: // OneOfProtoTimes.repFloat - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.FloatValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepFloat{msg} - return true, err - case 5: // OneOfProtoTimes.repInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Int64Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepInt64{msg} - return true, err - case 6: // OneOfProtoTimes.repUInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.UInt64Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepUInt64{msg} - return true, err - case 7: // OneOfProtoTimes.repInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Int32Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepInt32{msg} - return true, err - case 8: // OneOfProtoTimes.repUInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.UInt32Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepUInt32{msg} - return true, err - case 9: // OneOfProtoTimes.repBool - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.BoolValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepBool{msg} - return true, err - case 10: // OneOfProtoTimes.repString - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.StringValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepString{msg} - return true, err - case 11: // OneOfProtoTimes.repBytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.BytesValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepBytes{msg} - return true, err - default: - return false, nil - } -} - -func _OneofProtoTypes_OneofSizer(msg proto.Message) (n int) { - m := msg.(*OneofProtoTypes) - // OneOfProtoTimes - switch x := m.OneOfProtoTimes.(type) { - case *OneofProtoTypes_Timestamp: - s := proto.Size(x.Timestamp) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_Duration: - s := proto.Size(x.Duration) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepDouble: - s := proto.Size(x.RepDouble) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepFloat: - s := proto.Size(x.RepFloat) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepInt64: - s := proto.Size(x.RepInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepUInt64: - s := proto.Size(x.RepUInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepInt32: - s := proto.Size(x.RepInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepUInt32: - s := proto.Size(x.RepUInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepBool: - s := proto.Size(x.RepBool) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepString: - s := proto.Size(x.RepString) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepBytes: - s := proto.Size(x.RepBytes) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type OneofStdTypes struct { // Types that are valid to be assigned to OneOfStdTimes: // *OneofStdTypes_Timestamp @@ -1912,7 +1693,7 @@ return xxx_messageInfo_OneofStdTypes.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1940,37 +1721,37 @@ } type OneofStdTypes_Timestamp struct { - Timestamp *time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof,stdtime"` + Timestamp *time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof,stdtime" json:"timestamp,omitempty"` } type OneofStdTypes_Duration struct { - Duration *time.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof,stdduration"` + Duration *time.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof,stdduration" json:"duration,omitempty"` } type OneofStdTypes_RepDouble struct { - RepDouble *float64 `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof,wktptr"` + RepDouble *float64 `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof,wktptr" json:"repDouble,omitempty"` } type OneofStdTypes_RepFloat struct { - RepFloat *float32 `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof,wktptr"` + RepFloat *float32 `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof,wktptr" json:"repFloat,omitempty"` } type OneofStdTypes_RepInt64 struct { - RepInt64 *int64 `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof,wktptr"` + RepInt64 *int64 `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof,wktptr" json:"repInt64,omitempty"` } type OneofStdTypes_RepUInt64 struct { - RepUInt64 *uint64 `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof,wktptr"` + RepUInt64 *uint64 `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof,wktptr" json:"repUInt64,omitempty"` } type OneofStdTypes_RepInt32 struct { - RepInt32 *int32 `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof,wktptr"` + RepInt32 *int32 `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof,wktptr" json:"repInt32,omitempty"` } type OneofStdTypes_RepUInt32 struct { - RepUInt32 *uint32 `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof,wktptr"` + RepUInt32 *uint32 `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof,wktptr" json:"repUInt32,omitempty"` } type OneofStdTypes_RepBool struct { - RepBool *bool `protobuf:"bytes,9,opt,name=repBool,proto3,oneof,wktptr"` + RepBool *bool `protobuf:"bytes,9,opt,name=repBool,proto3,oneof,wktptr" json:"repBool,omitempty"` } type OneofStdTypes_RepString struct { - RepString *string `protobuf:"bytes,10,opt,name=repString,proto3,oneof,wktptr"` + RepString *string `protobuf:"bytes,10,opt,name=repString,proto3,oneof,wktptr" json:"repString,omitempty"` } type OneofStdTypes_RepBytes struct { - RepBytes *[]byte `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof,wktptr"` + RepBytes *[]byte `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof,wktptr" json:"repBytes,omitempty"` } func (*OneofStdTypes_Timestamp) isOneofStdTypes_OneOfStdTimes() {} @@ -2069,9 +1850,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*OneofStdTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _OneofStdTypes_OneofMarshaler, _OneofStdTypes_OneofUnmarshaler, _OneofStdTypes_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*OneofStdTypes) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*OneofStdTypes_Timestamp)(nil), (*OneofStdTypes_Duration)(nil), (*OneofStdTypes_RepDouble)(nil), @@ -2086,344 +1867,6 @@ } } -func _OneofStdTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*OneofStdTypes) - // OneOfStdTimes - switch x := m.OneOfStdTimes.(type) { - case *OneofStdTypes_Timestamp: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdTimeMarshal(*x.Timestamp) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_Duration: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdDurationMarshal(*x.Duration) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepDouble: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdDoubleMarshal(*x.RepDouble) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepFloat: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdFloatMarshal(*x.RepFloat) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepInt64: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdInt64Marshal(*x.RepInt64) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepUInt64: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdUInt64Marshal(*x.RepUInt64) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepInt32: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdInt32Marshal(*x.RepInt32) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepUInt32: - _ = b.EncodeVarint(8<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdUInt32Marshal(*x.RepUInt32) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepBool: - _ = b.EncodeVarint(9<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdBoolMarshal(*x.RepBool) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepString: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdStringMarshal(*x.RepString) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepBytes: - _ = b.EncodeVarint(11<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdBytesMarshal(*x.RepBytes) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("OneofStdTypes.OneOfStdTimes has unexpected type %T", x) - } - return nil -} - -func _OneofStdTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*OneofStdTypes) - switch tag { - case 1: // OneOfStdTimes.timestamp - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(time.Time) - if err2 := github_com_gogo_protobuf_types.StdTimeUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_Timestamp{c} - return true, err - case 2: // OneOfStdTimes.duration - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(time.Duration) - if err2 := github_com_gogo_protobuf_types.StdDurationUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_Duration{c} - return true, err - case 3: // OneOfStdTimes.repDouble - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(float64) - if err2 := github_com_gogo_protobuf_types.StdDoubleUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepDouble{c} - return true, err - case 4: // OneOfStdTimes.repFloat - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(float32) - if err2 := github_com_gogo_protobuf_types.StdFloatUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepFloat{c} - return true, err - case 5: // OneOfStdTimes.repInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(int64) - if err2 := github_com_gogo_protobuf_types.StdInt64Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepInt64{c} - return true, err - case 6: // OneOfStdTimes.repUInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(uint64) - if err2 := github_com_gogo_protobuf_types.StdUInt64Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepUInt64{c} - return true, err - case 7: // OneOfStdTimes.repInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(int32) - if err2 := github_com_gogo_protobuf_types.StdInt32Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepInt32{c} - return true, err - case 8: // OneOfStdTimes.repUInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(uint32) - if err2 := github_com_gogo_protobuf_types.StdUInt32Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepUInt32{c} - return true, err - case 9: // OneOfStdTimes.repBool - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(bool) - if err2 := github_com_gogo_protobuf_types.StdBoolUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepBool{c} - return true, err - case 10: // OneOfStdTimes.repString - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(string) - if err2 := github_com_gogo_protobuf_types.StdStringUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepString{c} - return true, err - case 11: // OneOfStdTimes.repBytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new([]byte) - if err2 := github_com_gogo_protobuf_types.StdBytesUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepBytes{c} - return true, err - default: - return false, nil - } -} - -func _OneofStdTypes_OneofSizer(msg proto.Message) (n int) { - m := msg.(*OneofStdTypes) - // OneOfStdTimes - switch x := m.OneOfStdTimes.(type) { - case *OneofStdTypes_Timestamp: - s := github_com_gogo_protobuf_types.SizeOfStdTime(*x.Timestamp) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_Duration: - s := github_com_gogo_protobuf_types.SizeOfStdDuration(*x.Duration) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepDouble: - s := github_com_gogo_protobuf_types.SizeOfStdDouble(*x.RepDouble) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepFloat: - s := github_com_gogo_protobuf_types.SizeOfStdFloat(*x.RepFloat) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepInt64: - s := github_com_gogo_protobuf_types.SizeOfStdInt64(*x.RepInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepUInt64: - s := github_com_gogo_protobuf_types.SizeOfStdUInt64(*x.RepUInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepInt32: - s := github_com_gogo_protobuf_types.SizeOfStdInt32(*x.RepInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepUInt32: - s := github_com_gogo_protobuf_types.SizeOfStdUInt32(*x.RepUInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepBool: - s := github_com_gogo_protobuf_types.SizeOfStdBool(*x.RepBool) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepString: - s := github_com_gogo_protobuf_types.SizeOfStdString(*x.RepString) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepBytes: - s := github_com_gogo_protobuf_types.SizeOfStdBytes(*x.RepBytes) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*KnownTypes)(nil), "types.KnownTypes") proto.RegisterType((*ProtoTypes)(nil), "types.ProtoTypes") @@ -2483,151 +1926,153 @@ func init() { proto.RegisterFile("combos/marshaler/types.proto", fileDescriptor_a143c1648742cb2e) } var fileDescriptor_a143c1648742cb2e = []byte{ - // 2299 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcf, 0x73, 0x1c, 0x47, - 0x19, 0xd5, 0x7a, 0x57, 0xb6, 0xd4, 0x92, 0x6c, 0x69, 0x1c, 0xa7, 0x06, 0x91, 0x5a, 0x1b, 0x25, - 0x76, 0x4c, 0x52, 0x91, 0xc8, 0x8c, 0x4a, 0x80, 0x21, 0x51, 0x32, 0x65, 0x7b, 0xb5, 0x1b, 0xc9, - 0x5e, 0xaf, 0xb4, 0x2e, 0x08, 0x04, 0xd8, 0x8d, 0xc6, 0x8a, 0x8a, 0xd5, 0xce, 0xd6, 0xee, 0x2c, - 0x29, 0xdd, 0xf8, 0x03, 0x38, 0x70, 0x83, 0x2a, 0x2e, 0x70, 0xe3, 0xca, 0x81, 0x2a, 0x8e, 0x1c, - 0x73, 0xe4, 0x2f, 0x80, 0x44, 0x5c, 0xb8, 0x02, 0x17, 0x5f, 0xa8, 0xa2, 0xa6, 0xbb, 0x67, 0xa6, - 0x7f, 0x7c, 0xdd, 0x3d, 0x3d, 0x25, 0xdd, 0x74, 0x93, 0x76, 0xbf, 0x7e, 0xf3, 0xe6, 0x9b, 0x37, - 0x7a, 0xfd, 0xbe, 0xd1, 0xa0, 0xd7, 0x3e, 0x8d, 0x4e, 0xfa, 0xd1, 0x64, 0xe3, 0xa4, 0x37, 0x9e, - 0x7c, 0xd6, 0x1b, 0x84, 0xe3, 0x8d, 0xf8, 0x74, 0x14, 0x4e, 0xd6, 0x47, 0xe3, 0x28, 0x8e, 0x9c, - 0x59, 0xfc, 0xcb, 0xea, 0x3b, 0x47, 0xc7, 0xf1, 0x67, 0xd3, 0xfe, 0xfa, 0xa7, 0xd1, 0xc9, 0xc6, - 0x51, 0x74, 0x14, 0x6d, 0xe0, 0x6f, 0xfb, 0xd3, 0x17, 0xf8, 0x37, 0xfc, 0x0b, 0xfe, 0x89, 0xac, - 0x5a, 0xad, 0x1f, 0x45, 0xd1, 0xd1, 0x20, 0xcc, 0xab, 0x0e, 0xa7, 0xe3, 0x5e, 0x7c, 0x1c, 0x0d, - 0xe9, 0xf7, 0xb7, 0xc5, 0xef, 0xe3, 0xe3, 0x93, 0x70, 0x12, 0xf7, 0x4e, 0x46, 0x2a, 0x80, 0xcf, - 0xc7, 0xbd, 0xd1, 0x28, 0x1c, 0x53, 0x5a, 0x6b, 0xbf, 0xab, 0x21, 0xf4, 0xd1, 0x30, 0xfa, 0x7c, - 0x78, 0x90, 0xd0, 0x73, 0xde, 0x46, 0xd5, 0xc3, 0xe9, 0xd8, 0xad, 0xdc, 0xa9, 0xdc, 0x5f, 0xf0, - 0xbe, 0xb6, 0x4e, 0x16, 0xaf, 0xa7, 0x8b, 0xd7, 0x1f, 0xd2, 0xa3, 0x77, 0x92, 0x2a, 0xe7, 0x2d, - 0x74, 0x25, 0x9e, 0xb8, 0x57, 0x70, 0xed, 0xaa, 0x54, 0x7b, 0x90, 0x32, 0xe9, 0x5c, 0x89, 0x27, - 0xce, 0x3a, 0xaa, 0x1e, 0xf6, 0x07, 0x6e, 0x15, 0x17, 0xbf, 0x26, 0x03, 0x47, 0xd3, 0xfe, 0x20, - 0x7c, 0xde, 0x1b, 0x4c, 0xc3, 0x4e, 0x52, 0xe8, 0xbc, 0x83, 0xaa, 0x2f, 0x06, 0xb1, 0x5b, 0xc3, - 0xf5, 0x5f, 0x97, 0xea, 0x1f, 0x0f, 0xa2, 0x5e, 0x4c, 0xcb, 0x5f, 0x0c, 0xe2, 0xa4, 0xfc, 0x78, - 0x6b, 0xd3, 0x9d, 0x55, 0x94, 0x37, 0x87, 0xf1, 0xd6, 0x26, 0x2d, 0x3f, 0xde, 0xda, 0x4c, 0xd8, - 0x4c, 0xb7, 0x36, 0xdd, 0xab, 0x0a, 0x36, 0x5d, 0xb6, 0x7e, 0xba, 0xb5, 0x89, 0xe1, 0x7d, 0xcf, - 0xbd, 0xa6, 0x86, 0xf7, 0xbd, 0x14, 0xde, 0xf7, 0x30, 0xbc, 0xef, 0xb9, 0x73, 0x1a, 0xf8, 0xac, - 0x7e, 0x8a, 0xeb, 0x6b, 0xfd, 0x28, 0x1a, 0xb8, 0xf3, 0x8a, 0x56, 0x06, 0x51, 0x34, 0x20, 0xe5, - 0xb8, 0x2e, 0xc1, 0x9f, 0xc4, 0x63, 0x17, 0x29, 0xf0, 0xf7, 0xe3, 0xf1, 0xf1, 0xf0, 0x88, 0xe2, - 0x4f, 0xe2, 0xb1, 0xf3, 0x2e, 0x9a, 0xed, 0x9f, 0xc6, 0xe1, 0xc4, 0x5d, 0x50, 0x9c, 0x40, 0x90, - 0x7c, 0x4b, 0x16, 0x90, 0xca, 0x07, 0xb5, 0x7f, 0xfd, 0xe1, 0x76, 0x65, 0xed, 0x57, 0x8b, 0x08, - 0xb5, 0x93, 0x22, 0xa2, 0x8e, 0x1d, 0xb4, 0x32, 0x9c, 0x0e, 0x06, 0xbd, 0xfe, 0x20, 0xcc, 0xae, - 0x2e, 0xd5, 0x8a, 0xee, 0xfa, 0xcb, 0x8b, 0x9c, 0x47, 0x68, 0x39, 0xfd, 0x30, 0xd5, 0x14, 0x15, - 0x92, 0x46, 0x74, 0xd2, 0x12, 0xe7, 0x21, 0xba, 0x9e, 0x7d, 0x86, 0x15, 0x54, 0x48, 0x60, 0xc2, - 0x1a, 0xe7, 0x43, 0xb4, 0x94, 0x7e, 0x82, 0x75, 0x55, 0x44, 0x75, 0xfc, 0x0a, 0x16, 0x02, 0x6b, - 0xa7, 0x88, 0x12, 0xf9, 0x15, 0xec, 0xb9, 0x10, 0xfd, 0x15, 0x92, 0xa7, 0xb0, 0x46, 0x20, 0x52, - 0x4c, 0xb3, 0xfc, 0x0a, 0x91, 0x48, 0x41, 0x21, 0x0b, 0x6b, 0x9c, 0xf7, 0xd1, 0x62, 0xfa, 0x49, - 0x50, 0x4c, 0xdb, 0x5c, 0x3d, 0xcb, 0x82, 0xe8, 0xb9, 0x90, 0xdc, 0x85, 0x35, 0x6c, 0x3b, 0x82, - 0xa2, 0x77, 0x00, 0xbf, 0xc2, 0x79, 0x1f, 0xcd, 0x67, 0x7f, 0x54, 0xdd, 0x45, 0x93, 0xd8, 0x83, - 0xda, 0x17, 0x7f, 0xbf, 0x3d, 0xd3, 0xc9, 0x97, 0x38, 0xdf, 0x43, 0x73, 0xe9, 0x1f, 0x6d, 0x77, - 0xc9, 0x20, 0x71, 0xba, 0x3a, 0x5b, 0xe0, 0xec, 0xa0, 0xa5, 0x61, 0x34, 0x4c, 0x08, 0x51, 0x7d, - 0x5f, 0x37, 0xeb, 0x9b, 0x82, 0xf0, 0x0b, 0x9d, 0x47, 0x68, 0x91, 0x7e, 0x40, 0x34, 0x7e, 0xc3, - 0xa8, 0x71, 0x8a, 0xc3, 0x2d, 0x63, 0x60, 0x88, 0x46, 0x97, 0x8d, 0x3a, 0x17, 0x60, 0x88, 0x4c, - 0xf3, 0xf3, 0xa2, 0x5a, 0x5f, 0x31, 0x6b, 0x5d, 0x38, 0x2f, 0x2a, 0x78, 0x8e, 0x90, 0xef, 0xb9, - 0x8e, 0x51, 0xef, 0x32, 0x21, 0xdf, 0x13, 0x08, 0xf9, 0x9e, 0x7b, 0xd3, 0xac, 0x79, 0x80, 0x90, - 0xef, 0x39, 0x01, 0x5a, 0xa0, 0x1f, 0x60, 0xdd, 0xbf, 0x62, 0xd2, 0x3d, 0x45, 0x61, 0x17, 0x31, - 0x6c, 0xa8, 0xf6, 0x6f, 0x99, 0xb5, 0x2f, 0xb0, 0xa1, 0x37, 0x40, 0xde, 0x1e, 0xa2, 0xff, 0x57, - 0x8d, 0xfa, 0x17, 0xda, 0x13, 0x30, 0x76, 0xf0, 0x9f, 0x45, 0x34, 0xb7, 0x1f, 0x1f, 0x12, 0x33, - 0x78, 0x52, 0xca, 0x0c, 0x82, 0xda, 0xaf, 0xff, 0x71, 0xbb, 0x02, 0x59, 0xc2, 0x47, 0x25, 0x2c, - 0x21, 0xa8, 0xfd, 0x36, 0x41, 0x93, 0x8d, 0xa1, 0x55, 0xc6, 0x18, 0x82, 0xda, 0xef, 0x13, 0x34, - 0xd1, 0x1e, 0x1a, 0xf6, 0xf6, 0x40, 0x91, 0x04, 0x93, 0x68, 0xd8, 0x9b, 0x84, 0x08, 0x44, 0x34, - 0xdf, 0x2a, 0x63, 0x15, 0xe2, 0xd9, 0xd1, 0xfb, 0xa7, 0x61, 0x6f, 0x18, 0x00, 0x29, 0xdf, 0x13, - 0x49, 0x15, 0xb3, 0x0d, 0x88, 0x14, 0xb6, 0x20, 0x4b, 0xf3, 0xa0, 0x38, 0xbc, 0x85, 0xb4, 0xca, - 0x58, 0x88, 0xc8, 0x88, 0xde, 0x47, 0x0d, 0x7b, 0x23, 0x11, 0xdb, 0x44, 0xec, 0x24, 0xb0, 0xb3, - 0x93, 0xb9, 0xe4, 0x66, 0xc4, 0xb7, 0x0c, 0x63, 0x29, 0xdb, 0x36, 0x96, 0x82, 0x11, 0xf0, 0x6d, - 0x92, 0xdb, 0xca, 0x6e, 0x19, 0x5b, 0xc1, 0x40, 0xf4, 0x94, 0x38, 0x6b, 0x69, 0xda, 0x5b, 0x4b, - 0x8e, 0xc5, 0xdb, 0x4b, 0xd3, 0xde, 0x5e, 0x64, 0x28, 0x22, 0xec, 0xdd, 0x32, 0x16, 0x23, 0x9f, - 0x23, 0xbd, 0x4d, 0x9a, 0xf6, 0x36, 0x03, 0x12, 0xf3, 0x3d, 0x81, 0x58, 0x41, 0xab, 0x81, 0x89, - 0xf9, 0x9e, 0xf3, 0xd8, 0xd6, 0x6e, 0x72, 0x24, 0xce, 0x72, 0x76, 0xcb, 0x58, 0x8e, 0xcc, 0x8a, - 0xde, 0x2e, 0x4d, 0x7b, 0xdb, 0x91, 0xdb, 0x85, 0xbf, 0x5c, 0xfb, 0xcd, 0x22, 0x5a, 0xea, 0x84, - 0x23, 0x26, 0x86, 0xb4, 0x90, 0x23, 0xd9, 0xc7, 0xc4, 0xad, 0xdc, 0xa9, 0x1a, 0x72, 0x08, 0xb0, - 0xca, 0x69, 0xe4, 0x2e, 0x96, 0xde, 0x31, 0x49, 0xa4, 0xad, 0xea, 0x93, 0x88, 0xbc, 0xc6, 0xf9, - 0x00, 0xa1, 0x38, 0x27, 0x53, 0x35, 0x91, 0xa1, 0x2e, 0xcb, 0xac, 0x71, 0xde, 0x43, 0xf3, 0x87, - 0x19, 0x85, 0x9a, 0x81, 0x42, 0xba, 0xcf, 0xcc, 0x56, 0x00, 0x59, 0x68, 0x16, 0x63, 0xd8, 0x65, - 0x21, 0x69, 0xc3, 0x79, 0xd5, 0x0c, 0x02, 0x6f, 0x38, 0xa5, 0x54, 0x75, 0x0d, 0x23, 0xd9, 0xa4, - 0x2a, 0x71, 0xcf, 0x3a, 0x67, 0x44, 0x00, 0xf7, 0xac, 0x52, 0x38, 0x9b, 0x57, 0xe0, 0xa8, 0xc3, - 0x99, 0xb8, 0xed, 0x45, 0x46, 0x04, 0x70, 0xdb, 0x2b, 0x67, 0xbc, 0x05, 0x45, 0x7b, 0x75, 0x19, - 0x4f, 0xda, 0x3c, 0x2f, 0x9a, 0x41, 0xe0, 0xcd, 0xb3, 0x94, 0x16, 0x97, 0xd4, 0xe7, 0xa5, 0x48, - 0x8b, 0xe2, 0xfe, 0xfb, 0xba, 0x11, 0x01, 0xdc, 0x7f, 0xcb, 0xa1, 0xf3, 0x86, 0xe6, 0xa4, 0x54, - 0xa1, 0x53, 0xda, 0xc5, 0x2f, 0x9b, 0x41, 0xe0, 0x5d, 0xbc, 0x18, 0x5f, 0x57, 0x14, 0x37, 0xb4, - 0x2a, 0xbe, 0x0a, 0x29, 0xc0, 0x31, 0x2d, 0x87, 0x52, 0x80, 0x1c, 0x81, 0x6f, 0x2a, 0x4e, 0x47, - 0x17, 0x81, 0xa5, 0x2c, 0xf1, 0x8a, 0x19, 0x04, 0xce, 0x12, 0x52, 0x98, 0xbe, 0xa5, 0xb8, 0xd6, - 0xea, 0x30, 0x2d, 0xc7, 0x91, 0x6a, 0xf9, 0x38, 0xf2, 0xbf, 0x45, 0xb4, 0xd0, 0x09, 0x47, 0x59, - 0x22, 0x69, 0x97, 0xf3, 0x05, 0x1a, 0x49, 0x20, 0x77, 0xd8, 0x2b, 0xe3, 0x0e, 0x34, 0x94, 0x00, - 0x1e, 0xf1, 0xd0, 0xd2, 0x23, 0xf2, 0xcd, 0x1f, 0xeb, 0x13, 0x1f, 0x5a, 0xf9, 0x44, 0xbe, 0xfd, - 0x63, 0xbc, 0xa2, 0x55, 0xc6, 0x2b, 0x14, 0xf1, 0x68, 0xb7, 0x8c, 0x63, 0x28, 0xf7, 0x92, 0x0d, - 0x7b, 0xd7, 0x80, 0xc3, 0x56, 0xd3, 0xde, 0x3b, 0x54, 0x9b, 0xd2, 0x86, 0xbd, 0x7f, 0xc0, 0xb9, - 0xad, 0x69, 0xef, 0x22, 0xaa, 0xdd, 0x6d, 0xab, 0x8c, 0x93, 0x28, 0x22, 0xe0, 0x6e, 0x19, 0x3f, - 0x51, 0xee, 0x94, 0x1b, 0xf6, 0x9e, 0x02, 0x07, 0xca, 0xa6, 0xbd, 0xb3, 0xa8, 0xb6, 0xdc, 0xad, - 0x32, 0xee, 0xa2, 0xc8, 0xa6, 0xbb, 0x65, 0x3c, 0x46, 0xb9, 0x7d, 0x7f, 0x68, 0xeb, 0x33, 0x60, - 0xd2, 0x7d, 0x6c, 0xeb, 0x36, 0x8a, 0x10, 0xd0, 0x2a, 0xe3, 0x38, 0x8a, 0xc4, 0xbc, 0x5b, 0xc6, - 0x77, 0x94, 0x81, 0xa2, 0x61, 0xef, 0x3d, 0x70, 0xfe, 0x6e, 0xda, 0x3b, 0x90, 0x2a, 0x99, 0xfc, - 0xa9, 0x8e, 0x96, 0xf6, 0x7a, 0x6c, 0x32, 0xf9, 0x21, 0x3c, 0x13, 0x4b, 0x8e, 0xf0, 0xf6, 0x3a, - 0x79, 0x1a, 0xc8, 0x2d, 0x58, 0x7f, 0x22, 0x56, 0x3f, 0x1a, 0xc6, 0xe3, 0x53, 0x68, 0x3c, 0xd6, - 0x60, 0xe7, 0x06, 0xc4, 0x82, 0x5e, 0x07, 0x21, 0x79, 0x28, 0x79, 0x1e, 0xfd, 0x1c, 0x98, 0xb3, - 0x11, 0x2b, 0x7a, 0x4b, 0x4b, 0x31, 0x2d, 0x26, 0x0c, 0xa1, 0x67, 0x31, 0xf9, 0x50, 0x82, 0xb8, - 0xd2, 0x1a, 0x88, 0xc7, 0xe1, 0x48, 0x03, 0xef, 0xb6, 0xc2, 0x99, 0xee, 0xeb, 0xb9, 0xe1, 0x52, - 0xc2, 0x4c, 0xf4, 0xa7, 0x7d, 0xd8, 0x9f, 0xde, 0x84, 0x01, 0xd9, 0x4a, 0x96, 0xa1, 0x60, 0x53, - 0x7b, 0xb0, 0x4d, 0xbd, 0xa9, 0x65, 0x89, 0x2b, 0x09, 0x49, 0xc1, 0xac, 0xda, 0xa0, 0x59, 0xdd, - 0xd3, 0x51, 0xcc, 0xc1, 0xc0, 0xcc, 0xb3, 0x07, 0x7b, 0x96, 0x9e, 0x20, 0xae, 0x14, 0x08, 0x92, - 0x3f, 0xea, 0x6d, 0xd0, 0xb9, 0xb4, 0x04, 0x73, 0x30, 0x30, 0x0a, 0xb5, 0x15, 0x06, 0xa6, 0xbf, - 0xd0, 0x5d, 0x86, 0xa2, 0x68, 0x63, 0xfb, 0xb0, 0x8d, 0x69, 0x2f, 0x74, 0x57, 0x62, 0x29, 0xb8, - 0xd9, 0x1e, 0xec, 0x66, 0xc6, 0x3e, 0xfa, 0x9e, 0xdc, 0x47, 0xdf, 0xe3, 0xfb, 0x98, 0x79, 0x9a, - 0xa9, 0x8f, 0x14, 0x0c, 0x0c, 0x4e, 0x6d, 0x85, 0xb5, 0x99, 0xfb, 0x98, 0x52, 0x14, 0x0d, 0x6e, - 0x1f, 0x36, 0x38, 0x63, 0x1f, 0x79, 0x96, 0x82, 0xcf, 0xb5, 0x40, 0x9f, 0xbb, 0xa7, 0x25, 0x99, - 0x14, 0x12, 0x8a, 0xbc, 0xdb, 0xed, 0x41, 0x6e, 0x77, 0x57, 0x47, 0x2f, 0x43, 0x82, 0x62, 0x56, - 0x5b, 0x61, 0x7a, 0xfa, 0x0e, 0x92, 0x52, 0xa1, 0x83, 0xd4, 0xac, 0xf6, 0x61, 0xeb, 0xd3, 0x76, - 0x90, 0xc1, 0x83, 0xd3, 0xd7, 0x1e, 0xec, 0x80, 0x7a, 0x25, 0xe2, 0x4a, 0x41, 0x89, 0xc4, 0x07, - 0xdb, 0xa0, 0x0f, 0x6a, 0x95, 0x98, 0x83, 0x41, 0xa1, 0x6c, 0xf5, 0x67, 0xe8, 0x55, 0xd8, 0xce, - 0x9c, 0x65, 0x54, 0xfd, 0x79, 0x78, 0x8a, 0x1f, 0x0e, 0xcd, 0x76, 0x92, 0x1f, 0x9d, 0x6f, 0xa1, - 0xd9, 0x5f, 0x24, 0xde, 0x5a, 0xe0, 0xbf, 0x47, 0x48, 0xe1, 0x83, 0x2b, 0xdf, 0xa9, 0xac, 0xfe, - 0x00, 0x5d, 0xbf, 0x20, 0xe4, 0x9f, 0xa0, 0x5b, 0xa0, 0xcf, 0x01, 0x07, 0xd8, 0xe0, 0x0f, 0xa0, - 0x99, 0x12, 0x32, 0xf8, 0xcf, 0xd1, 0xd2, 0x85, 0xe0, 0xfe, 0x14, 0xdd, 0x04, 0x3c, 0x10, 0x40, - 0xf7, 0x78, 0x74, 0xfd, 0x50, 0x90, 0x6b, 0x8c, 0x23, 0x7b, 0xe2, 0x39, 0xe2, 0x7f, 0x82, 0x1c, - 0xd9, 0x1e, 0x01, 0xfc, 0x77, 0x79, 0x7c, 0xed, 0x14, 0x91, 0x81, 0xff, 0x31, 0x5a, 0x91, 0xfc, - 0xf2, 0xfc, 0xd0, 0x19, 0xf2, 0xb9, 0x8f, 0x94, 0x81, 0x67, 0x86, 0x7d, 0x20, 0xf9, 0x8b, 0x40, - 0x67, 0xa4, 0xd3, 0xd5, 0xe2, 0x1b, 0x2f, 0x6d, 0x17, 0x3e, 0x40, 0x2e, 0x9d, 0x8b, 0xc1, 0xe7, - 0xbb, 0x4f, 0xdd, 0xa7, 0x64, 0x7f, 0xd2, 0x81, 0xa2, 0xaa, 0xfb, 0xe7, 0x8e, 0x2e, 0x74, 0x5f, - 0x8d, 0x5f, 0xa8, 0x3b, 0xc0, 0x01, 0xf8, 0xee, 0x9f, 0x3f, 0xfe, 0x8f, 0xd0, 0x8a, 0xe4, 0xd3, - 0x65, 0xfe, 0x1c, 0xe7, 0x03, 0x54, 0x06, 0xfc, 0x63, 0xb4, 0x2c, 0x3a, 0xf7, 0xb9, 0x61, 0x33, - 0x9d, 0x67, 0x3c, 0xb7, 0x4c, 0x67, 0xd8, 0xa9, 0x2b, 0xd8, 0xf9, 0x8b, 0xc1, 0x67, 0x74, 0x9f, - 0x3b, 0x72, 0x19, 0x65, 0xb2, 0xff, 0xf5, 0x07, 0xe9, 0xfe, 0x02, 0xd0, 0xd7, 0xfe, 0x5d, 0x47, - 0x0b, 0x7b, 0xbd, 0x7c, 0x66, 0xfb, 0x89, 0x3a, 0x31, 0x7f, 0x33, 0xdf, 0x8b, 0xa4, 0xe5, 0x8a, - 0xbc, 0xac, 0xfe, 0xa7, 0x92, 0xa6, 0x9c, 0x9a, 0xbf, 0x01, 0xc0, 0x0a, 0x70, 0xe0, 0x43, 0xf7, - 0x8f, 0x95, 0xb9, 0xf9, 0xbe, 0x86, 0xa8, 0x90, 0x76, 0x15, 0xff, 0xae, 0xf2, 0x58, 0xca, 0xce, - 0x77, 0x00, 0x4c, 0x1e, 0x0b, 0x7a, 0xae, 0x7f, 0xa0, 0x48, 0xcf, 0xf7, 0x74, 0x0c, 0xd9, 0xac, - 0x0b, 0x4e, 0x78, 0xbb, 0x70, 0x82, 0xbe, 0x0b, 0x81, 0xca, 0xf9, 0x59, 0x39, 0xea, 0x7d, 0x06, - 0x67, 0xe8, 0xbb, 0x1a, 0xae, 0x6c, 0xe8, 0x85, 0x86, 0xbe, 0x1d, 0x30, 0x47, 0xbf, 0xa1, 0x26, - 0xca, 0x00, 0xaa, 0xa6, 0xbf, 0xcf, 0xe0, 0x24, 0xad, 0xa3, 0xc9, 0x86, 0x4a, 0x68, 0x0e, 0xdc, - 0x01, 0xd3, 0xb4, 0x86, 0x26, 0x03, 0xa8, 0x1a, 0x08, 0x1f, 0x28, 0xf2, 0xb4, 0xee, 0xd2, 0x77, - 0x25, 0xa2, 0x62, 0xa6, 0xee, 0xc2, 0x99, 0x5a, 0x73, 0xe9, 0xbb, 0x20, 0x57, 0x21, 0x55, 0x3f, - 0x83, 0x53, 0xb5, 0xa1, 0xa7, 0x59, 0xc0, 0x84, 0xa6, 0xc5, 0x1d, 0x30, 0x59, 0xeb, 0x7b, 0x9a, - 0x02, 0xaa, 0xc6, 0xc6, 0x07, 0x8a, 0x6c, 0x6d, 0xea, 0x29, 0x4f, 0x54, 0xcc, 0xd7, 0x5d, 0x38, - 0x5f, 0x1b, 0x7a, 0x2a, 0x73, 0x15, 0x12, 0xf6, 0x13, 0x30, 0x61, 0xbf, 0xa1, 0xa1, 0xca, 0xa4, - 0x62, 0x60, 0xa6, 0xfc, 0x14, 0x4a, 0xd9, 0xaf, 0xab, 0x49, 0xe6, 0x68, 0x8a, 0xe1, 0xf2, 0x81, - 0x22, 0x67, 0xeb, 0xba, 0xc9, 0xa5, 0x62, 0x70, 0xcc, 0xdc, 0x85, 0xb3, 0xb6, 0xa6, 0x9b, 0x2c, - 0xa6, 0x72, 0xde, 0xfc, 0x0c, 0x4e, 0xdb, 0x3a, 0x85, 0xb2, 0xf1, 0x18, 0x9a, 0x3c, 0x77, 0xc0, - 0xc4, 0xad, 0x51, 0x28, 0x03, 0xa8, 0x18, 0x41, 0x5f, 0x66, 0xee, 0xcb, 0xcc, 0x7d, 0x99, 0xb9, - 0x2f, 0x33, 0xf7, 0x65, 0xe6, 0xbe, 0xcc, 0xdc, 0x97, 0x99, 0xfb, 0x32, 0x73, 0xc3, 0x99, 0xfb, - 0xcf, 0xb3, 0xe8, 0xc6, 0xd3, 0x61, 0x18, 0xbd, 0x60, 0x9e, 0x54, 0x3f, 0x60, 0x83, 0xb1, 0xf1, - 0xad, 0x8d, 0x1d, 0xee, 0x09, 0xf2, 0xb7, 0x99, 0xb4, 0x6a, 0x32, 0xce, 0x1d, 0xf6, 0xe1, 0xee, - 0xf7, 0xd1, 0xfc, 0x38, 0x1c, 0x15, 0x7f, 0x21, 0x23, 0x39, 0x6c, 0xb6, 0xc0, 0xf9, 0x2e, 0x9a, - 0x1b, 0x87, 0xa3, 0xa2, 0xaf, 0x60, 0x24, 0x07, 0x4e, 0xcb, 0xe9, 0xd2, 0xa2, 0x2f, 0x5d, 0xd0, - 0xa5, 0x24, 0xaa, 0x10, 0xce, 0xc5, 0x5f, 0xb3, 0xa0, 0x9c, 0x69, 0xd0, 0xc9, 0x0e, 0x5c, 0xe8, - 0xc5, 0x8a, 0xfc, 0xc0, 0xbe, 0xc7, 0x1c, 0xb8, 0xd8, 0xab, 0x14, 0xcc, 0x81, 0x7d, 0xcf, 0xd9, - 0x42, 0xd7, 0xc6, 0xe1, 0xa8, 0xd8, 0xcb, 0x13, 0x3b, 0x33, 0x9d, 0xb4, 0x98, 0x1e, 0xb5, 0xf8, - 0xeb, 0x12, 0xf4, 0xa8, 0x74, 0xd7, 0x4c, 0x4e, 0xb7, 0xe8, 0x0b, 0x12, 0xf4, 0x74, 0xf1, 0x07, - 0xc1, 0x0a, 0xd6, 0xe8, 0x53, 0xaa, 0xd1, 0x44, 0x6b, 0x6b, 0xff, 0x9d, 0x45, 0x4b, 0x58, 0xb7, - 0xd9, 0xb4, 0xe8, 0x03, 0x2b, 0xd5, 0x92, 0xb1, 0x10, 0xaf, 0xdd, 0xf7, 0x2c, 0xb4, 0x4b, 0xc6, - 0x35, 0x9c, 0x82, 0x03, 0x4b, 0x05, 0x93, 0x24, 0xc0, 0xeb, 0x78, 0xdb, 0x4a, 0xc7, 0x19, 0x42, - 0xae, 0xe6, 0x6d, 0x2b, 0x35, 0x73, 0x00, 0x44, 0x95, 0x81, 0xa5, 0xa6, 0xb9, 0xb3, 0xa0, 0xca, - 0xde, 0xb6, 0x52, 0xb6, 0x48, 0x02, 0xbf, 0x27, 0x67, 0xa7, 0x6f, 0x89, 0x04, 0xbe, 0x47, 0x8a, - 0xab, 0x3c, 0x5b, 0x9f, 0x69, 0x3d, 0xb0, 0xd4, 0x3a, 0xc7, 0x80, 0x2a, 0x7e, 0xdb, 0x4a, 0xf1, - 0x5c, 0x1b, 0x88, 0xee, 0x6f, 0x60, 0x8d, 0x3f, 0xc5, 0x1a, 0x4f, 0x54, 0x1a, 0xdc, 0xff, 0xf2, - 0xab, 0x7a, 0xe5, 0xe5, 0x57, 0xf5, 0xca, 0x1f, 0xcf, 0xea, 0x95, 0xbf, 0x9c, 0xd5, 0x2b, 0x7f, - 0x3d, 0xab, 0x57, 0xbe, 0x38, 0xab, 0x57, 0xfe, 0x76, 0x56, 0x9f, 0xf9, 0xf2, 0xac, 0x5e, 0x79, - 0x79, 0x56, 0x9f, 0xf9, 0xe5, 0x3f, 0xeb, 0x33, 0xfd, 0xab, 0xf8, 0x08, 0xfe, 0xff, 0x03, 0x00, - 0x00, 0xff, 0xff, 0x4f, 0x81, 0x1f, 0xa5, 0x79, 0x40, 0x00, 0x00, + // 2329 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcf, 0x73, 0x1b, 0x49, + 0x19, 0xb5, 0x2c, 0x39, 0xb1, 0xdb, 0x52, 0x62, 0x4f, 0x36, 0xcb, 0x60, 0x52, 0x4a, 0xf0, 0x6e, + 0x7e, 0xb0, 0x5b, 0x2b, 0xb3, 0x33, 0x2e, 0x03, 0x81, 0x5d, 0xef, 0xaa, 0x92, 0xc8, 0xd2, 0x5a, + 0x89, 0x22, 0x5b, 0x29, 0x58, 0x58, 0x40, 0x8a, 0x27, 0x5e, 0x17, 0xb2, 0x46, 0x25, 0x8d, 0xd8, + 0xca, 0x8d, 0x3f, 0x80, 0x03, 0x37, 0x38, 0xc2, 0x8d, 0x2b, 0x07, 0xaa, 0x38, 0x72, 0xe0, 0xb0, + 0x47, 0xfe, 0x02, 0xd8, 0x35, 0x17, 0xae, 0xc0, 0x25, 0x17, 0xaa, 0xb6, 0xa6, 0xbb, 0x67, 0xa6, + 0x7f, 0x7c, 0xdd, 0x33, 0x3d, 0x65, 0xdf, 0x74, 0xb3, 0x35, 0x5f, 0xbf, 0x79, 0xf3, 0xe9, 0x8d, + 0x5f, 0xbf, 0x6f, 0x3c, 0xe8, 0xc6, 0x73, 0xff, 0x74, 0xe0, 0x4f, 0xb7, 0x4e, 0xfb, 0x93, 0xe9, + 0xa7, 0xfd, 0xa1, 0x37, 0xd9, 0x0a, 0x5e, 0x8e, 0xbd, 0x69, 0x6d, 0x3c, 0xf1, 0x03, 0xdf, 0x5a, + 0xc2, 0xbf, 0x6c, 0xbc, 0x73, 0x7c, 0x12, 0x7c, 0x3a, 0x1b, 0xd4, 0x9e, 0xfb, 0xa7, 0x5b, 0xc7, + 0xfe, 0xb1, 0xbf, 0x85, 0x8f, 0x0e, 0x66, 0x2f, 0xf0, 0x6f, 0xf8, 0x17, 0xfc, 0x13, 0x59, 0xb5, + 0x51, 0x3d, 0xf6, 0xfd, 0xe3, 0xa1, 0x97, 0x54, 0x1d, 0xcd, 0x26, 0xfd, 0xe0, 0xc4, 0x1f, 0xd1, + 0xe3, 0x37, 0xc4, 0xe3, 0xd3, 0x60, 0x32, 0x7b, 0x1e, 0xd0, 0xa3, 0x37, 0xc5, 0xa3, 0xc1, 0xc9, + 0xa9, 0x37, 0x0d, 0xfa, 0xa7, 0x63, 0x15, 0xfc, 0x67, 0x93, 0xfe, 0x78, 0xec, 0x4d, 0x28, 0xe9, + 0xcd, 0xbf, 0x95, 0x10, 0xfa, 0x68, 0xe4, 0x7f, 0x36, 0x3a, 0x0c, 0xc9, 0x5b, 0x6f, 0xa3, 0xe2, + 0xd1, 0x6c, 0x62, 0x17, 0x6e, 0x15, 0xee, 0xad, 0x3a, 0x5f, 0xaf, 0x91, 0xc5, 0xb5, 0x68, 0x71, + 0xed, 0x01, 0xe5, 0xd6, 0x0d, 0xab, 0xac, 0xb7, 0xd0, 0x62, 0x30, 0xb5, 0x17, 0x71, 0xed, 0x86, + 0x54, 0x7b, 0x18, 0x31, 0xe9, 0x2e, 0x06, 0x53, 0xab, 0x86, 0x8a, 0x47, 0x83, 0xa1, 0x5d, 0xc4, + 0xc5, 0x37, 0x64, 0x60, 0x7f, 0x36, 0x18, 0x7a, 0xcf, 0xfa, 0xc3, 0x99, 0xd7, 0x0d, 0x0b, 0xad, + 0x77, 0x50, 0xf1, 0xc5, 0x30, 0xb0, 0x4b, 0xb8, 0xfe, 0x1b, 0x52, 0xfd, 0xa3, 0xa1, 0xdf, 0x0f, + 0x68, 0xf9, 0x8b, 0x61, 0x10, 0x96, 0x9f, 0xec, 0x6c, 0xdb, 0x4b, 0x8a, 0xf2, 0xe6, 0x28, 0xd8, + 0xd9, 0xa6, 0xe5, 0x27, 0x3b, 0xdb, 0x21, 0x9b, 0xd9, 0xce, 0xb6, 0x7d, 0x49, 0xc1, 0xa6, 0xc7, + 0xd6, 0xcf, 0x76, 0xb6, 0x31, 0xbc, 0xeb, 0xd8, 0x97, 0xd5, 0xf0, 0xae, 0x13, 0xc1, 0xbb, 0x0e, + 0x86, 0x77, 0x1d, 0x7b, 0x59, 0x03, 0x1f, 0xd7, 0xcf, 0x70, 0x7d, 0x69, 0xe0, 0xfb, 0x43, 0x7b, + 0x45, 0xd1, 0xca, 0xba, 0xef, 0x0f, 0x49, 0x39, 0xae, 0x0b, 0xf1, 0xa7, 0xc1, 0xc4, 0x46, 0x0a, + 0xfc, 0x83, 0x60, 0x72, 0x32, 0x3a, 0xa6, 0xf8, 0xd3, 0x60, 0x62, 0xbd, 0x8b, 0x96, 0x06, 0x2f, + 0x03, 0x6f, 0x6a, 0xaf, 0x2a, 0x2e, 0xa0, 0x1e, 0x1e, 0x25, 0x0b, 0x48, 0xa5, 0x75, 0x17, 0x2d, + 0x4e, 0x03, 0xbb, 0x8c, 0xeb, 0xbf, 0x06, 0x9d, 0x61, 0xf6, 0x3c, 0xe8, 0x2e, 0x4e, 0x83, 0xfb, + 0xa5, 0x7f, 0xff, 0xe1, 0x66, 0x61, 0xf3, 0xd7, 0x65, 0x84, 0x3a, 0xe1, 0x51, 0x22, 0xa3, 0x3d, + 0xb4, 0x3e, 0x9a, 0x0d, 0x87, 0xfd, 0xc1, 0xd0, 0x8b, 0x65, 0x40, 0x45, 0xa5, 0x13, 0x8a, 0xbc, + 0xc8, 0x7a, 0x88, 0xd6, 0xa2, 0x0f, 0x23, 0xf1, 0x51, 0xc5, 0x69, 0xd4, 0x29, 0x2d, 0xb1, 0x1e, + 0xa0, 0x2b, 0xf1, 0x67, 0x58, 0x6a, 0x99, 0x94, 0x28, 0xac, 0xb1, 0x3e, 0x44, 0x95, 0xe8, 0x13, + 0x2c, 0xc0, 0x2c, 0xf2, 0xe4, 0x57, 0xb0, 0x10, 0x58, 0x64, 0x59, 0x24, 0xcb, 0xaf, 0x60, 0xaf, + 0x85, 0x08, 0x35, 0x93, 0x8e, 0x85, 0x35, 0x02, 0x91, 0x6c, 0xe2, 0xe6, 0x57, 0x88, 0x44, 0x32, + 0x2a, 0x5e, 0x58, 0x63, 0xbd, 0x8f, 0xca, 0xd1, 0x27, 0xf5, 0x6c, 0x37, 0x01, 0x57, 0xcf, 0xb2, + 0x20, 0xc2, 0xcf, 0x74, 0x5f, 0x08, 0x6b, 0xd8, 0x76, 0xd4, 0xb3, 0xde, 0x2a, 0xfc, 0x0a, 0xeb, + 0x7d, 0xb4, 0x12, 0xff, 0xf5, 0xa5, 0x77, 0x8e, 0x46, 0xec, 0xf5, 0xd2, 0xe7, 0xff, 0xb8, 0xb9, + 0xd0, 0x4d, 0x96, 0x58, 0xdf, 0x47, 0xcb, 0xd1, 0xdf, 0x7e, 0xbb, 0x92, 0x22, 0x71, 0xba, 0x3a, + 0x5e, 0x60, 0xed, 0xa1, 0xca, 0xc8, 0x1f, 0x85, 0x84, 0xa8, 0xbe, 0xaf, 0xa4, 0xeb, 0x9b, 0x82, + 0xf0, 0x0b, 0xad, 0x87, 0xa8, 0x4c, 0x3f, 0x20, 0x1a, 0xbf, 0x9a, 0xaa, 0x71, 0x8a, 0xc3, 0x2d, + 0x63, 0x60, 0x88, 0x46, 0xd7, 0x52, 0x75, 0x2e, 0xc0, 0x10, 0x99, 0x26, 0xd7, 0x45, 0xb5, 0xbe, + 0x9e, 0xae, 0x75, 0xe1, 0xba, 0xa8, 0xe0, 0x39, 0x42, 0xae, 0x63, 0x5b, 0xa9, 0x7a, 0x97, 0x09, + 0xb9, 0x8e, 0x40, 0xc8, 0x75, 0xec, 0x6b, 0xe9, 0x9a, 0x07, 0x08, 0xb9, 0x8e, 0x55, 0x47, 0xab, + 0xf4, 0x03, 0xac, 0xfb, 0xd7, 0xd2, 0x74, 0x4f, 0x51, 0xd8, 0x45, 0x0c, 0x1b, 0xaa, 0xfd, 0xeb, + 0xe9, 0xda, 0x17, 0xd8, 0xd0, 0x1b, 0x20, 0x69, 0x0f, 0xd1, 0xff, 0xeb, 0xa9, 0xfa, 0x17, 0xda, + 0x83, 0x0f, 0x50, 0x3b, 0xf8, 0x6f, 0x19, 0x2d, 0x1f, 0x04, 0x47, 0xc4, 0x0c, 0x1e, 0xe7, 0x32, + 0x83, 0x7a, 0xe9, 0x37, 0xff, 0xbc, 0x59, 0x80, 0x2c, 0xe1, 0xa3, 0x1c, 0x96, 0x50, 0x2f, 0xfd, + 0x2e, 0x44, 0x93, 0x8d, 0xa1, 0x95, 0xc7, 0x18, 0xea, 0xa5, 0xdf, 0x87, 0x68, 0xa2, 0x3d, 0x34, + 0xcc, 0xed, 0x81, 0x22, 0x09, 0x26, 0xd1, 0x30, 0x37, 0x09, 0x11, 0x88, 0x68, 0xbe, 0x95, 0xc7, + 0x2a, 0xc4, 0xab, 0xa3, 0xf7, 0x4f, 0xc3, 0xdc, 0x30, 0x00, 0x52, 0xae, 0x23, 0x92, 0xca, 0x66, + 0x1b, 0x10, 0x29, 0x6c, 0x41, 0x86, 0xe6, 0x41, 0x71, 0x78, 0x0b, 0x69, 0xe5, 0xb1, 0x10, 0x91, + 0x11, 0xbd, 0x8f, 0x1a, 0xe6, 0x46, 0x22, 0xb6, 0x89, 0xd8, 0x49, 0xdd, 0xcc, 0x4e, 0x96, 0xc3, + 0x9b, 0x11, 0xdf, 0x32, 0x8c, 0xa5, 0xec, 0x9a, 0x58, 0x0a, 0x46, 0xc0, 0xb7, 0x49, 0x62, 0x2b, + 0xfb, 0x79, 0x6c, 0x05, 0x03, 0xd1, 0x4b, 0xe2, 0xac, 0xa5, 0x69, 0x6e, 0x2d, 0x09, 0x16, 0x6f, + 0x2f, 0x4d, 0x73, 0x7b, 0x91, 0xa1, 0x88, 0xb0, 0xf7, 0xf3, 0x58, 0x8c, 0x7c, 0x8d, 0xf4, 0x36, + 0x69, 0x9a, 0xdb, 0x0c, 0x48, 0xcc, 0x75, 0x04, 0x62, 0x19, 0xad, 0x06, 0x26, 0xe6, 0x3a, 0xd6, + 0x23, 0x53, 0xbb, 0x49, 0x90, 0x38, 0xcb, 0xd9, 0xcf, 0x63, 0x39, 0x32, 0x2b, 0x7a, 0xbb, 0x34, + 0xcd, 0x6d, 0x47, 0x6e, 0x17, 0x3e, 0xb8, 0xf9, 0xdb, 0x32, 0xaa, 0x74, 0xbd, 0x31, 0x13, 0x43, + 0x5a, 0xc8, 0x92, 0xec, 0x63, 0x6a, 0x17, 0x6e, 0x15, 0x53, 0x72, 0x08, 0xb0, 0xca, 0x6a, 0x24, + 0x2e, 0x16, 0xdd, 0x31, 0x61, 0xf6, 0x2d, 0xea, 0x93, 0x88, 0xbc, 0xc6, 0xfa, 0x00, 0xa1, 0x20, + 0x21, 0x53, 0x4c, 0x23, 0x43, 0x5d, 0x96, 0x59, 0x63, 0xbd, 0x87, 0x56, 0x8e, 0x62, 0x0a, 0xa5, + 0x14, 0x0a, 0xd1, 0x3e, 0x33, 0x5e, 0x01, 0x64, 0xa1, 0x25, 0x8c, 0x61, 0x96, 0x85, 0xa4, 0x0d, + 0xe7, 0xa5, 0x74, 0x10, 0x78, 0xc3, 0x29, 0xa5, 0xaa, 0xcb, 0x18, 0xc9, 0x24, 0x55, 0x89, 0x7b, + 0xd6, 0xe5, 0x54, 0x04, 0x70, 0xcf, 0x2a, 0x85, 0xb3, 0x15, 0x05, 0x8e, 0x3a, 0x9c, 0x89, 0xdb, + 0x5e, 0x94, 0x8a, 0x00, 0x6e, 0x7b, 0xe5, 0x8c, 0xb7, 0xaa, 0x68, 0xaf, 0x2e, 0xe3, 0x49, 0x9b, + 0xe7, 0x72, 0x3a, 0x08, 0xbc, 0x79, 0x96, 0xd2, 0x62, 0x45, 0x7d, 0x5d, 0x8a, 0xb4, 0x28, 0xee, + 0xbf, 0xaf, 0xa4, 0x22, 0x80, 0xfb, 0x6f, 0x39, 0x74, 0x5e, 0xd5, 0x5c, 0x94, 0x2a, 0x74, 0x4a, + 0xbb, 0xf8, 0xb5, 0x74, 0x10, 0x78, 0x17, 0x2f, 0xc6, 0xd7, 0x75, 0xc5, 0x0d, 0xad, 0x8a, 0xaf, + 0x42, 0x0a, 0xb0, 0xd2, 0x96, 0x43, 0x29, 0x40, 0x8e, 0xc0, 0xd7, 0x14, 0x97, 0xa3, 0x8b, 0xc0, + 0x52, 0x96, 0x78, 0x2d, 0x1d, 0x04, 0xce, 0x12, 0x52, 0x98, 0xbe, 0xae, 0xf8, 0xae, 0xd5, 0x61, + 0x5a, 0x8e, 0x23, 0xc5, 0xfc, 0x71, 0xe4, 0xff, 0x65, 0xb4, 0xda, 0xf5, 0xc6, 0x71, 0x22, 0xe9, + 0xe4, 0xf3, 0x05, 0x1a, 0x49, 0x20, 0x77, 0x68, 0xe7, 0x71, 0x07, 0x1a, 0x4a, 0x00, 0x8f, 0x78, + 0x60, 0xe8, 0x11, 0xc9, 0xe6, 0x8f, 0xf5, 0x89, 0x0f, 0x8d, 0x7c, 0x22, 0xd9, 0xfe, 0x31, 0x5e, + 0xd1, 0xca, 0xe3, 0x15, 0x8a, 0x78, 0xb4, 0x9f, 0xc7, 0x31, 0x94, 0x7b, 0xc9, 0x86, 0xb9, 0x6b, + 0xc0, 0x61, 0xab, 0x69, 0xee, 0x1d, 0xaa, 0x4d, 0x69, 0xc3, 0xdc, 0x3f, 0xe0, 0xdc, 0xd6, 0x34, + 0x77, 0x11, 0xd5, 0xee, 0xb6, 0x95, 0xc7, 0x49, 0x14, 0x11, 0x70, 0x3f, 0x8f, 0x9f, 0x28, 0x77, + 0xca, 0x0d, 0x73, 0x4f, 0x81, 0x03, 0x65, 0xd3, 0xdc, 0x59, 0x54, 0x5b, 0xee, 0x56, 0x1e, 0x77, + 0x51, 0x64, 0xd3, 0xfd, 0x3c, 0x1e, 0xa3, 0xdc, 0xbe, 0x3f, 0x30, 0xf5, 0x19, 0x30, 0xe9, 0x3e, + 0x32, 0x75, 0x1b, 0x45, 0x08, 0x68, 0xe5, 0x71, 0x1c, 0x45, 0x62, 0xde, 0xcf, 0xe3, 0x3b, 0xca, + 0x40, 0xd1, 0x30, 0xf7, 0x1e, 0x38, 0x7f, 0x37, 0xcd, 0x1d, 0x48, 0x95, 0x4c, 0xfe, 0x54, 0x45, + 0x95, 0x76, 0x9f, 0x4d, 0x26, 0x3f, 0x82, 0x67, 0x62, 0xe1, 0x19, 0xde, 0xae, 0x91, 0x87, 0x8a, + 0xdc, 0x82, 0xda, 0x63, 0xb1, 0xfa, 0xe1, 0x28, 0x98, 0xbc, 0x84, 0xc6, 0x63, 0x0d, 0x76, 0x6e, + 0x40, 0x2c, 0xe8, 0x0d, 0x10, 0x92, 0x87, 0x92, 0xe7, 0xd1, 0xcf, 0x80, 0x39, 0x1b, 0xb1, 0xa2, + 0xb7, 0xb4, 0x14, 0xa3, 0x62, 0xc2, 0x10, 0x7a, 0x16, 0x93, 0x0c, 0x25, 0x88, 0x2b, 0x6d, 0x82, + 0x78, 0x1c, 0x8e, 0x34, 0xf0, 0xee, 0x28, 0x9c, 0xe9, 0x9e, 0x9e, 0x1b, 0x2e, 0x25, 0xcc, 0x44, + 0x7f, 0x3a, 0x80, 0xfd, 0xe9, 0x2e, 0x0c, 0xc8, 0x56, 0xb2, 0x0c, 0x05, 0x9b, 0x6a, 0xc3, 0x36, + 0x75, 0x57, 0xcb, 0x12, 0x57, 0x12, 0x92, 0x82, 0x59, 0x75, 0x40, 0xb3, 0xba, 0xa3, 0xa3, 0x98, + 0x80, 0x81, 0x99, 0xa7, 0x0d, 0x7b, 0x96, 0x9e, 0x20, 0xae, 0x14, 0x08, 0x92, 0x3f, 0xea, 0x1d, + 0xd0, 0xb9, 0xb4, 0x04, 0x13, 0x30, 0x30, 0x0a, 0x75, 0x14, 0x06, 0xa6, 0xff, 0xa2, 0x7b, 0x0c, + 0x45, 0xd1, 0xc6, 0x0e, 0x60, 0x1b, 0xd3, 0x7e, 0xd1, 0x3d, 0x89, 0xa5, 0xe0, 0x66, 0x6d, 0xd8, + 0xcd, 0x52, 0xfb, 0xe8, 0x3a, 0x72, 0x1f, 0x5d, 0x87, 0xef, 0x63, 0xec, 0x69, 0x69, 0x7d, 0xa4, + 0x60, 0x60, 0x70, 0xea, 0x28, 0xac, 0x2d, 0xbd, 0x8f, 0x11, 0x45, 0xd1, 0xe0, 0x0e, 0x60, 0x83, + 0x4b, 0xed, 0x23, 0xcf, 0x52, 0xf0, 0xb9, 0x16, 0xe8, 0x73, 0x77, 0xb4, 0x24, 0xc3, 0x42, 0x42, + 0x91, 0x77, 0xbb, 0x36, 0xe4, 0x76, 0xb7, 0x75, 0xf4, 0x62, 0x24, 0x28, 0x66, 0x75, 0x14, 0xa6, + 0xa7, 0xef, 0x20, 0x29, 0x15, 0x3a, 0x48, 0xcd, 0xea, 0x00, 0xb6, 0x3e, 0x6d, 0x07, 0x19, 0x3c, + 0x38, 0x7d, 0xb5, 0x61, 0x07, 0xd4, 0x2b, 0x11, 0x57, 0x0a, 0x4a, 0x24, 0x3e, 0xd8, 0x01, 0x7d, + 0x50, 0xab, 0xc4, 0x04, 0x0c, 0x0a, 0x65, 0x1b, 0x3f, 0x47, 0xaf, 0xc3, 0x76, 0x66, 0xad, 0xa1, + 0xe2, 0x2f, 0xbc, 0x97, 0xf8, 0xe1, 0xd0, 0x52, 0x37, 0xfc, 0xd1, 0xfa, 0x36, 0x5a, 0xfa, 0x65, + 0xe8, 0xad, 0x19, 0xfe, 0xcd, 0x84, 0x14, 0xde, 0x5f, 0xfc, 0x6e, 0x61, 0xe3, 0x87, 0xe8, 0xca, + 0x05, 0x21, 0xff, 0x14, 0x5d, 0x07, 0x7d, 0x0e, 0x38, 0xc1, 0x16, 0x7f, 0x02, 0xcd, 0x94, 0x90, + 0xc1, 0x7f, 0x86, 0x2a, 0x17, 0x82, 0xfb, 0x33, 0x74, 0x0d, 0xf0, 0x40, 0x00, 0xdd, 0xe1, 0xd1, + 0xf5, 0x43, 0x41, 0xae, 0x31, 0x96, 0xec, 0x89, 0xe7, 0x88, 0xff, 0x09, 0xb2, 0x64, 0x7b, 0x04, + 0xf0, 0xdf, 0xe5, 0xf1, 0xb5, 0x53, 0x44, 0x06, 0xfe, 0x27, 0x68, 0x5d, 0xf2, 0xcb, 0xf3, 0x43, + 0x67, 0xc8, 0x27, 0x3e, 0x92, 0x07, 0x9e, 0x19, 0xf6, 0x81, 0xe4, 0x2f, 0x02, 0x9d, 0x91, 0x4e, + 0x4f, 0x8b, 0x9f, 0xfa, 0xd5, 0xf6, 0xe0, 0x13, 0x24, 0xd2, 0xb9, 0x18, 0x7c, 0xbe, 0xfb, 0xd4, + 0x7d, 0x72, 0xf6, 0x27, 0x1a, 0x28, 0xaa, 0xba, 0x7f, 0xee, 0xe8, 0x42, 0xf7, 0xd5, 0xf8, 0x99, + 0xba, 0x03, 0x9c, 0x80, 0xef, 0xfe, 0xf9, 0xe3, 0xff, 0x18, 0xad, 0x4b, 0x3e, 0x9d, 0xe7, 0xcf, + 0x71, 0x32, 0x40, 0x65, 0xc0, 0x3f, 0x46, 0x6b, 0xa2, 0x73, 0x9f, 0x1b, 0x36, 0xd3, 0x79, 0xc6, + 0x73, 0xf3, 0x74, 0x86, 0x9d, 0xba, 0x82, 0x9d, 0xbf, 0x18, 0x7c, 0x46, 0xf7, 0x89, 0x23, 0xe7, + 0x51, 0x26, 0xfb, 0xef, 0x81, 0x90, 0xee, 0x2f, 0x00, 0x7d, 0xf3, 0x3f, 0x55, 0xb4, 0xda, 0xee, + 0x27, 0x33, 0xdb, 0x4f, 0xd4, 0x89, 0xf9, 0x5b, 0xc9, 0x5e, 0x24, 0x2a, 0x57, 0xe4, 0x65, 0xf5, + 0x3f, 0x95, 0x34, 0xe5, 0xd4, 0xfc, 0x4d, 0x00, 0x56, 0x80, 0x03, 0x1f, 0xba, 0x7f, 0xac, 0xcc, + 0xcd, 0xf7, 0x34, 0x44, 0x85, 0xb4, 0xab, 0xf8, 0x77, 0x95, 0x47, 0x52, 0x76, 0xbe, 0x05, 0x60, + 0xf2, 0x58, 0xd0, 0x73, 0xfd, 0x43, 0x45, 0x7a, 0xbe, 0xa3, 0x63, 0xc8, 0x66, 0x5d, 0x70, 0xc2, + 0xdb, 0x83, 0x13, 0xf4, 0x6d, 0x08, 0x54, 0xce, 0xcf, 0xca, 0x51, 0xef, 0x53, 0x38, 0x43, 0xdf, + 0xd6, 0x70, 0x65, 0x43, 0x2f, 0x34, 0xf4, 0xed, 0x82, 0x39, 0xfa, 0x4d, 0x35, 0x51, 0x06, 0x50, + 0x35, 0xfd, 0x7d, 0x0a, 0x27, 0x69, 0x1d, 0x4d, 0x36, 0x54, 0x42, 0x73, 0xe0, 0x2e, 0x98, 0xa6, + 0x35, 0x34, 0x19, 0x40, 0xd5, 0x40, 0xf8, 0x50, 0x91, 0xa7, 0x75, 0x5f, 0x7d, 0x4f, 0x22, 0x2a, + 0x66, 0xea, 0x1e, 0x9c, 0xa9, 0x35, 0x5f, 0x7d, 0x0f, 0xe4, 0x2a, 0xa4, 0xea, 0xa7, 0x70, 0xaa, + 0x4e, 0xe9, 0x69, 0x1c, 0x30, 0xa1, 0x69, 0x71, 0x17, 0x4c, 0xd6, 0xfa, 0x9e, 0x46, 0x80, 0xaa, + 0xb1, 0xf1, 0xa1, 0x22, 0x5b, 0xa7, 0xf5, 0x94, 0x27, 0x2a, 0xe6, 0xeb, 0x1e, 0x9c, 0xaf, 0x53, + 0x7a, 0x2a, 0x73, 0x15, 0x12, 0xf6, 0x63, 0x30, 0x61, 0xbf, 0xa9, 0xa1, 0xca, 0xa4, 0x62, 0x60, + 0xa6, 0xfc, 0x04, 0x4a, 0xd9, 0x6f, 0xa8, 0x49, 0x26, 0x68, 0x8a, 0xe1, 0xf2, 0xa1, 0x22, 0x67, + 0xeb, 0xba, 0xc9, 0xa5, 0x62, 0x70, 0xcc, 0xdc, 0x83, 0xb3, 0xb6, 0xa6, 0x9b, 0x2c, 0xa6, 0x72, + 0xde, 0xfc, 0x14, 0x4e, 0xdb, 0x3a, 0x85, 0xb2, 0xf1, 0x18, 0x9a, 0x3c, 0x77, 0xc1, 0xc4, 0xad, + 0x51, 0x28, 0x03, 0xa8, 0x18, 0x41, 0xcf, 0x33, 0xf7, 0x3c, 0x73, 0xcf, 0x33, 0xf7, 0x3c, 0x73, + 0xcf, 0x33, 0xf7, 0x3c, 0x73, 0xcf, 0x33, 0xf7, 0x3c, 0x73, 0xc3, 0x99, 0xfb, 0xcf, 0x4b, 0xe8, + 0xea, 0x93, 0x91, 0xe7, 0xbf, 0x60, 0x9e, 0x54, 0xdf, 0x67, 0x83, 0x71, 0xea, 0x5b, 0x1b, 0x7b, + 0xdc, 0x13, 0xe4, 0xef, 0x30, 0x69, 0x35, 0xcd, 0x38, 0xf7, 0xd8, 0x87, 0xbb, 0x3f, 0x40, 0x2b, + 0x13, 0x6f, 0x9c, 0xfd, 0x85, 0x8c, 0xf0, 0xb4, 0xf1, 0x02, 0xeb, 0x7b, 0x68, 0x79, 0xe2, 0x8d, + 0xb3, 0xbe, 0x82, 0x11, 0x9e, 0x38, 0x2a, 0xa7, 0x4b, 0xb3, 0xbe, 0x74, 0x41, 0x97, 0x92, 0xa8, + 0x42, 0x38, 0x67, 0x7f, 0xcd, 0x82, 0x72, 0xa6, 0x41, 0x27, 0x3e, 0x71, 0xa6, 0x17, 0x2b, 0x92, + 0x13, 0xbb, 0x0e, 0x73, 0xe2, 0x6c, 0xaf, 0x52, 0x30, 0x27, 0x76, 0x1d, 0x6b, 0x07, 0x5d, 0x9e, + 0x78, 0xe3, 0x6c, 0x2f, 0x4f, 0xec, 0x2d, 0x74, 0xa3, 0x62, 0x7a, 0xd6, 0xec, 0xaf, 0x4b, 0xd0, + 0xb3, 0xd2, 0x5d, 0x33, 0xb9, 0xdc, 0xac, 0x2f, 0x48, 0xd0, 0xcb, 0xc5, 0x1f, 0xd4, 0xd7, 0xb1, + 0x46, 0x9f, 0x50, 0x8d, 0x86, 0x5a, 0xdb, 0xfc, 0xdf, 0x12, 0xaa, 0x60, 0xdd, 0xc6, 0xd3, 0xa2, + 0x0f, 0x8c, 0x54, 0x4b, 0xc6, 0x42, 0xbc, 0x76, 0xdf, 0x33, 0xd0, 0x2e, 0x19, 0xd7, 0x70, 0x0a, + 0xae, 0x1b, 0x2a, 0x98, 0x24, 0x01, 0x5e, 0xc7, 0xbb, 0x46, 0x3a, 0x8e, 0x11, 0x12, 0x35, 0xef, + 0x1a, 0xa9, 0x99, 0x03, 0x20, 0xaa, 0xac, 0x1b, 0x6a, 0x9a, 0xbb, 0x0a, 0xaa, 0xec, 0x5d, 0x23, + 0x65, 0x8b, 0x24, 0xf0, 0x7b, 0x72, 0x66, 0xfa, 0x96, 0x48, 0xe0, 0x7b, 0x24, 0xbb, 0xca, 0xe3, + 0xf5, 0xb1, 0xd6, 0xeb, 0x86, 0x5a, 0xe7, 0x18, 0x50, 0xc5, 0xef, 0x1a, 0x29, 0x9e, 0x6b, 0x03, + 0xd1, 0xfd, 0x55, 0xac, 0xf1, 0x27, 0x58, 0xe3, 0xa1, 0x4a, 0xeb, 0xf7, 0xbe, 0xf8, 0xb2, 0x5a, + 0x78, 0xf5, 0x65, 0xb5, 0xf0, 0xc7, 0xb3, 0x6a, 0xe1, 0x2f, 0x67, 0xd5, 0xc2, 0x5f, 0xcf, 0xaa, + 0x85, 0xcf, 0xcf, 0xaa, 0x85, 0xbf, 0x9f, 0x55, 0x17, 0xbe, 0x38, 0xab, 0x16, 0x5e, 0x9d, 0x55, + 0x17, 0x7e, 0xf5, 0xaf, 0xea, 0xc2, 0xe0, 0x12, 0x3e, 0x83, 0xfb, 0x55, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xd2, 0x3a, 0x64, 0x13, 0xc0, 0x40, 0x00, 0x00, } func (this *KnownTypes) Compare(that interface{}) int { @@ -2688,6 +2133,9 @@ if c := this.Bytes.Compare(that1.Bytes); c != 0 { return c } + if c := this.St.Compare(that1.St); c != 0 { + return c + } if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { return c } @@ -3119,6 +2567,9 @@ if !this.Bytes.Equal(that1.Bytes) { return fmt.Errorf("Bytes this(%v) Not Equal that(%v)", this.Bytes, that1.Bytes) } + if !this.St.Equal(that1.St) { + return fmt.Errorf("St this(%v) Not Equal that(%v)", this.St, that1.St) + } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized) } @@ -3176,6 +2627,9 @@ if !this.Bytes.Equal(that1.Bytes) { return false } + if !this.St.Equal(that1.St) { + return false + } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return false } @@ -6876,7 +6330,7 @@ func (m *KnownTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -6884,130 +6338,170 @@ } func (m *KnownTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *KnownTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Dur != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Dur.Size())) - n1, err1 := m.Dur.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 - } - i += n1 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Ts != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Ts.Size())) - n2, err2 := m.Ts.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + if m.St != nil { + { + size, err := m.St.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n2 + i-- + dAtA[i] = 0x62 } - if m.Dbl != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Dbl.Size())) - n3, err3 := m.Dbl.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + if m.Bytes != nil { + { + size, err := m.Bytes.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n3 + i-- + dAtA[i] = 0x5a } - if m.Flt != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Flt.Size())) - n4, err4 := m.Flt.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 + if m.Str != nil { + { + size, err := m.Str.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n4 + i-- + dAtA[i] = 0x52 } - if m.I64 != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.I64.Size())) - n5, err5 := m.I64.MarshalTo(dAtA[i:]) - if err5 != nil { - return 0, err5 + if m.Bool != nil { + { + size, err := m.Bool.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n5 + i-- + dAtA[i] = 0x4a } - if m.U64 != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.U64.Size())) - n6, err6 := m.U64.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 + if m.U32 != nil { + { + size, err := m.U32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n6 + i-- + dAtA[i] = 0x42 } if m.I32 != nil { + { + size, err := m.I32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.I32.Size())) - n7, err7 := m.I32.MarshalTo(dAtA[i:]) - if err7 != nil { - return 0, err7 + } + if m.U64 != nil { + { + size, err := m.U64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n7 + i-- + dAtA[i] = 0x32 } - if m.U32 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.U32.Size())) - n8, err8 := m.U32.MarshalTo(dAtA[i:]) - if err8 != nil { - return 0, err8 + if m.I64 != nil { + { + size, err := m.I64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n8 + i-- + dAtA[i] = 0x2a } - if m.Bool != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Bool.Size())) - n9, err9 := m.Bool.MarshalTo(dAtA[i:]) - if err9 != nil { - return 0, err9 + if m.Flt != nil { + { + size, err := m.Flt.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n9 + i-- + dAtA[i] = 0x22 } - if m.Str != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Str.Size())) - n10, err10 := m.Str.MarshalTo(dAtA[i:]) - if err10 != nil { - return 0, err10 + if m.Dbl != nil { + { + size, err := m.Dbl.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n10 + i-- + dAtA[i] = 0x1a } - if m.Bytes != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Bytes.Size())) - n11, err11 := m.Bytes.MarshalTo(dAtA[i:]) - if err11 != nil { - return 0, err11 + if m.Ts != nil { + { + size, err := m.Ts.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n11 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Dur != nil { + { + size, err := m.Dur.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *ProtoTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -7015,232 +6509,282 @@ } func (m *ProtoTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ProtoTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NullableTimestamp != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableTimestamp.Size())) - n12, err12 := m.NullableTimestamp.MarshalTo(dAtA[i:]) - if err12 != nil { - return 0, err12 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + { + size, err := m.NonnullBytes.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n12 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableDuration != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableDuration.Size())) - n13, err13 := m.NullableDuration.MarshalTo(dAtA[i:]) - if err13 != nil { - return 0, err13 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 + { + size, err := m.NonnullString.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n13 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableDouble != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableDouble.Size())) - n14, err14 := m.NullableDouble.MarshalTo(dAtA[i:]) - if err14 != nil { - return 0, err14 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa + { + size, err := m.NonnullBool.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n14 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableFloat != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableFloat.Size())) - n15, err15 := m.NullableFloat.MarshalTo(dAtA[i:]) - if err15 != nil { - return 0, err15 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 + { + size, err := m.NonnullUInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n15 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableInt64 != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableInt64.Size())) - n16, err16 := m.NullableInt64.MarshalTo(dAtA[i:]) - if err16 != nil { - return 0, err16 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a + { + size, err := m.NonnullInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n16 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableUInt64 != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableUInt64.Size())) - n17, err17 := m.NullableUInt64.MarshalTo(dAtA[i:]) - if err17 != nil { - return 0, err17 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + { + size, err := m.NonnullUInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n17 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableInt32 != nil { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableInt32.Size())) - n18, err18 := m.NullableInt32.MarshalTo(dAtA[i:]) - if err18 != nil { - return 0, err18 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + { + size, err := m.NonnullInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n18 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableUInt32 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableUInt32.Size())) - n19, err19 := m.NullableUInt32.MarshalTo(dAtA[i:]) - if err19 != nil { - return 0, err19 + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + { + size, err := m.NonnullFloat.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n19 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableBool != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableBool.Size())) - n20, err20 := m.NullableBool.MarshalTo(dAtA[i:]) - if err20 != nil { - return 0, err20 + i-- + dAtA[i] = 0x7a + { + size, err := m.NonnullDouble.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n20 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableString != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableString.Size())) - n21, err21 := m.NullableString.MarshalTo(dAtA[i:]) - if err21 != nil { - return 0, err21 + i-- + dAtA[i] = 0x72 + { + size, err := m.Duration.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n21 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - if m.NullableBytes != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NullableBytes.Size())) - n22, err22 := m.NullableBytes.MarshalTo(dAtA[i:]) - if err22 != nil { - return 0, err22 + i-- + dAtA[i] = 0x6a + { + size, err := m.Timestamp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n22 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } + i-- dAtA[i] = 0x62 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Timestamp.Size())) - n23, err23 := m.Timestamp.MarshalTo(dAtA[i:]) - if err23 != nil { - return 0, err23 - } - i += n23 - dAtA[i] = 0x6a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Duration.Size())) - n24, err24 := m.Duration.MarshalTo(dAtA[i:]) - if err24 != nil { - return 0, err24 + if m.NullableBytes != nil { + { + size, err := m.NullableBytes.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x5a } - i += n24 - dAtA[i] = 0x72 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullDouble.Size())) - n25, err25 := m.NonnullDouble.MarshalTo(dAtA[i:]) - if err25 != nil { - return 0, err25 + if m.NullableString != nil { + { + size, err := m.NullableString.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x52 } - i += n25 - dAtA[i] = 0x7a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullFloat.Size())) - n26, err26 := m.NonnullFloat.MarshalTo(dAtA[i:]) - if err26 != nil { - return 0, err26 + if m.NullableBool != nil { + { + size, err := m.NullableBool.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a } - i += n26 - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullInt64.Size())) - n27, err27 := m.NonnullInt64.MarshalTo(dAtA[i:]) - if err27 != nil { - return 0, err27 + if m.NullableUInt32 != nil { + { + size, err := m.NullableUInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 } - i += n27 - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullUInt64.Size())) - n28, err28 := m.NonnullUInt64.MarshalTo(dAtA[i:]) - if err28 != nil { - return 0, err28 + if m.NullableInt32 != nil { + { + size, err := m.NullableInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a } - i += n28 - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullInt32.Size())) - n29, err29 := m.NonnullInt32.MarshalTo(dAtA[i:]) - if err29 != nil { - return 0, err29 + if m.NullableUInt64 != nil { + { + size, err := m.NullableUInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 } - i += n29 - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullUInt32.Size())) - n30, err30 := m.NonnullUInt32.MarshalTo(dAtA[i:]) - if err30 != nil { - return 0, err30 + if m.NullableInt64 != nil { + { + size, err := m.NullableInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x2a } - i += n30 - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullBool.Size())) - n31, err31 := m.NonnullBool.MarshalTo(dAtA[i:]) - if err31 != nil { - return 0, err31 + if m.NullableFloat != nil { + { + size, err := m.NullableFloat.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 } - i += n31 - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullString.Size())) - n32, err32 := m.NonnullString.MarshalTo(dAtA[i:]) - if err32 != nil { - return 0, err32 + if m.NullableDouble != nil { + { + size, err := m.NullableDouble.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } - i += n32 - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.NonnullBytes.Size())) - n33, err33 := m.NonnullBytes.MarshalTo(dAtA[i:]) - if err33 != nil { - return 0, err33 + if m.NullableDuration != nil { + { + size, err := m.NullableDuration.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - i += n33 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.NullableTimestamp != nil { + { + size, err := m.NullableTimestamp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *StdTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -7248,232 +6792,238 @@ } func (m *StdTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *StdTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.NullableTimestamp != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.NullableTimestamp))) - n34, err34 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.NullableTimestamp, dAtA[i:]) - if err34 != nil { - return 0, err34 - } - i += n34 - } - if m.NullableDuration != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*m.NullableDuration))) - n35, err35 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.NullableDuration, dAtA[i:]) - if err35 != nil { - return 0, err35 - } - i += n35 - } - if m.NullableDouble != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(*m.NullableDouble))) - n36, err36 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*m.NullableDouble, dAtA[i:]) - if err36 != nil { - return 0, err36 - } - i += n36 - } - if m.NullableFloat != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(*m.NullableFloat))) - n37, err37 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.NullableFloat, dAtA[i:]) - if err37 != nil { - return 0, err37 - } - i += n37 - } - if m.NullableInt64 != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(*m.NullableInt64))) - n38, err38 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*m.NullableInt64, dAtA[i:]) - if err38 != nil { - return 0, err38 - } - i += n38 - } - if m.NullableUInt64 != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(*m.NullableUInt64))) - n39, err39 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*m.NullableUInt64, dAtA[i:]) - if err39 != nil { - return 0, err39 - } - i += n39 - } - if m.NullableInt32 != nil { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(*m.NullableInt32))) - n40, err40 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.NullableInt32, dAtA[i:]) - if err40 != nil { - return 0, err40 - } - i += n40 - } - if m.NullableUInt32 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(*m.NullableUInt32))) - n41, err41 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*m.NullableUInt32, dAtA[i:]) - if err41 != nil { - return 0, err41 - } - i += n41 - } - if m.NullableBool != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(*m.NullableBool))) - n42, err42 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.NullableBool, dAtA[i:]) - if err42 != nil { - return 0, err42 - } - i += n42 - } - if m.NullableString != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(*m.NullableString))) - n43, err43 := github_com_gogo_protobuf_types.StdStringMarshalTo(*m.NullableString, dAtA[i:]) - if err43 != nil { - return 0, err43 - } - i += n43 - } - if m.NullableBytes != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(*m.NullableBytes))) - n44, err44 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*m.NullableBytes, dAtA[i:]) - if err44 != nil { - return 0, err44 - } - i += n44 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - dAtA[i] = 0x62 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp))) - n45, err45 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i:]) + n35, err35 := github_com_gogo_protobuf_types.StdBytesMarshalTo(m.NonnullBytes, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes(m.NonnullBytes):]) + if err35 != nil { + return 0, err35 + } + i -= n35 + i = encodeVarintTypes(dAtA, i, uint64(n35)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 + n36, err36 := github_com_gogo_protobuf_types.StdStringMarshalTo(m.NonnullString, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString(m.NonnullString):]) + if err36 != nil { + return 0, err36 + } + i -= n36 + i = encodeVarintTypes(dAtA, i, uint64(n36)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa + n37, err37 := github_com_gogo_protobuf_types.StdBoolMarshalTo(m.NonnullBool, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(m.NonnullBool):]) + if err37 != nil { + return 0, err37 + } + i -= n37 + i = encodeVarintTypes(dAtA, i, uint64(n37)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 + n38, err38 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(m.NonnullUInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32(m.NonnullUInt32):]) + if err38 != nil { + return 0, err38 + } + i -= n38 + i = encodeVarintTypes(dAtA, i, uint64(n38)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a + n39, err39 := github_com_gogo_protobuf_types.StdInt32MarshalTo(m.NonnullInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(m.NonnullInt32):]) + if err39 != nil { + return 0, err39 + } + i -= n39 + i = encodeVarintTypes(dAtA, i, uint64(n39)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + n40, err40 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(m.NonnullUInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64(m.NonnullUInt64):]) + if err40 != nil { + return 0, err40 + } + i -= n40 + i = encodeVarintTypes(dAtA, i, uint64(n40)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + n41, err41 := github_com_gogo_protobuf_types.StdInt64MarshalTo(m.NonnullInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64(m.NonnullInt64):]) + if err41 != nil { + return 0, err41 + } + i -= n41 + i = encodeVarintTypes(dAtA, i, uint64(n41)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 + n42, err42 := github_com_gogo_protobuf_types.StdFloatMarshalTo(m.NonnullFloat, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(m.NonnullFloat):]) + if err42 != nil { + return 0, err42 + } + i -= n42 + i = encodeVarintTypes(dAtA, i, uint64(n42)) + i-- + dAtA[i] = 0x7a + n43, err43 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(m.NonnullDouble, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble(m.NonnullDouble):]) + if err43 != nil { + return 0, err43 + } + i -= n43 + i = encodeVarintTypes(dAtA, i, uint64(n43)) + i-- + dAtA[i] = 0x72 + n44, err44 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.Duration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.Duration):]) + if err44 != nil { + return 0, err44 + } + i -= n44 + i = encodeVarintTypes(dAtA, i, uint64(n44)) + i-- + dAtA[i] = 0x6a + n45, err45 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) if err45 != nil { return 0, err45 } - i += n45 - dAtA[i] = 0x6a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(m.Duration))) - n46, err46 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.Duration, dAtA[i:]) - if err46 != nil { - return 0, err46 + i -= n45 + i = encodeVarintTypes(dAtA, i, uint64(n45)) + i-- + dAtA[i] = 0x62 + if m.NullableBytes != nil { + n46, err46 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*m.NullableBytes, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes(*m.NullableBytes):]) + if err46 != nil { + return 0, err46 + } + i -= n46 + i = encodeVarintTypes(dAtA, i, uint64(n46)) + i-- + dAtA[i] = 0x5a } - i += n46 - dAtA[i] = 0x72 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(m.NonnullDouble))) - n47, err47 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(m.NonnullDouble, dAtA[i:]) - if err47 != nil { - return 0, err47 + if m.NullableString != nil { + n47, err47 := github_com_gogo_protobuf_types.StdStringMarshalTo(*m.NullableString, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString(*m.NullableString):]) + if err47 != nil { + return 0, err47 + } + i -= n47 + i = encodeVarintTypes(dAtA, i, uint64(n47)) + i-- + dAtA[i] = 0x52 } - i += n47 - dAtA[i] = 0x7a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(m.NonnullFloat))) - n48, err48 := github_com_gogo_protobuf_types.StdFloatMarshalTo(m.NonnullFloat, dAtA[i:]) - if err48 != nil { - return 0, err48 + if m.NullableBool != nil { + n48, err48 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.NullableBool, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.NullableBool):]) + if err48 != nil { + return 0, err48 + } + i -= n48 + i = encodeVarintTypes(dAtA, i, uint64(n48)) + i-- + dAtA[i] = 0x4a } - i += n48 - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(m.NonnullInt64))) - n49, err49 := github_com_gogo_protobuf_types.StdInt64MarshalTo(m.NonnullInt64, dAtA[i:]) - if err49 != nil { - return 0, err49 + if m.NullableUInt32 != nil { + n49, err49 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*m.NullableUInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32(*m.NullableUInt32):]) + if err49 != nil { + return 0, err49 + } + i -= n49 + i = encodeVarintTypes(dAtA, i, uint64(n49)) + i-- + dAtA[i] = 0x42 } - i += n49 - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(m.NonnullUInt64))) - n50, err50 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(m.NonnullUInt64, dAtA[i:]) - if err50 != nil { - return 0, err50 + if m.NullableInt32 != nil { + n50, err50 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.NullableInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(*m.NullableInt32):]) + if err50 != nil { + return 0, err50 + } + i -= n50 + i = encodeVarintTypes(dAtA, i, uint64(n50)) + i-- + dAtA[i] = 0x3a } - i += n50 - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(m.NonnullInt32))) - n51, err51 := github_com_gogo_protobuf_types.StdInt32MarshalTo(m.NonnullInt32, dAtA[i:]) - if err51 != nil { - return 0, err51 + if m.NullableUInt64 != nil { + n51, err51 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*m.NullableUInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64(*m.NullableUInt64):]) + if err51 != nil { + return 0, err51 + } + i -= n51 + i = encodeVarintTypes(dAtA, i, uint64(n51)) + i-- + dAtA[i] = 0x32 } - i += n51 - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(m.NonnullUInt32))) - n52, err52 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(m.NonnullUInt32, dAtA[i:]) - if err52 != nil { - return 0, err52 + if m.NullableInt64 != nil { + n52, err52 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*m.NullableInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64(*m.NullableInt64):]) + if err52 != nil { + return 0, err52 + } + i -= n52 + i = encodeVarintTypes(dAtA, i, uint64(n52)) + i-- + dAtA[i] = 0x2a } - i += n52 - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(m.NonnullBool))) - n53, err53 := github_com_gogo_protobuf_types.StdBoolMarshalTo(m.NonnullBool, dAtA[i:]) - if err53 != nil { - return 0, err53 + if m.NullableFloat != nil { + n53, err53 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.NullableFloat, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(*m.NullableFloat):]) + if err53 != nil { + return 0, err53 + } + i -= n53 + i = encodeVarintTypes(dAtA, i, uint64(n53)) + i-- + dAtA[i] = 0x22 } - i += n53 - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(m.NonnullString))) - n54, err54 := github_com_gogo_protobuf_types.StdStringMarshalTo(m.NonnullString, dAtA[i:]) - if err54 != nil { - return 0, err54 + if m.NullableDouble != nil { + n54, err54 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*m.NullableDouble, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble(*m.NullableDouble):]) + if err54 != nil { + return 0, err54 + } + i -= n54 + i = encodeVarintTypes(dAtA, i, uint64(n54)) + i-- + dAtA[i] = 0x1a } - i += n54 - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(m.NonnullBytes))) - n55, err55 := github_com_gogo_protobuf_types.StdBytesMarshalTo(m.NonnullBytes, dAtA[i:]) - if err55 != nil { - return 0, err55 + if m.NullableDuration != nil { + n55, err55 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.NullableDuration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.NullableDuration):]) + if err55 != nil { + return 0, err55 + } + i -= n55 + i = encodeVarintTypes(dAtA, i, uint64(n55)) + i-- + dAtA[i] = 0x12 } - i += n55 - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.NullableTimestamp != nil { + n56, err56 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.NullableTimestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.NullableTimestamp):]) + if err56 != nil { + return 0, err56 + } + i -= n56 + i = encodeVarintTypes(dAtA, i, uint64(n56)) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *RepProtoTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -7481,298 +7031,348 @@ } func (m *RepProtoTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RepProtoTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.NullableTimestamps) > 0 { - for _, msg := range m.NullableTimestamps { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.NullableDurations) > 0 { - for _, msg := range m.NullableDurations { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullBytes) > 0 { + for iNdEx := len(m.NonnullBytes) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullBytes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 } } - if len(m.Timestamps) > 0 { - for _, msg := range m.Timestamps { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableBytes) > 0 { + for iNdEx := len(m.NullableBytes) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableBytes[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa } } - if len(m.Durations) > 0 { - for _, msg := range m.Durations { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullString) > 0 { + for iNdEx := len(m.NonnullString) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullString[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 } } - if len(m.NullableDouble) > 0 { - for _, msg := range m.NullableDouble { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableString) > 0 { + for iNdEx := len(m.NullableString) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableString[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a } } - if len(m.NonnullDouble) > 0 { - for _, msg := range m.NonnullDouble { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullBool) > 0 { + for iNdEx := len(m.NonnullBool) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullBool[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 } } - if len(m.NullableFloat) > 0 { - for _, msg := range m.NullableFloat { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableBool) > 0 { + for iNdEx := len(m.NullableBool) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableBool[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.NonnullFloat) > 0 { - for _, msg := range m.NonnullFloat { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullUInt32) > 0 { + for iNdEx := len(m.NonnullUInt32) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullUInt32[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.NullableInt64) > 0 { - for _, msg := range m.NullableInt64 { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableUInt32) > 0 { + for iNdEx := len(m.NullableUInt32) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableUInt32[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x7a } } - if len(m.NonnullInt64) > 0 { - for _, msg := range m.NonnullInt64 { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullInt32) > 0 { + for iNdEx := len(m.NonnullInt32) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullInt32[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x72 } } - if len(m.NullableUInt64) > 0 { - for _, msg := range m.NullableUInt64 { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableInt32) > 0 { + for iNdEx := len(m.NullableInt32) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableInt32[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x6a } } if len(m.NonnullUInt64) > 0 { - for _, msg := range m.NonnullUInt64 { - dAtA[i] = 0x62 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.NonnullUInt64) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullUInt64[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x62 } } - if len(m.NullableInt32) > 0 { - for _, msg := range m.NullableInt32 { - dAtA[i] = 0x6a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableUInt64) > 0 { + for iNdEx := len(m.NullableUInt64) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableUInt64[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x5a } } - if len(m.NonnullInt32) > 0 { - for _, msg := range m.NonnullInt32 { - dAtA[i] = 0x72 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullInt64) > 0 { + for iNdEx := len(m.NonnullInt64) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullInt64[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x52 } } - if len(m.NullableUInt32) > 0 { - for _, msg := range m.NullableUInt32 { - dAtA[i] = 0x7a - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableInt64) > 0 { + for iNdEx := len(m.NullableInt64) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableInt64[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x4a } } - if len(m.NonnullUInt32) > 0 { - for _, msg := range m.NonnullUInt32 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullFloat) > 0 { + for iNdEx := len(m.NonnullFloat) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullFloat[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x42 } } - if len(m.NullableBool) > 0 { - for _, msg := range m.NullableBool { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableFloat) > 0 { + for iNdEx := len(m.NullableFloat) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableFloat[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x3a } } - if len(m.NonnullBool) > 0 { - for _, msg := range m.NonnullBool { - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NonnullDouble) > 0 { + for iNdEx := len(m.NonnullDouble) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NonnullDouble[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x32 } } - if len(m.NullableString) > 0 { - for _, msg := range m.NullableString { - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableDouble) > 0 { + for iNdEx := len(m.NullableDouble) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableDouble[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x2a } } - if len(m.NonnullString) > 0 { - for _, msg := range m.NonnullString { - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Durations) > 0 { + for iNdEx := len(m.Durations) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Durations[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x22 } } - if len(m.NullableBytes) > 0 { - for _, msg := range m.NullableBytes { - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Timestamps) > 0 { + for iNdEx := len(m.Timestamps) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Timestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1a } } - if len(m.NonnullBytes) > 0 { - for _, msg := range m.NonnullBytes { - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.NullableDurations) > 0 { + for iNdEx := len(m.NullableDurations) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableDurations[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.NullableTimestamps) > 0 { + for iNdEx := len(m.NullableTimestamps) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.NullableTimestamps[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *RepStdTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -7780,298 +7380,304 @@ } func (m *RepStdTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *RepStdTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.NullableTimestamps) > 0 { - for _, msg := range m.NullableTimestamps { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*msg))) - n, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*msg, dAtA[i:]) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.NonnullBytes) > 0 { + for iNdEx := len(m.NonnullBytes) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdBytesMarshalTo(m.NonnullBytes[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes(m.NonnullBytes[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 } } - if len(m.NullableDurations) > 0 { - for _, msg := range m.NullableDurations { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*msg))) - n, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(*msg, dAtA[i:]) + if len(m.NullableBytes) > 0 { + for iNdEx := len(m.NullableBytes) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdBytesMarshalTo(*m.NullableBytes[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes(*m.NullableBytes[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa } } - if len(m.Timestamps) > 0 { - for _, msg := range m.Timestamps { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(msg))) - n, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(msg, dAtA[i:]) + if len(m.NonnullString) > 0 { + for iNdEx := len(m.NonnullString) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdStringMarshalTo(m.NonnullString[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString(m.NonnullString[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 } } - if len(m.Durations) > 0 { - for _, msg := range m.Durations { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(msg))) - n, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(msg, dAtA[i:]) + if len(m.NullableString) > 0 { + for iNdEx := len(m.NullableString) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdStringMarshalTo(*m.NullableString[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString(*m.NullableString[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a } } - if len(m.NullableDouble) > 0 { - for _, msg := range m.NullableDouble { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(*msg))) - n, err := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*msg, dAtA[i:]) + if len(m.NonnullBool) > 0 { + for iNdEx := len(m.NonnullBool) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdBoolMarshalTo(m.NonnullBool[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(m.NonnullBool[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 } } - if len(m.NonnullDouble) > 0 { - for _, msg := range m.NonnullDouble { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(msg))) - n, err := github_com_gogo_protobuf_types.StdDoubleMarshalTo(msg, dAtA[i:]) + if len(m.NullableBool) > 0 { + for iNdEx := len(m.NullableBool) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.NullableBool[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.NullableBool[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.NullableFloat) > 0 { - for _, msg := range m.NullableFloat { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(*msg))) - n, err := github_com_gogo_protobuf_types.StdFloatMarshalTo(*msg, dAtA[i:]) + if len(m.NonnullUInt32) > 0 { + for iNdEx := len(m.NonnullUInt32) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdUInt32MarshalTo(m.NonnullUInt32[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32(m.NonnullUInt32[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.NonnullFloat) > 0 { - for _, msg := range m.NonnullFloat { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(msg))) - n, err := github_com_gogo_protobuf_types.StdFloatMarshalTo(msg, dAtA[i:]) + if len(m.NullableUInt32) > 0 { + for iNdEx := len(m.NullableUInt32) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*m.NullableUInt32[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32(*m.NullableUInt32[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x7a } } - if len(m.NullableInt64) > 0 { - for _, msg := range m.NullableInt64 { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(*msg))) - n, err := github_com_gogo_protobuf_types.StdInt64MarshalTo(*msg, dAtA[i:]) + if len(m.NonnullInt32) > 0 { + for iNdEx := len(m.NonnullInt32) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdInt32MarshalTo(m.NonnullInt32[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(m.NonnullInt32[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x72 } } - if len(m.NonnullInt64) > 0 { - for _, msg := range m.NonnullInt64 { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(msg))) - n, err := github_com_gogo_protobuf_types.StdInt64MarshalTo(msg, dAtA[i:]) + if len(m.NullableInt32) > 0 { + for iNdEx := len(m.NullableInt32) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.NullableInt32[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(*m.NullableInt32[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x6a } } - if len(m.NullableUInt64) > 0 { - for _, msg := range m.NullableUInt64 { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(*msg))) - n, err := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*msg, dAtA[i:]) + if len(m.NonnullUInt64) > 0 { + for iNdEx := len(m.NonnullUInt64) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdUInt64MarshalTo(m.NonnullUInt64[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64(m.NonnullUInt64[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x62 } } - if len(m.NonnullUInt64) > 0 { - for _, msg := range m.NonnullUInt64 { - dAtA[i] = 0x62 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(msg))) - n, err := github_com_gogo_protobuf_types.StdUInt64MarshalTo(msg, dAtA[i:]) + if len(m.NullableUInt64) > 0 { + for iNdEx := len(m.NullableUInt64) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*m.NullableUInt64[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64(*m.NullableUInt64[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x5a } } - if len(m.NullableInt32) > 0 { - for _, msg := range m.NullableInt32 { - dAtA[i] = 0x6a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(*msg))) - n, err := github_com_gogo_protobuf_types.StdInt32MarshalTo(*msg, dAtA[i:]) + if len(m.NonnullInt64) > 0 { + for iNdEx := len(m.NonnullInt64) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdInt64MarshalTo(m.NonnullInt64[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64(m.NonnullInt64[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x52 } } - if len(m.NonnullInt32) > 0 { - for _, msg := range m.NonnullInt32 { - dAtA[i] = 0x72 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(msg))) - n, err := github_com_gogo_protobuf_types.StdInt32MarshalTo(msg, dAtA[i:]) + if len(m.NullableInt64) > 0 { + for iNdEx := len(m.NullableInt64) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdInt64MarshalTo(*m.NullableInt64[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64(*m.NullableInt64[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x4a } } - if len(m.NullableUInt32) > 0 { - for _, msg := range m.NullableUInt32 { - dAtA[i] = 0x7a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(*msg))) - n, err := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*msg, dAtA[i:]) + if len(m.NonnullFloat) > 0 { + for iNdEx := len(m.NonnullFloat) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdFloatMarshalTo(m.NonnullFloat[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(m.NonnullFloat[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x42 } } - if len(m.NonnullUInt32) > 0 { - for _, msg := range m.NonnullUInt32 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(msg))) - n, err := github_com_gogo_protobuf_types.StdUInt32MarshalTo(msg, dAtA[i:]) + if len(m.NullableFloat) > 0 { + for iNdEx := len(m.NullableFloat) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.NullableFloat[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(*m.NullableFloat[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x3a } } - if len(m.NullableBool) > 0 { - for _, msg := range m.NullableBool { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(*msg))) - n, err := github_com_gogo_protobuf_types.StdBoolMarshalTo(*msg, dAtA[i:]) + if len(m.NonnullDouble) > 0 { + for iNdEx := len(m.NonnullDouble) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdDoubleMarshalTo(m.NonnullDouble[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble(m.NonnullDouble[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x32 } } - if len(m.NonnullBool) > 0 { - for _, msg := range m.NonnullBool { - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(msg))) - n, err := github_com_gogo_protobuf_types.StdBoolMarshalTo(msg, dAtA[i:]) + if len(m.NullableDouble) > 0 { + for iNdEx := len(m.NullableDouble) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*m.NullableDouble[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble(*m.NullableDouble[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x2a } } - if len(m.NullableString) > 0 { - for _, msg := range m.NullableString { - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(*msg))) - n, err := github_com_gogo_protobuf_types.StdStringMarshalTo(*msg, dAtA[i:]) + if len(m.Durations) > 0 { + for iNdEx := len(m.Durations) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.Durations[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.Durations[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x22 } } - if len(m.NonnullString) > 0 { - for _, msg := range m.NonnullString { - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(msg))) - n, err := github_com_gogo_protobuf_types.StdStringMarshalTo(msg, dAtA[i:]) + if len(m.Timestamps) > 0 { + for iNdEx := len(m.Timestamps) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamps[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamps[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x1a } } - if len(m.NullableBytes) > 0 { - for _, msg := range m.NullableBytes { - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(*msg))) - n, err := github_com_gogo_protobuf_types.StdBytesMarshalTo(*msg, dAtA[i:]) + if len(m.NullableDurations) > 0 { + for iNdEx := len(m.NullableDurations) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.NullableDurations[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.NullableDurations[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0x12 } } - if len(m.NonnullBytes) > 0 { - for _, msg := range m.NonnullBytes { - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(msg))) - n, err := github_com_gogo_protobuf_types.StdBytesMarshalTo(msg, dAtA[i:]) + if len(m.NullableTimestamps) > 0 { + for iNdEx := len(m.NullableTimestamps) - 1; iNdEx >= 0; iNdEx-- { + n, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.NullableTimestamps[iNdEx], dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.NullableTimestamps[iNdEx]):]) if err != nil { return 0, err } - i += n + i -= n + i = encodeVarintTypes(dAtA, i, uint64(n)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *MapProtoTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -8079,606 +7685,546 @@ } func (m *MapProtoTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MapProtoTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.NullableTimestamp) > 0 { - for k := range m.NullableTimestamp { - dAtA[i] = 0xa - i++ - v := m.NullableTimestamp[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n56, err56 := v.MarshalTo(dAtA[i:]) - if err56 != nil { - return 0, err56 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.NonnullBytes) > 0 { + for k := range m.NonnullBytes { + v := m.NonnullBytes[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i += n56 + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - } - } - if len(m.Timestamp) > 0 { - for k := range m.Timestamp { + i-- dAtA[i] = 0x12 - i++ - v := m.Timestamp[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n57, err57 := (&v).MarshalTo(dAtA[i:]) - if err57 != nil { - return 0, err57 - } - i += n57 + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 } } - if len(m.NullableDuration) > 0 { - for k := range m.NullableDuration { - dAtA[i] = 0x1a - i++ - v := m.NullableDuration[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableBytes) > 0 { + for k := range m.NullableBytes { + v := m.NullableBytes[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n58, err58 := v.MarshalTo(dAtA[i:]) - if err58 != nil { - return 0, err58 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n58 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa } } - if len(m.Duration) > 0 { - for k := range m.Duration { - dAtA[i] = 0x22 - i++ - v := m.Duration[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullString) > 0 { + for k := range m.NonnullString { + v := m.NonnullString[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n59, err59 := (&v).MarshalTo(dAtA[i:]) - if err59 != nil { - return 0, err59 - } - i += n59 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 } } - if len(m.NullableDouble) > 0 { - for k := range m.NullableDouble { - dAtA[i] = 0x2a - i++ - v := m.NullableDouble[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableString) > 0 { + for k := range m.NullableString { + v := m.NullableString[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n60, err60 := v.MarshalTo(dAtA[i:]) - if err60 != nil { - return 0, err60 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n60 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a } } - if len(m.NonnullDouble) > 0 { - for k := range m.NonnullDouble { - dAtA[i] = 0x32 - i++ - v := m.NonnullDouble[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullBool) > 0 { + for k := range m.NonnullBool { + v := m.NonnullBool[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n61, err61 := (&v).MarshalTo(dAtA[i:]) - if err61 != nil { - return 0, err61 - } - i += n61 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 } } - if len(m.NullableFloat) > 0 { - for k := range m.NullableFloat { - dAtA[i] = 0x3a - i++ - v := m.NullableFloat[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableBool) > 0 { + for k := range m.NullableBool { + v := m.NullableBool[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n62, err62 := v.MarshalTo(dAtA[i:]) - if err62 != nil { - return 0, err62 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n62 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.NonnullFloat) > 0 { - for k := range m.NonnullFloat { - dAtA[i] = 0x42 - i++ - v := m.NonnullFloat[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullUInt32) > 0 { + for k := range m.NonnullUInt32 { + v := m.NonnullUInt32[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n63, err63 := (&v).MarshalTo(dAtA[i:]) - if err63 != nil { - return 0, err63 - } - i += n63 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.NullableInt64) > 0 { - for k := range m.NullableInt64 { - dAtA[i] = 0x4a - i++ - v := m.NullableInt64[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableUInt32) > 0 { + for k := range m.NullableUInt32 { + v := m.NullableUInt32[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n64, err64 := v.MarshalTo(dAtA[i:]) - if err64 != nil { - return 0, err64 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n64 - } - } - } - if len(m.NonnullInt64) > 0 { - for k := range m.NonnullInt64 { - dAtA[i] = 0x52 - i++ - v := m.NonnullInt64[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + i-- + dAtA[i] = 0x12 } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n65, err65 := (&v).MarshalTo(dAtA[i:]) - if err65 != nil { - return 0, err65 - } - i += n65 + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.NullableUInt64) > 0 { - for k := range m.NullableUInt64 { - dAtA[i] = 0x5a - i++ - v := m.NullableUInt64[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullInt32) > 0 { + for k := range m.NonnullInt32 { + v := m.NonnullInt32[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ + i-- + dAtA[i] = 0x12 i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 + } + } + if len(m.NullableInt32) > 0 { + for k := range m.NullableInt32 { + v := m.NullableInt32[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n66, err66 := v.MarshalTo(dAtA[i:]) - if err66 != nil { - return 0, err66 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n66 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } if len(m.NonnullUInt64) > 0 { for k := range m.NonnullUInt64 { - dAtA[i] = 0x62 - i++ v := m.NonnullUInt64[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n67, err67 := (&v).MarshalTo(dAtA[i:]) - if err67 != nil { - return 0, err67 - } - i += n67 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.NullableInt32) > 0 { - for k := range m.NullableInt32 { - dAtA[i] = 0x6a - i++ - v := m.NullableInt32[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableUInt64) > 0 { + for k := range m.NullableUInt64 { + v := m.NullableUInt64[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n68, err68 := v.MarshalTo(dAtA[i:]) - if err68 != nil { - return 0, err68 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n68 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a } } - if len(m.NonnullInt32) > 0 { - for k := range m.NonnullInt32 { - dAtA[i] = 0x72 - i++ - v := m.NonnullInt32[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullInt64) > 0 { + for k := range m.NonnullInt64 { + v := m.NonnullInt64[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n69, err69 := (&v).MarshalTo(dAtA[i:]) - if err69 != nil { - return 0, err69 - } - i += n69 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } - if len(m.NullableUInt32) > 0 { - for k := range m.NullableUInt32 { - dAtA[i] = 0x7a - i++ - v := m.NullableUInt32[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableInt64) > 0 { + for k := range m.NullableInt64 { + v := m.NullableInt64[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n70, err70 := v.MarshalTo(dAtA[i:]) - if err70 != nil { - return 0, err70 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n70 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } - if len(m.NonnullUInt32) > 0 { - for k := range m.NonnullUInt32 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullUInt32[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullFloat) > 0 { + for k := range m.NonnullFloat { + v := m.NonnullFloat[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n71, err71 := (&v).MarshalTo(dAtA[i:]) - if err71 != nil { - return 0, err71 - } - i += n71 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.NullableBool) > 0 { - for k := range m.NullableBool { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableBool[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableFloat) > 0 { + for k := range m.NullableFloat { + v := m.NullableFloat[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n72, err72 := v.MarshalTo(dAtA[i:]) - if err72 != nil { - return 0, err72 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n72 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.NonnullBool) > 0 { - for k := range m.NonnullBool { - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullBool[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullDouble) > 0 { + for k := range m.NonnullDouble { + v := m.NonnullDouble[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n73, err73 := (&v).MarshalTo(dAtA[i:]) - if err73 != nil { - return 0, err73 - } - i += n73 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.NullableString) > 0 { - for k := range m.NullableString { - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableString[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableDouble) > 0 { + for k := range m.NullableDouble { + v := m.NullableDouble[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n74, err74 := v.MarshalTo(dAtA[i:]) - if err74 != nil { - return 0, err74 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n74 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.NonnullString) > 0 { - for k := range m.NonnullString { - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullString[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.Duration) > 0 { + for k := range m.Duration { + v := m.Duration[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n75, err75 := (&v).MarshalTo(dAtA[i:]) - if err75 != nil { - return 0, err75 - } - i += n75 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 } } - if len(m.NullableBytes) > 0 { - for k := range m.NullableBytes { - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableBytes[k] - msgSize := 0 - if v != nil { - msgSize = v.Size() - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableDuration) > 0 { + for k := range m.NullableDuration { + v := m.NullableDuration[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(v.Size())) - n76, err76 := v.MarshalTo(dAtA[i:]) - if err76 != nil { - return 0, err76 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n76 + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.NonnullBytes) > 0 { - for k := range m.NonnullBytes { - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullBytes[k] - msgSize := 0 - if (&v) != nil { - msgSize = (&v).Size() - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.Timestamp) > 0 { + for k := range m.Timestamp { + v := m.Timestamp[k] + baseI := i + { + size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ + i-- + dAtA[i] = 0x12 i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64((&v).Size())) - n77, err77 := (&v).MarshalTo(dAtA[i:]) - if err77 != nil { - return 0, err77 - } - i += n77 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.NullableTimestamp) > 0 { + for k := range m.NullableTimestamp { + v := m.NullableTimestamp[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *MapStdTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -8686,606 +8232,502 @@ } func (m *MapStdTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MapStdTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.NullableTimestamp) > 0 { - for k := range m.NullableTimestamp { - dAtA[i] = 0xa - i++ - v := m.NullableTimestamp[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdTime(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*v))) - n78, err78 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*v, dAtA[i:]) - if err78 != nil { - return 0, err78 - } - i += n78 - } - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Timestamp) > 0 { - for k := range m.Timestamp { - dAtA[i] = 0x12 - i++ - v := m.Timestamp[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdTime(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*(&v)))) - n79, err79 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullBytes) > 0 { + for k := range m.NonnullBytes { + v := m.NonnullBytes[k] + baseI := i + n79, err79 := github_com_gogo_protobuf_types.StdBytesMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes((*(&v))):]) if err79 != nil { return 0, err79 } - i += n79 + i -= n79 + i = encodeVarintTypes(dAtA, i, uint64(n79)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xb2 } } - if len(m.NullableDuration) > 0 { - for k := range m.NullableDuration { - dAtA[i] = 0x1a - i++ - v := m.NullableDuration[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdDuration(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableBytes) > 0 { + for k := range m.NullableBytes { + v := m.NullableBytes[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*v))) - n80, err80 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*v, dAtA[i:]) + n80, err80 := github_com_gogo_protobuf_types.StdBytesMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes((*v)):]) if err80 != nil { return 0, err80 } - i += n80 - } - } - } - if len(m.Duration) > 0 { - for k := range m.Duration { - dAtA[i] = 0x22 - i++ - v := m.Duration[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdDuration(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) + i -= n80 + i = encodeVarintTypes(dAtA, i, uint64(n80)) + i-- + dAtA[i] = 0x12 } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*(&v)))) - n81, err81 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*(&v), dAtA[i:]) - if err81 != nil { - return 0, err81 - } - i += n81 + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa } } - if len(m.NullableDouble) > 0 { - for k := range m.NullableDouble { - dAtA[i] = 0x2a - i++ - v := m.NullableDouble[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdDouble(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.NonnullString) > 0 { + for k := range m.NonnullString { + v := m.NonnullString[k] + baseI := i + n81, err81 := github_com_gogo_protobuf_types.StdStringMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString((*(&v))):]) + if err81 != nil { + return 0, err81 } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ + i -= n81 + i = encodeVarintTypes(dAtA, i, uint64(n81)) + i-- + dAtA[i] = 0x12 i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xa2 + } + } + if len(m.NullableString) > 0 { + for k := range m.NullableString { + v := m.NullableString[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(*v))) - n82, err82 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*v, dAtA[i:]) + n82, err82 := github_com_gogo_protobuf_types.StdStringMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString((*v)):]) if err82 != nil { return 0, err82 } - i += n82 + i -= n82 + i = encodeVarintTypes(dAtA, i, uint64(n82)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x9a } } - if len(m.NonnullDouble) > 0 { - for k := range m.NonnullDouble { - dAtA[i] = 0x32 - i++ - v := m.NonnullDouble[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdDouble(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(*(&v)))) - n83, err83 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullBool) > 0 { + for k := range m.NonnullBool { + v := m.NonnullBool[k] + baseI := i + n83, err83 := github_com_gogo_protobuf_types.StdBoolMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool((*(&v))):]) if err83 != nil { return 0, err83 } - i += n83 + i -= n83 + i = encodeVarintTypes(dAtA, i, uint64(n83)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 } } - if len(m.NullableFloat) > 0 { - for k := range m.NullableFloat { - dAtA[i] = 0x3a - i++ - v := m.NullableFloat[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdFloat(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableBool) > 0 { + for k := range m.NullableBool { + v := m.NullableBool[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(*v))) - n84, err84 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*v, dAtA[i:]) + n84, err84 := github_com_gogo_protobuf_types.StdBoolMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool((*v)):]) if err84 != nil { return 0, err84 } - i += n84 + i -= n84 + i = encodeVarintTypes(dAtA, i, uint64(n84)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a } } - if len(m.NonnullFloat) > 0 { - for k := range m.NonnullFloat { - dAtA[i] = 0x42 - i++ - v := m.NonnullFloat[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdFloat(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(*(&v)))) - n85, err85 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullUInt32) > 0 { + for k := range m.NonnullUInt32 { + v := m.NonnullUInt32[k] + baseI := i + n85, err85 := github_com_gogo_protobuf_types.StdUInt32MarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32((*(&v))):]) if err85 != nil { return 0, err85 } - i += n85 + i -= n85 + i = encodeVarintTypes(dAtA, i, uint64(n85)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x82 } } - if len(m.NullableInt64) > 0 { - for k := range m.NullableInt64 { - dAtA[i] = 0x4a - i++ - v := m.NullableInt64[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdInt64(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableUInt32) > 0 { + for k := range m.NullableUInt32 { + v := m.NullableUInt32[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(*v))) - n86, err86 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*v, dAtA[i:]) + n86, err86 := github_com_gogo_protobuf_types.StdUInt32MarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32((*v)):]) if err86 != nil { return 0, err86 } - i += n86 + i -= n86 + i = encodeVarintTypes(dAtA, i, uint64(n86)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x7a } } - if len(m.NonnullInt64) > 0 { - for k := range m.NonnullInt64 { - dAtA[i] = 0x52 - i++ - v := m.NonnullInt64[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdInt64(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(*(&v)))) - n87, err87 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullInt32) > 0 { + for k := range m.NonnullInt32 { + v := m.NonnullInt32[k] + baseI := i + n87, err87 := github_com_gogo_protobuf_types.StdInt32MarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32((*(&v))):]) if err87 != nil { return 0, err87 } - i += n87 + i -= n87 + i = encodeVarintTypes(dAtA, i, uint64(n87)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x72 } } - if len(m.NullableUInt64) > 0 { - for k := range m.NullableUInt64 { - dAtA[i] = 0x5a - i++ - v := m.NullableUInt64[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdUInt64(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableInt32) > 0 { + for k := range m.NullableInt32 { + v := m.NullableInt32[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(*v))) - n88, err88 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*v, dAtA[i:]) + n88, err88 := github_com_gogo_protobuf_types.StdInt32MarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32((*v)):]) if err88 != nil { return 0, err88 } - i += n88 + i -= n88 + i = encodeVarintTypes(dAtA, i, uint64(n88)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x6a } } if len(m.NonnullUInt64) > 0 { for k := range m.NonnullUInt64 { - dAtA[i] = 0x62 - i++ v := m.NonnullUInt64[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdUInt64(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(*(&v)))) - n89, err89 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*(&v), dAtA[i:]) + baseI := i + n89, err89 := github_com_gogo_protobuf_types.StdUInt64MarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64((*(&v))):]) if err89 != nil { return 0, err89 } - i += n89 + i -= n89 + i = encodeVarintTypes(dAtA, i, uint64(n89)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x62 } } - if len(m.NullableInt32) > 0 { - for k := range m.NullableInt32 { - dAtA[i] = 0x6a - i++ - v := m.NullableInt32[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdInt32(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableUInt64) > 0 { + for k := range m.NullableUInt64 { + v := m.NullableUInt64[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(*v))) - n90, err90 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*v, dAtA[i:]) + n90, err90 := github_com_gogo_protobuf_types.StdUInt64MarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64((*v)):]) if err90 != nil { return 0, err90 } - i += n90 + i -= n90 + i = encodeVarintTypes(dAtA, i, uint64(n90)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x5a } } - if len(m.NonnullInt32) > 0 { - for k := range m.NonnullInt32 { - dAtA[i] = 0x72 - i++ - v := m.NonnullInt32[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdInt32(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(*(&v)))) - n91, err91 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullInt64) > 0 { + for k := range m.NonnullInt64 { + v := m.NonnullInt64[k] + baseI := i + n91, err91 := github_com_gogo_protobuf_types.StdInt64MarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64((*(&v))):]) if err91 != nil { return 0, err91 } - i += n91 + i -= n91 + i = encodeVarintTypes(dAtA, i, uint64(n91)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x52 } } - if len(m.NullableUInt32) > 0 { - for k := range m.NullableUInt32 { - dAtA[i] = 0x7a - i++ - v := m.NullableUInt32[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdUInt32(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableInt64) > 0 { + for k := range m.NullableInt64 { + v := m.NullableInt64[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(*v))) - n92, err92 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*v, dAtA[i:]) + n92, err92 := github_com_gogo_protobuf_types.StdInt64MarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64((*v)):]) if err92 != nil { return 0, err92 } - i += n92 + i -= n92 + i = encodeVarintTypes(dAtA, i, uint64(n92)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x4a } } - if len(m.NonnullUInt32) > 0 { - for k := range m.NonnullUInt32 { - dAtA[i] = 0x82 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullUInt32[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdUInt32(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(*(&v)))) - n93, err93 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullFloat) > 0 { + for k := range m.NonnullFloat { + v := m.NonnullFloat[k] + baseI := i + n93, err93 := github_com_gogo_protobuf_types.StdFloatMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat((*(&v))):]) if err93 != nil { return 0, err93 } - i += n93 + i -= n93 + i = encodeVarintTypes(dAtA, i, uint64(n93)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x42 } } - if len(m.NullableBool) > 0 { - for k := range m.NullableBool { - dAtA[i] = 0x8a - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableBool[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdBool(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableFloat) > 0 { + for k := range m.NullableFloat { + v := m.NullableFloat[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(*v))) - n94, err94 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*v, dAtA[i:]) + n94, err94 := github_com_gogo_protobuf_types.StdFloatMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat((*v)):]) if err94 != nil { return 0, err94 } - i += n94 + i -= n94 + i = encodeVarintTypes(dAtA, i, uint64(n94)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x3a } } - if len(m.NonnullBool) > 0 { - for k := range m.NonnullBool { - dAtA[i] = 0x92 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullBool[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdBool(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(*(&v)))) - n95, err95 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*(&v), dAtA[i:]) + if len(m.NonnullDouble) > 0 { + for k := range m.NonnullDouble { + v := m.NonnullDouble[k] + baseI := i + n95, err95 := github_com_gogo_protobuf_types.StdDoubleMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble((*(&v))):]) if err95 != nil { return 0, err95 } - i += n95 + i -= n95 + i = encodeVarintTypes(dAtA, i, uint64(n95)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x32 } } - if len(m.NullableString) > 0 { - for k := range m.NullableString { - dAtA[i] = 0x9a - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableString[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdString(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) + if len(m.NullableDouble) > 0 { + for k := range m.NullableDouble { + v := m.NullableDouble[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(*v))) - n96, err96 := github_com_gogo_protobuf_types.StdStringMarshalTo(*v, dAtA[i:]) + n96, err96 := github_com_gogo_protobuf_types.StdDoubleMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble((*v)):]) if err96 != nil { return 0, err96 } - i += n96 - } - } - } - if len(m.NonnullString) > 0 { - for k := range m.NonnullString { - dAtA[i] = 0xa2 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullString[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdString(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) + i -= n96 + i = encodeVarintTypes(dAtA, i, uint64(n96)) + i-- + dAtA[i] = 0x12 } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(*(&v)))) - n97, err97 := github_com_gogo_protobuf_types.StdStringMarshalTo(*(&v), dAtA[i:]) - if err97 != nil { - return 0, err97 - } - i += n97 + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x2a } } - if len(m.NullableBytes) > 0 { - for k := range m.NullableBytes { - dAtA[i] = 0xaa - i++ - dAtA[i] = 0x1 - i++ - v := m.NullableBytes[k] - msgSize := 0 - if v != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdBytes(*v) - msgSize += 1 + sovTypes(uint64(msgSize)) + if len(m.Duration) > 0 { + for k := range m.Duration { + v := m.Duration[k] + baseI := i + n97, err97 := github_com_gogo_protobuf_types.StdDurationMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration((*(&v))):]) + if err97 != nil { + return 0, err97 } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ + i -= n97 + i = encodeVarintTypes(dAtA, i, uint64(n97)) + i-- + dAtA[i] = 0x12 i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x22 + } + } + if len(m.NullableDuration) > 0 { + for k := range m.NullableDuration { + v := m.NullableDuration[k] + baseI := i if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(*v))) - n98, err98 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*v, dAtA[i:]) + n98, err98 := github_com_gogo_protobuf_types.StdDurationMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration((*v)):]) if err98 != nil { return 0, err98 } - i += n98 + i -= n98 + i = encodeVarintTypes(dAtA, i, uint64(n98)) + i-- + dAtA[i] = 0x12 } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x1a } } - if len(m.NonnullBytes) > 0 { - for k := range m.NonnullBytes { - dAtA[i] = 0xb2 - i++ - dAtA[i] = 0x1 - i++ - v := m.NonnullBytes[k] - msgSize := 0 - if (&v) != nil { - msgSize = github_com_gogo_protobuf_types.SizeOfStdBytes(*(&v)) - msgSize += 1 + sovTypes(uint64(msgSize)) - } - mapSize := 1 + sovTypes(uint64(k)) + msgSize - i = encodeVarintTypes(dAtA, i, uint64(mapSize)) - dAtA[i] = 0x8 - i++ - i = encodeVarintTypes(dAtA, i, uint64(k)) - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(*(&v)))) - n99, err99 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*(&v), dAtA[i:]) + if len(m.Timestamp) > 0 { + for k := range m.Timestamp { + v := m.Timestamp[k] + baseI := i + n99, err99 := github_com_gogo_protobuf_types.StdTimeMarshalTo((*(&v)), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime((*(&v))):]) if err99 != nil { return 0, err99 } - i += n99 + i -= n99 + i = encodeVarintTypes(dAtA, i, uint64(n99)) + i-- + dAtA[i] = 0x12 + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0x12 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.NullableTimestamp) > 0 { + for k := range m.NullableTimestamp { + v := m.NullableTimestamp[k] + baseI := i + if v != nil { + n100, err100 := github_com_gogo_protobuf_types.StdTimeMarshalTo((*v), dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime((*v)):]) + if err100 != nil { + return 0, err100 + } + i -= n100 + i = encodeVarintTypes(dAtA, i, uint64(n100)) + i-- + dAtA[i] = 0x12 + } + i = encodeVarintTypes(dAtA, i, uint64(k)) + i-- + dAtA[i] = 0x8 + i = encodeVarintTypes(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa + } } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -9293,181 +8735,266 @@ } func (m *OneofProtoTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.OneOfProtoTimes != nil { - nn100, err100 := m.OneOfProtoTimes.MarshalTo(dAtA[i:]) - if err100 != nil { - return 0, err100 + { + size := m.OneOfProtoTimes.Size() + i -= size + if _, err := m.OneOfProtoTimes.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn100 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_Timestamp) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_Timestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Timestamp != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Timestamp.Size())) - n101, err101 := m.Timestamp.MarshalTo(dAtA[i:]) - if err101 != nil { - return 0, err101 + { + size, err := m.Timestamp.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n101 + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_Duration) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_Duration) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Duration != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.Duration.Size())) - n102, err102 := m.Duration.MarshalTo(dAtA[i:]) - if err102 != nil { - return 0, err102 + { + size, err := m.Duration.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n102 + i-- + dAtA[i] = 0x12 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepDouble) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepDouble) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepDouble != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepDouble.Size())) - n103, err103 := m.RepDouble.MarshalTo(dAtA[i:]) - if err103 != nil { - return 0, err103 + { + size, err := m.RepDouble.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n103 + i-- + dAtA[i] = 0x1a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepFloat) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepFloat) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepFloat != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepFloat.Size())) - n104, err104 := m.RepFloat.MarshalTo(dAtA[i:]) - if err104 != nil { - return 0, err104 + { + size, err := m.RepFloat.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n104 + i-- + dAtA[i] = 0x22 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepInt64) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepInt64) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepInt64 != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepInt64.Size())) - n105, err105 := m.RepInt64.MarshalTo(dAtA[i:]) - if err105 != nil { - return 0, err105 + { + size, err := m.RepInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n105 + i-- + dAtA[i] = 0x2a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepUInt64) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepUInt64) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepUInt64 != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepUInt64.Size())) - n106, err106 := m.RepUInt64.MarshalTo(dAtA[i:]) - if err106 != nil { - return 0, err106 + { + size, err := m.RepUInt64.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n106 + i-- + dAtA[i] = 0x32 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepInt32) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepInt32) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepInt32 != nil { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepInt32.Size())) - n107, err107 := m.RepInt32.MarshalTo(dAtA[i:]) - if err107 != nil { - return 0, err107 + { + size, err := m.RepInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n107 + i-- + dAtA[i] = 0x3a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepUInt32) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepUInt32) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepUInt32 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepUInt32.Size())) - n108, err108 := m.RepUInt32.MarshalTo(dAtA[i:]) - if err108 != nil { - return 0, err108 + { + size, err := m.RepUInt32.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n108 + i-- + dAtA[i] = 0x42 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepBool) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepBool) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepBool != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepBool.Size())) - n109, err109 := m.RepBool.MarshalTo(dAtA[i:]) - if err109 != nil { - return 0, err109 + { + size, err := m.RepBool.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n109 + i-- + dAtA[i] = 0x4a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepString) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepString) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepString != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepString.Size())) - n110, err110 := m.RepString.MarshalTo(dAtA[i:]) - if err110 != nil { - return 0, err110 + { + size, err := m.RepString.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n110 + i-- + dAtA[i] = 0x52 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofProtoTypes_RepBytes) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofProtoTypes_RepBytes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepBytes != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(m.RepBytes.Size())) - n111, err111 := m.RepBytes.MarshalTo(dAtA[i:]) - if err111 != nil { - return 0, err111 + { + size, err := m.RepBytes.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTypes(dAtA, i, uint64(size)) } - i += n111 + i-- + dAtA[i] = 0x5a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -9475,260 +9002,328 @@ } func (m *OneofStdTypes) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.OneOfStdTimes != nil { - nn112, err112 := m.OneOfStdTimes.MarshalTo(dAtA[i:]) - if err112 != nil { - return 0, err112 + { + size := m.OneOfStdTimes.Size() + i -= size + if _, err := m.OneOfStdTimes.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn112 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_Timestamp) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_Timestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Timestamp != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(*m.Timestamp))) - n113, err113 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.Timestamp, dAtA[i:]) - if err113 != nil { - return 0, err113 + n112, err112 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.Timestamp):]) + if err112 != nil { + return 0, err112 } - i += n113 + i -= n112 + i = encodeVarintTypes(dAtA, i, uint64(n112)) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_Duration) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_Duration) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.Duration != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Duration))) - n114, err114 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Duration, dAtA[i:]) - if err114 != nil { - return 0, err114 + n113, err113 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Duration, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Duration):]) + if err113 != nil { + return 0, err113 } - i += n114 + i -= n113 + i = encodeVarintTypes(dAtA, i, uint64(n113)) + i-- + dAtA[i] = 0x12 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepDouble) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepDouble) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepDouble != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdDouble(*m.RepDouble))) - n115, err115 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*m.RepDouble, dAtA[i:]) - if err115 != nil { - return 0, err115 + n114, err114 := github_com_gogo_protobuf_types.StdDoubleMarshalTo(*m.RepDouble, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDouble(*m.RepDouble):]) + if err114 != nil { + return 0, err114 } - i += n115 + i -= n114 + i = encodeVarintTypes(dAtA, i, uint64(n114)) + i-- + dAtA[i] = 0x1a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepFloat) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepFloat) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepFloat != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdFloat(*m.RepFloat))) - n116, err116 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.RepFloat, dAtA[i:]) - if err116 != nil { - return 0, err116 + n115, err115 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.RepFloat, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(*m.RepFloat):]) + if err115 != nil { + return 0, err115 } - i += n116 + i -= n115 + i = encodeVarintTypes(dAtA, i, uint64(n115)) + i-- + dAtA[i] = 0x22 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepInt64) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepInt64) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepInt64 != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt64(*m.RepInt64))) - n117, err117 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*m.RepInt64, dAtA[i:]) - if err117 != nil { - return 0, err117 + n116, err116 := github_com_gogo_protobuf_types.StdInt64MarshalTo(*m.RepInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt64(*m.RepInt64):]) + if err116 != nil { + return 0, err116 } - i += n117 + i -= n116 + i = encodeVarintTypes(dAtA, i, uint64(n116)) + i-- + dAtA[i] = 0x2a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepUInt64) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepUInt64) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepUInt64 != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt64(*m.RepUInt64))) - n118, err118 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*m.RepUInt64, dAtA[i:]) - if err118 != nil { - return 0, err118 + n117, err117 := github_com_gogo_protobuf_types.StdUInt64MarshalTo(*m.RepUInt64, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt64(*m.RepUInt64):]) + if err117 != nil { + return 0, err117 } - i += n118 + i -= n117 + i = encodeVarintTypes(dAtA, i, uint64(n117)) + i-- + dAtA[i] = 0x32 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepInt32) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepInt32) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepInt32 != nil { - dAtA[i] = 0x3a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdInt32(*m.RepInt32))) - n119, err119 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.RepInt32, dAtA[i:]) - if err119 != nil { - return 0, err119 + n118, err118 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.RepInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(*m.RepInt32):]) + if err118 != nil { + return 0, err118 } - i += n119 + i -= n118 + i = encodeVarintTypes(dAtA, i, uint64(n118)) + i-- + dAtA[i] = 0x3a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepUInt32) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepUInt32) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepUInt32 != nil { - dAtA[i] = 0x42 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdUInt32(*m.RepUInt32))) - n120, err120 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*m.RepUInt32, dAtA[i:]) - if err120 != nil { - return 0, err120 + n119, err119 := github_com_gogo_protobuf_types.StdUInt32MarshalTo(*m.RepUInt32, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdUInt32(*m.RepUInt32):]) + if err119 != nil { + return 0, err119 } - i += n120 + i -= n119 + i = encodeVarintTypes(dAtA, i, uint64(n119)) + i-- + dAtA[i] = 0x42 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepBool) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepBool) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepBool != nil { - dAtA[i] = 0x4a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBool(*m.RepBool))) - n121, err121 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.RepBool, dAtA[i:]) - if err121 != nil { - return 0, err121 + n120, err120 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.RepBool, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.RepBool):]) + if err120 != nil { + return 0, err120 } - i += n121 + i -= n120 + i = encodeVarintTypes(dAtA, i, uint64(n120)) + i-- + dAtA[i] = 0x4a } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepString) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepString) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepString != nil { - dAtA[i] = 0x52 - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdString(*m.RepString))) - n122, err122 := github_com_gogo_protobuf_types.StdStringMarshalTo(*m.RepString, dAtA[i:]) - if err122 != nil { - return 0, err122 + n121, err121 := github_com_gogo_protobuf_types.StdStringMarshalTo(*m.RepString, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdString(*m.RepString):]) + if err121 != nil { + return 0, err121 } - i += n122 + i -= n121 + i = encodeVarintTypes(dAtA, i, uint64(n121)) + i-- + dAtA[i] = 0x52 } - return i, nil + return len(dAtA) - i, nil } func (m *OneofStdTypes_RepBytes) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OneofStdTypes_RepBytes) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.RepBytes != nil { - dAtA[i] = 0x5a - i++ - i = encodeVarintTypes(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdBytes(*m.RepBytes))) - n123, err123 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*m.RepBytes, dAtA[i:]) - if err123 != nil { - return 0, err123 + n122, err122 := github_com_gogo_protobuf_types.StdBytesMarshalTo(*m.RepBytes, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBytes(*m.RepBytes):]) + if err122 != nil { + return 0, err122 } - i += n123 + i -= n122 + i = encodeVarintTypes(dAtA, i, uint64(n122)) + i-- + dAtA[i] = 0x5a } - return i, nil + return len(dAtA) - i, nil } func encodeVarintTypes(dAtA []byte, offset int, v uint64) int { + offset -= sovTypes(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedKnownTypes(r randyTypes, easy bool) *KnownTypes { this := &KnownTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Dur = types.NewPopulatedDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Ts = types.NewPopulatedTimestamp(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Dbl = types.NewPopulatedDoubleValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Flt = types.NewPopulatedFloatValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.I64 = types.NewPopulatedInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.U64 = types.NewPopulatedUInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.I32 = types.NewPopulatedInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.U32 = types.NewPopulatedUInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bool = types.NewPopulatedBoolValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Str = types.NewPopulatedStringValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bytes = types.NewPopulatedBytesValue(r, easy) } + if r.Intn(5) != 0 { + this.St = types.NewPopulatedStruct(r, easy) + } if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedTypes(r, 12) + this.XXX_unrecognized = randUnrecognizedTypes(r, 13) } return this } func NewPopulatedProtoTypes(r randyTypes, easy bool) *ProtoTypes { this := &ProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableTimestamp = types.NewPopulatedTimestamp(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDuration = types.NewPopulatedDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDouble = types.NewPopulatedDoubleValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableFloat = types.NewPopulatedFloatValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt64 = types.NewPopulatedInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt64 = types.NewPopulatedUInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt32 = types.NewPopulatedInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt32 = types.NewPopulatedUInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBool = types.NewPopulatedBoolValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableString = types.NewPopulatedStringValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBytes = types.NewPopulatedBytesValue(r, easy) } v1 := types.NewPopulatedTimestamp(r, easy) @@ -9761,37 +9356,37 @@ func NewPopulatedStdTypes(r randyTypes, easy bool) *StdTypes { this := &StdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableTimestamp = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDuration = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDouble = github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableFloat = github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt64 = github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt64 = github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt32 = github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt32 = github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBool = github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableString = github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBytes = github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) } v12 := github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) @@ -9824,21 +9419,21 @@ func NewPopulatedRepProtoTypes(r randyTypes, easy bool) *RepProtoTypes { this := &RepProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(5) this.NullableTimestamps = make([]*types.Timestamp, v23) for i := 0; i < v23; i++ { this.NullableTimestamps[i] = types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(5) this.NullableDurations = make([]*types.Duration, v24) for i := 0; i < v24; i++ { this.NullableDurations[i] = types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(5) this.Timestamps = make([]types.Timestamp, v25) for i := 0; i < v25; i++ { @@ -9846,7 +9441,7 @@ this.Timestamps[i] = *v26 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(5) this.Durations = make([]types.Duration, v27) for i := 0; i < v27; i++ { @@ -9854,14 +9449,14 @@ this.Durations[i] = *v28 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(5) this.NullableDouble = make([]*types.DoubleValue, v29) for i := 0; i < v29; i++ { this.NullableDouble[i] = types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(5) this.NonnullDouble = make([]types.DoubleValue, v30) for i := 0; i < v30; i++ { @@ -9869,14 +9464,14 @@ this.NonnullDouble[i] = *v31 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(5) this.NullableFloat = make([]*types.FloatValue, v32) for i := 0; i < v32; i++ { this.NullableFloat[i] = types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(5) this.NonnullFloat = make([]types.FloatValue, v33) for i := 0; i < v33; i++ { @@ -9884,14 +9479,14 @@ this.NonnullFloat[i] = *v34 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(5) this.NullableInt64 = make([]*types.Int64Value, v35) for i := 0; i < v35; i++ { this.NullableInt64[i] = types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(5) this.NonnullInt64 = make([]types.Int64Value, v36) for i := 0; i < v36; i++ { @@ -9899,14 +9494,14 @@ this.NonnullInt64[i] = *v37 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(5) this.NullableUInt64 = make([]*types.UInt64Value, v38) for i := 0; i < v38; i++ { this.NullableUInt64[i] = types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(5) this.NonnullUInt64 = make([]types.UInt64Value, v39) for i := 0; i < v39; i++ { @@ -9914,14 +9509,14 @@ this.NonnullUInt64[i] = *v40 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(5) this.NullableInt32 = make([]*types.Int32Value, v41) for i := 0; i < v41; i++ { this.NullableInt32[i] = types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(5) this.NonnullInt32 = make([]types.Int32Value, v42) for i := 0; i < v42; i++ { @@ -9929,14 +9524,14 @@ this.NonnullInt32[i] = *v43 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(5) this.NullableUInt32 = make([]*types.UInt32Value, v44) for i := 0; i < v44; i++ { this.NullableUInt32[i] = types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(5) this.NonnullUInt32 = make([]types.UInt32Value, v45) for i := 0; i < v45; i++ { @@ -9944,14 +9539,14 @@ this.NonnullUInt32[i] = *v46 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(5) this.NullableBool = make([]*types.BoolValue, v47) for i := 0; i < v47; i++ { this.NullableBool[i] = types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v48 := r.Intn(5) this.NonnullBool = make([]types.BoolValue, v48) for i := 0; i < v48; i++ { @@ -9959,14 +9554,14 @@ this.NonnullBool[i] = *v49 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(5) this.NullableString = make([]*types.StringValue, v50) for i := 0; i < v50; i++ { this.NullableString[i] = types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(5) this.NonnullString = make([]types.StringValue, v51) for i := 0; i < v51; i++ { @@ -9974,14 +9569,14 @@ this.NonnullString[i] = *v52 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(5) this.NullableBytes = make([]*types.BytesValue, v53) for i := 0; i < v53; i++ { this.NullableBytes[i] = types.NewPopulatedBytesValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(5) this.NonnullBytes = make([]types.BytesValue, v54) for i := 0; i < v54; i++ { @@ -9997,21 +9592,21 @@ func NewPopulatedRepStdTypes(r randyTypes, easy bool) *RepStdTypes { this := &RepStdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(5) this.NullableTimestamps = make([]*time.Time, v56) for i := 0; i < v56; i++ { this.NullableTimestamps[i] = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(5) this.NullableDurations = make([]*time.Duration, v57) for i := 0; i < v57; i++ { this.NullableDurations[i] = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(5) this.Timestamps = make([]time.Time, v58) for i := 0; i < v58; i++ { @@ -10019,7 +9614,7 @@ this.Timestamps[i] = *v59 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(5) this.Durations = make([]time.Duration, v60) for i := 0; i < v60; i++ { @@ -10027,14 +9622,14 @@ this.Durations[i] = *v61 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(5) this.NullableDouble = make([]*float64, v62) for i := 0; i < v62; i++ { this.NullableDouble[i] = github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(5) this.NonnullDouble = make([]float64, v63) for i := 0; i < v63; i++ { @@ -10042,14 +9637,14 @@ this.NonnullDouble[i] = *v64 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(5) this.NullableFloat = make([]*float32, v65) for i := 0; i < v65; i++ { this.NullableFloat[i] = github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v66 := r.Intn(5) this.NonnullFloat = make([]float32, v66) for i := 0; i < v66; i++ { @@ -10057,14 +9652,14 @@ this.NonnullFloat[i] = *v67 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(5) this.NullableInt64 = make([]*int64, v68) for i := 0; i < v68; i++ { this.NullableInt64[i] = github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(5) this.NonnullInt64 = make([]int64, v69) for i := 0; i < v69; i++ { @@ -10072,14 +9667,14 @@ this.NonnullInt64[i] = *v70 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(5) this.NullableUInt64 = make([]*uint64, v71) for i := 0; i < v71; i++ { this.NullableUInt64[i] = github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v72 := r.Intn(5) this.NonnullUInt64 = make([]uint64, v72) for i := 0; i < v72; i++ { @@ -10087,14 +9682,14 @@ this.NonnullUInt64[i] = *v73 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v74 := r.Intn(5) this.NullableInt32 = make([]*int32, v74) for i := 0; i < v74; i++ { this.NullableInt32[i] = github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v75 := r.Intn(5) this.NonnullInt32 = make([]int32, v75) for i := 0; i < v75; i++ { @@ -10102,14 +9697,14 @@ this.NonnullInt32[i] = *v76 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v77 := r.Intn(5) this.NullableUInt32 = make([]*uint32, v77) for i := 0; i < v77; i++ { this.NullableUInt32[i] = github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v78 := r.Intn(5) this.NonnullUInt32 = make([]uint32, v78) for i := 0; i < v78; i++ { @@ -10117,14 +9712,14 @@ this.NonnullUInt32[i] = *v79 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v80 := r.Intn(5) this.NullableBool = make([]*bool, v80) for i := 0; i < v80; i++ { this.NullableBool[i] = github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v81 := r.Intn(5) this.NonnullBool = make([]bool, v81) for i := 0; i < v81; i++ { @@ -10132,14 +9727,14 @@ this.NonnullBool[i] = *v82 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v83 := r.Intn(5) this.NullableString = make([]*string, v83) for i := 0; i < v83; i++ { this.NullableString[i] = github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v84 := r.Intn(5) this.NonnullString = make([]string, v84) for i := 0; i < v84; i++ { @@ -10147,14 +9742,14 @@ this.NonnullString[i] = *v85 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v86 := r.Intn(5) this.NullableBytes = make([]*[]byte, v86) for i := 0; i < v86; i++ { this.NullableBytes[i] = github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v87 := r.Intn(5) this.NonnullBytes = make([][]byte, v87) for i := 0; i < v87; i++ { @@ -10170,154 +9765,154 @@ func NewPopulatedMapProtoTypes(r randyTypes, easy bool) *MapProtoTypes { this := &MapProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v89 := r.Intn(10) this.NullableTimestamp = make(map[int32]*types.Timestamp) for i := 0; i < v89; i++ { this.NullableTimestamp[int32(r.Int31())] = types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v90 := r.Intn(10) this.Timestamp = make(map[int32]types.Timestamp) for i := 0; i < v90; i++ { this.Timestamp[int32(r.Int31())] = *types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v91 := r.Intn(10) this.NullableDuration = make(map[int32]*types.Duration) for i := 0; i < v91; i++ { this.NullableDuration[int32(r.Int31())] = types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v92 := r.Intn(10) this.Duration = make(map[int32]types.Duration) for i := 0; i < v92; i++ { this.Duration[int32(r.Int31())] = *types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v93 := r.Intn(10) this.NullableDouble = make(map[int32]*types.DoubleValue) for i := 0; i < v93; i++ { this.NullableDouble[int32(r.Int31())] = types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v94 := r.Intn(10) this.NonnullDouble = make(map[int32]types.DoubleValue) for i := 0; i < v94; i++ { this.NonnullDouble[int32(r.Int31())] = *types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v95 := r.Intn(10) this.NullableFloat = make(map[int32]*types.FloatValue) for i := 0; i < v95; i++ { this.NullableFloat[int32(r.Int31())] = types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v96 := r.Intn(10) this.NonnullFloat = make(map[int32]types.FloatValue) for i := 0; i < v96; i++ { this.NonnullFloat[int32(r.Int31())] = *types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v97 := r.Intn(10) this.NullableInt64 = make(map[int32]*types.Int64Value) for i := 0; i < v97; i++ { this.NullableInt64[int32(r.Int31())] = types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v98 := r.Intn(10) this.NonnullInt64 = make(map[int32]types.Int64Value) for i := 0; i < v98; i++ { this.NonnullInt64[int32(r.Int31())] = *types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v99 := r.Intn(10) this.NullableUInt64 = make(map[int32]*types.UInt64Value) for i := 0; i < v99; i++ { this.NullableUInt64[int32(r.Int31())] = types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v100 := r.Intn(10) this.NonnullUInt64 = make(map[int32]types.UInt64Value) for i := 0; i < v100; i++ { this.NonnullUInt64[int32(r.Int31())] = *types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v101 := r.Intn(10) this.NullableInt32 = make(map[int32]*types.Int32Value) for i := 0; i < v101; i++ { this.NullableInt32[int32(r.Int31())] = types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v102 := r.Intn(10) this.NonnullInt32 = make(map[int32]types.Int32Value) for i := 0; i < v102; i++ { this.NonnullInt32[int32(r.Int31())] = *types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v103 := r.Intn(10) this.NullableUInt32 = make(map[int32]*types.UInt32Value) for i := 0; i < v103; i++ { this.NullableUInt32[int32(r.Int31())] = types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v104 := r.Intn(10) this.NonnullUInt32 = make(map[int32]types.UInt32Value) for i := 0; i < v104; i++ { this.NonnullUInt32[int32(r.Int31())] = *types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v105 := r.Intn(10) this.NullableBool = make(map[int32]*types.BoolValue) for i := 0; i < v105; i++ { this.NullableBool[int32(r.Int31())] = types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v106 := r.Intn(10) this.NonnullBool = make(map[int32]types.BoolValue) for i := 0; i < v106; i++ { this.NonnullBool[int32(r.Int31())] = *types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v107 := r.Intn(10) this.NullableString = make(map[int32]*types.StringValue) for i := 0; i < v107; i++ { this.NullableString[int32(r.Int31())] = types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v108 := r.Intn(10) this.NonnullString = make(map[int32]types.StringValue) for i := 0; i < v108; i++ { this.NonnullString[int32(r.Int31())] = *types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v109 := r.Intn(10) this.NullableBytes = make(map[int32]*types.BytesValue) for i := 0; i < v109; i++ { this.NullableBytes[int32(r.Int31())] = types.NewPopulatedBytesValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v110 := r.Intn(10) this.NonnullBytes = make(map[int32]types.BytesValue) for i := 0; i < v110; i++ { @@ -10332,154 +9927,154 @@ func NewPopulatedMapStdTypes(r randyTypes, easy bool) *MapStdTypes { this := &MapStdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v111 := r.Intn(10) this.NullableTimestamp = make(map[int32]*time.Time) for i := 0; i < v111; i++ { this.NullableTimestamp[int32(r.Int31())] = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v112 := r.Intn(10) this.Timestamp = make(map[int32]time.Time) for i := 0; i < v112; i++ { this.Timestamp[int32(r.Int31())] = *github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v113 := r.Intn(10) this.NullableDuration = make(map[int32]*time.Duration) for i := 0; i < v113; i++ { this.NullableDuration[int32(r.Int31())] = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v114 := r.Intn(10) this.Duration = make(map[int32]time.Duration) for i := 0; i < v114; i++ { this.Duration[int32(r.Int31())] = *github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v115 := r.Intn(10) this.NullableDouble = make(map[int32]*float64) for i := 0; i < v115; i++ { this.NullableDouble[int32(r.Int31())] = (*float64)(github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v116 := r.Intn(10) this.NonnullDouble = make(map[int32]float64) for i := 0; i < v116; i++ { this.NonnullDouble[int32(r.Int31())] = (float64)(*github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v117 := r.Intn(10) this.NullableFloat = make(map[int32]*float32) for i := 0; i < v117; i++ { this.NullableFloat[int32(r.Int31())] = (*float32)(github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v118 := r.Intn(10) this.NonnullFloat = make(map[int32]float32) for i := 0; i < v118; i++ { this.NonnullFloat[int32(r.Int31())] = (float32)(*github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v119 := r.Intn(10) this.NullableInt64 = make(map[int32]*int64) for i := 0; i < v119; i++ { this.NullableInt64[int32(r.Int31())] = (*int64)(github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v120 := r.Intn(10) this.NonnullInt64 = make(map[int32]int64) for i := 0; i < v120; i++ { this.NonnullInt64[int32(r.Int31())] = (int64)(*github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v121 := r.Intn(10) this.NullableUInt64 = make(map[int32]*uint64) for i := 0; i < v121; i++ { this.NullableUInt64[int32(r.Int31())] = (*uint64)(github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v122 := r.Intn(10) this.NonnullUInt64 = make(map[int32]uint64) for i := 0; i < v122; i++ { this.NonnullUInt64[int32(r.Int31())] = (uint64)(*github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v123 := r.Intn(10) this.NullableInt32 = make(map[int32]*int32) for i := 0; i < v123; i++ { this.NullableInt32[int32(r.Int31())] = (*int32)(github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v124 := r.Intn(10) this.NonnullInt32 = make(map[int32]int32) for i := 0; i < v124; i++ { this.NonnullInt32[int32(r.Int31())] = (int32)(*github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v125 := r.Intn(10) this.NullableUInt32 = make(map[int32]*uint32) for i := 0; i < v125; i++ { this.NullableUInt32[int32(r.Int31())] = (*uint32)(github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v126 := r.Intn(10) this.NonnullUInt32 = make(map[int32]uint32) for i := 0; i < v126; i++ { this.NonnullUInt32[int32(r.Int31())] = (uint32)(*github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v127 := r.Intn(10) this.NullableBool = make(map[int32]*bool) for i := 0; i < v127; i++ { this.NullableBool[int32(r.Int31())] = (*bool)(github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v128 := r.Intn(10) this.NonnullBool = make(map[int32]bool) for i := 0; i < v128; i++ { this.NonnullBool[int32(r.Int31())] = (bool)(*github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v129 := r.Intn(10) this.NullableString = make(map[int32]*string) for i := 0; i < v129; i++ { this.NullableString[int32(r.Int31())] = (*string)(github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v130 := r.Intn(10) this.NonnullString = make(map[int32]string) for i := 0; i < v130; i++ { this.NonnullString[int32(r.Int31())] = (string)(*github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v131 := r.Intn(10) this.NullableBytes = make(map[int32]*[]byte) for i := 0; i < v131; i++ { this.NullableBytes[int32(r.Int31())] = (*[]byte)(github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v132 := r.Intn(10) this.NonnullBytes = make(map[int32][]byte) for i := 0; i < v132; i++ { @@ -10791,6 +10386,10 @@ l = m.Bytes.Size() n += 1 + l + sovTypes(uint64(l)) } + if m.St != nil { + l = m.St.Size() + n += 1 + l + sovTypes(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/marshaler/types.proto golang-gogoprotobuf-1.3.1/test/types/combos/marshaler/types.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/marshaler/types.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/types/combos/marshaler/types.proto 2020-05-17 12:22:58.000000000 +0000 @@ -34,7 +34,7 @@ //import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; -//import "google/protobuf/struct.proto"; +import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; @@ -64,7 +64,7 @@ google.protobuf.BytesValue bytes = 11; // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed - // google.protobuf.Struct st = 12; + google.protobuf.Struct st = 12; // google.protobuf.Any an = 14; } @@ -134,7 +134,7 @@ repeated google.protobuf.FloatValue nullableFloat = 7; repeated google.protobuf.FloatValue nonnullFloat = 8 [(gogoproto.nullable) = false]; - + repeated google.protobuf.Int64Value nullableInt64 = 9; repeated google.protobuf.Int64Value nonnullInt64 = 10 [(gogoproto.nullable) = false]; diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/neither/types.pb.go golang-gogoprotobuf-1.3.1/test/types/combos/neither/types.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/neither/types.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/types/combos/neither/types.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -25,23 +25,25 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type KnownTypes struct { - Dur *types.Duration `protobuf:"bytes,1,opt,name=dur,proto3" json:"dur,omitempty"` - Ts *types.Timestamp `protobuf:"bytes,2,opt,name=ts,proto3" json:"ts,omitempty"` - Dbl *types.DoubleValue `protobuf:"bytes,3,opt,name=dbl,proto3" json:"dbl,omitempty"` - Flt *types.FloatValue `protobuf:"bytes,4,opt,name=flt,proto3" json:"flt,omitempty"` - I64 *types.Int64Value `protobuf:"bytes,5,opt,name=i64,proto3" json:"i64,omitempty"` - U64 *types.UInt64Value `protobuf:"bytes,6,opt,name=u64,proto3" json:"u64,omitempty"` - I32 *types.Int32Value `protobuf:"bytes,7,opt,name=i32,proto3" json:"i32,omitempty"` - U32 *types.UInt32Value `protobuf:"bytes,8,opt,name=u32,proto3" json:"u32,omitempty"` - Bool *types.BoolValue `protobuf:"bytes,9,opt,name=bool,proto3" json:"bool,omitempty"` - Str *types.StringValue `protobuf:"bytes,10,opt,name=str,proto3" json:"str,omitempty"` - Bytes *types.BytesValue `protobuf:"bytes,11,opt,name=bytes,proto3" json:"bytes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Dur *types.Duration `protobuf:"bytes,1,opt,name=dur,proto3" json:"dur,omitempty"` + Ts *types.Timestamp `protobuf:"bytes,2,opt,name=ts,proto3" json:"ts,omitempty"` + Dbl *types.DoubleValue `protobuf:"bytes,3,opt,name=dbl,proto3" json:"dbl,omitempty"` + Flt *types.FloatValue `protobuf:"bytes,4,opt,name=flt,proto3" json:"flt,omitempty"` + I64 *types.Int64Value `protobuf:"bytes,5,opt,name=i64,proto3" json:"i64,omitempty"` + U64 *types.UInt64Value `protobuf:"bytes,6,opt,name=u64,proto3" json:"u64,omitempty"` + I32 *types.Int32Value `protobuf:"bytes,7,opt,name=i32,proto3" json:"i32,omitempty"` + U32 *types.UInt32Value `protobuf:"bytes,8,opt,name=u32,proto3" json:"u32,omitempty"` + Bool *types.BoolValue `protobuf:"bytes,9,opt,name=bool,proto3" json:"bool,omitempty"` + Str *types.StringValue `protobuf:"bytes,10,opt,name=str,proto3" json:"str,omitempty"` + Bytes *types.BytesValue `protobuf:"bytes,11,opt,name=bytes,proto3" json:"bytes,omitempty"` + // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed + St *types.Struct `protobuf:"bytes,12,opt,name=st,proto3" json:"st,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *KnownTypes) Reset() { *m = KnownTypes{} } @@ -145,6 +147,13 @@ return nil } +func (m *KnownTypes) GetSt() *types.Struct { + if m != nil { + return m.St + } + return nil +} + type ProtoTypes struct { NullableTimestamp *types.Timestamp `protobuf:"bytes,1,opt,name=nullableTimestamp,proto3" json:"nullableTimestamp,omitempty"` NullableDuration *types.Duration `protobuf:"bytes,2,opt,name=nullableDuration,proto3" json:"nullableDuration,omitempty"` @@ -1432,37 +1441,37 @@ } type OneofProtoTypes_Timestamp struct { - Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof"` + Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"` } type OneofProtoTypes_Duration struct { - Duration *types.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof"` + Duration *types.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof" json:"duration,omitempty"` } type OneofProtoTypes_RepDouble struct { - RepDouble *types.DoubleValue `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof"` + RepDouble *types.DoubleValue `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof" json:"repDouble,omitempty"` } type OneofProtoTypes_RepFloat struct { - RepFloat *types.FloatValue `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof"` + RepFloat *types.FloatValue `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof" json:"repFloat,omitempty"` } type OneofProtoTypes_RepInt64 struct { - RepInt64 *types.Int64Value `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof"` + RepInt64 *types.Int64Value `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof" json:"repInt64,omitempty"` } type OneofProtoTypes_RepUInt64 struct { - RepUInt64 *types.UInt64Value `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof"` + RepUInt64 *types.UInt64Value `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof" json:"repUInt64,omitempty"` } type OneofProtoTypes_RepInt32 struct { - RepInt32 *types.Int32Value `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof"` + RepInt32 *types.Int32Value `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof" json:"repInt32,omitempty"` } type OneofProtoTypes_RepUInt32 struct { - RepUInt32 *types.UInt32Value `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof"` + RepUInt32 *types.UInt32Value `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof" json:"repUInt32,omitempty"` } type OneofProtoTypes_RepBool struct { - RepBool *types.BoolValue `protobuf:"bytes,9,opt,name=repBool,proto3,oneof"` + RepBool *types.BoolValue `protobuf:"bytes,9,opt,name=repBool,proto3,oneof" json:"repBool,omitempty"` } type OneofProtoTypes_RepString struct { - RepString *types.StringValue `protobuf:"bytes,10,opt,name=repString,proto3,oneof"` + RepString *types.StringValue `protobuf:"bytes,10,opt,name=repString,proto3,oneof" json:"repString,omitempty"` } type OneofProtoTypes_RepBytes struct { - RepBytes *types.BytesValue `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof"` + RepBytes *types.BytesValue `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof" json:"repBytes,omitempty"` } func (*OneofProtoTypes_Timestamp) isOneofProtoTypes_OneOfProtoTimes() {} @@ -1561,9 +1570,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*OneofProtoTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _OneofProtoTypes_OneofMarshaler, _OneofProtoTypes_OneofUnmarshaler, _OneofProtoTypes_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*OneofProtoTypes) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*OneofProtoTypes_Timestamp)(nil), (*OneofProtoTypes_Duration)(nil), (*OneofProtoTypes_RepDouble)(nil), @@ -1578,234 +1587,6 @@ } } -func _OneofProtoTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*OneofProtoTypes) - // OneOfProtoTimes - switch x := m.OneOfProtoTimes.(type) { - case *OneofProtoTypes_Timestamp: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Timestamp); err != nil { - return err - } - case *OneofProtoTypes_Duration: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Duration); err != nil { - return err - } - case *OneofProtoTypes_RepDouble: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepDouble); err != nil { - return err - } - case *OneofProtoTypes_RepFloat: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepFloat); err != nil { - return err - } - case *OneofProtoTypes_RepInt64: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepInt64); err != nil { - return err - } - case *OneofProtoTypes_RepUInt64: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepUInt64); err != nil { - return err - } - case *OneofProtoTypes_RepInt32: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepInt32); err != nil { - return err - } - case *OneofProtoTypes_RepUInt32: - _ = b.EncodeVarint(8<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepUInt32); err != nil { - return err - } - case *OneofProtoTypes_RepBool: - _ = b.EncodeVarint(9<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepBool); err != nil { - return err - } - case *OneofProtoTypes_RepString: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepString); err != nil { - return err - } - case *OneofProtoTypes_RepBytes: - _ = b.EncodeVarint(11<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepBytes); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("OneofProtoTypes.OneOfProtoTimes has unexpected type %T", x) - } - return nil -} - -func _OneofProtoTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*OneofProtoTypes) - switch tag { - case 1: // OneOfProtoTimes.timestamp - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Timestamp) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_Timestamp{msg} - return true, err - case 2: // OneOfProtoTimes.duration - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Duration) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_Duration{msg} - return true, err - case 3: // OneOfProtoTimes.repDouble - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.DoubleValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepDouble{msg} - return true, err - case 4: // OneOfProtoTimes.repFloat - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.FloatValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepFloat{msg} - return true, err - case 5: // OneOfProtoTimes.repInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Int64Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepInt64{msg} - return true, err - case 6: // OneOfProtoTimes.repUInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.UInt64Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepUInt64{msg} - return true, err - case 7: // OneOfProtoTimes.repInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Int32Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepInt32{msg} - return true, err - case 8: // OneOfProtoTimes.repUInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.UInt32Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepUInt32{msg} - return true, err - case 9: // OneOfProtoTimes.repBool - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.BoolValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepBool{msg} - return true, err - case 10: // OneOfProtoTimes.repString - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.StringValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepString{msg} - return true, err - case 11: // OneOfProtoTimes.repBytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.BytesValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepBytes{msg} - return true, err - default: - return false, nil - } -} - -func _OneofProtoTypes_OneofSizer(msg proto.Message) (n int) { - m := msg.(*OneofProtoTypes) - // OneOfProtoTimes - switch x := m.OneOfProtoTimes.(type) { - case *OneofProtoTypes_Timestamp: - s := proto.Size(x.Timestamp) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_Duration: - s := proto.Size(x.Duration) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepDouble: - s := proto.Size(x.RepDouble) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepFloat: - s := proto.Size(x.RepFloat) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepInt64: - s := proto.Size(x.RepInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepUInt64: - s := proto.Size(x.RepUInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepInt32: - s := proto.Size(x.RepInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepUInt32: - s := proto.Size(x.RepUInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepBool: - s := proto.Size(x.RepBool) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepString: - s := proto.Size(x.RepString) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepBytes: - s := proto.Size(x.RepBytes) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type OneofStdTypes struct { // Types that are valid to be assigned to OneOfStdTimes: // *OneofStdTypes_Timestamp @@ -1857,37 +1638,37 @@ } type OneofStdTypes_Timestamp struct { - Timestamp *time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof,stdtime"` + Timestamp *time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof,stdtime" json:"timestamp,omitempty"` } type OneofStdTypes_Duration struct { - Duration *time.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof,stdduration"` + Duration *time.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof,stdduration" json:"duration,omitempty"` } type OneofStdTypes_RepDouble struct { - RepDouble *float64 `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof,wktptr"` + RepDouble *float64 `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof,wktptr" json:"repDouble,omitempty"` } type OneofStdTypes_RepFloat struct { - RepFloat *float32 `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof,wktptr"` + RepFloat *float32 `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof,wktptr" json:"repFloat,omitempty"` } type OneofStdTypes_RepInt64 struct { - RepInt64 *int64 `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof,wktptr"` + RepInt64 *int64 `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof,wktptr" json:"repInt64,omitempty"` } type OneofStdTypes_RepUInt64 struct { - RepUInt64 *uint64 `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof,wktptr"` + RepUInt64 *uint64 `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof,wktptr" json:"repUInt64,omitempty"` } type OneofStdTypes_RepInt32 struct { - RepInt32 *int32 `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof,wktptr"` + RepInt32 *int32 `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof,wktptr" json:"repInt32,omitempty"` } type OneofStdTypes_RepUInt32 struct { - RepUInt32 *uint32 `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof,wktptr"` + RepUInt32 *uint32 `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof,wktptr" json:"repUInt32,omitempty"` } type OneofStdTypes_RepBool struct { - RepBool *bool `protobuf:"bytes,9,opt,name=repBool,proto3,oneof,wktptr"` + RepBool *bool `protobuf:"bytes,9,opt,name=repBool,proto3,oneof,wktptr" json:"repBool,omitempty"` } type OneofStdTypes_RepString struct { - RepString *string `protobuf:"bytes,10,opt,name=repString,proto3,oneof,wktptr"` + RepString *string `protobuf:"bytes,10,opt,name=repString,proto3,oneof,wktptr" json:"repString,omitempty"` } type OneofStdTypes_RepBytes struct { - RepBytes *[]byte `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof,wktptr"` + RepBytes *[]byte `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof,wktptr" json:"repBytes,omitempty"` } func (*OneofStdTypes_Timestamp) isOneofStdTypes_OneOfStdTimes() {} @@ -1986,9 +1767,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*OneofStdTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _OneofStdTypes_OneofMarshaler, _OneofStdTypes_OneofUnmarshaler, _OneofStdTypes_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*OneofStdTypes) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*OneofStdTypes_Timestamp)(nil), (*OneofStdTypes_Duration)(nil), (*OneofStdTypes_RepDouble)(nil), @@ -2003,344 +1784,6 @@ } } -func _OneofStdTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*OneofStdTypes) - // OneOfStdTimes - switch x := m.OneOfStdTimes.(type) { - case *OneofStdTypes_Timestamp: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdTimeMarshal(*x.Timestamp) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_Duration: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdDurationMarshal(*x.Duration) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepDouble: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdDoubleMarshal(*x.RepDouble) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepFloat: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdFloatMarshal(*x.RepFloat) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepInt64: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdInt64Marshal(*x.RepInt64) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepUInt64: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdUInt64Marshal(*x.RepUInt64) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepInt32: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdInt32Marshal(*x.RepInt32) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepUInt32: - _ = b.EncodeVarint(8<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdUInt32Marshal(*x.RepUInt32) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepBool: - _ = b.EncodeVarint(9<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdBoolMarshal(*x.RepBool) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepString: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdStringMarshal(*x.RepString) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepBytes: - _ = b.EncodeVarint(11<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdBytesMarshal(*x.RepBytes) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("OneofStdTypes.OneOfStdTimes has unexpected type %T", x) - } - return nil -} - -func _OneofStdTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*OneofStdTypes) - switch tag { - case 1: // OneOfStdTimes.timestamp - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(time.Time) - if err2 := github_com_gogo_protobuf_types.StdTimeUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_Timestamp{c} - return true, err - case 2: // OneOfStdTimes.duration - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(time.Duration) - if err2 := github_com_gogo_protobuf_types.StdDurationUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_Duration{c} - return true, err - case 3: // OneOfStdTimes.repDouble - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(float64) - if err2 := github_com_gogo_protobuf_types.StdDoubleUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepDouble{c} - return true, err - case 4: // OneOfStdTimes.repFloat - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(float32) - if err2 := github_com_gogo_protobuf_types.StdFloatUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepFloat{c} - return true, err - case 5: // OneOfStdTimes.repInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(int64) - if err2 := github_com_gogo_protobuf_types.StdInt64Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepInt64{c} - return true, err - case 6: // OneOfStdTimes.repUInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(uint64) - if err2 := github_com_gogo_protobuf_types.StdUInt64Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepUInt64{c} - return true, err - case 7: // OneOfStdTimes.repInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(int32) - if err2 := github_com_gogo_protobuf_types.StdInt32Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepInt32{c} - return true, err - case 8: // OneOfStdTimes.repUInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(uint32) - if err2 := github_com_gogo_protobuf_types.StdUInt32Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepUInt32{c} - return true, err - case 9: // OneOfStdTimes.repBool - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(bool) - if err2 := github_com_gogo_protobuf_types.StdBoolUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepBool{c} - return true, err - case 10: // OneOfStdTimes.repString - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(string) - if err2 := github_com_gogo_protobuf_types.StdStringUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepString{c} - return true, err - case 11: // OneOfStdTimes.repBytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new([]byte) - if err2 := github_com_gogo_protobuf_types.StdBytesUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepBytes{c} - return true, err - default: - return false, nil - } -} - -func _OneofStdTypes_OneofSizer(msg proto.Message) (n int) { - m := msg.(*OneofStdTypes) - // OneOfStdTimes - switch x := m.OneOfStdTimes.(type) { - case *OneofStdTypes_Timestamp: - s := github_com_gogo_protobuf_types.SizeOfStdTime(*x.Timestamp) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_Duration: - s := github_com_gogo_protobuf_types.SizeOfStdDuration(*x.Duration) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepDouble: - s := github_com_gogo_protobuf_types.SizeOfStdDouble(*x.RepDouble) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepFloat: - s := github_com_gogo_protobuf_types.SizeOfStdFloat(*x.RepFloat) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepInt64: - s := github_com_gogo_protobuf_types.SizeOfStdInt64(*x.RepInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepUInt64: - s := github_com_gogo_protobuf_types.SizeOfStdUInt64(*x.RepUInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepInt32: - s := github_com_gogo_protobuf_types.SizeOfStdInt32(*x.RepInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepUInt32: - s := github_com_gogo_protobuf_types.SizeOfStdUInt32(*x.RepUInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepBool: - s := github_com_gogo_protobuf_types.SizeOfStdBool(*x.RepBool) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepString: - s := github_com_gogo_protobuf_types.SizeOfStdString(*x.RepString) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepBytes: - s := github_com_gogo_protobuf_types.SizeOfStdBytes(*x.RepBytes) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*KnownTypes)(nil), "types.KnownTypes") proto.RegisterType((*ProtoTypes)(nil), "types.ProtoTypes") @@ -2400,151 +1843,153 @@ func init() { proto.RegisterFile("combos/neither/types.proto", fileDescriptor_8a0195d9a3743479) } var fileDescriptor_8a0195d9a3743479 = []byte{ - // 2297 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcf, 0x73, 0x1c, 0x47, - 0x19, 0xd5, 0x7a, 0x57, 0xb6, 0xd4, 0x92, 0x6c, 0x69, 0x1c, 0xa7, 0x06, 0x41, 0xad, 0x8d, 0x12, - 0x3b, 0x26, 0xa9, 0x48, 0x64, 0x46, 0x25, 0xc0, 0x90, 0x28, 0x99, 0xb2, 0xbd, 0xda, 0x8d, 0x64, - 0xaf, 0x57, 0x5a, 0x17, 0x04, 0x02, 0xec, 0x46, 0x63, 0x45, 0xc5, 0x7a, 0x67, 0x6b, 0x77, 0x96, - 0x94, 0x6f, 0xfc, 0x01, 0x1c, 0xb8, 0x41, 0x15, 0x17, 0xb8, 0x71, 0xe5, 0x40, 0x15, 0x47, 0x8e, - 0x39, 0xf2, 0x17, 0x40, 0x22, 0x2e, 0x5c, 0x81, 0x8b, 0x2f, 0x54, 0xa5, 0xa6, 0xbb, 0x67, 0xa6, - 0x7f, 0x7c, 0xdd, 0x3d, 0x3d, 0x25, 0xdd, 0xf6, 0x26, 0xed, 0x7e, 0xfd, 0xe6, 0xcd, 0x37, 0x6f, - 0xf4, 0xfa, 0x7d, 0xa3, 0x41, 0xeb, 0x9f, 0x44, 0xcf, 0xfb, 0xd1, 0x64, 0x6b, 0x18, 0x9e, 0xc6, - 0x9f, 0x86, 0xe3, 0xad, 0xf8, 0xc5, 0x28, 0x9c, 0x6c, 0x8e, 0xc6, 0x51, 0x1c, 0x39, 0xf3, 0xf8, - 0x97, 0xf5, 0xb7, 0x4f, 0x4e, 0xe3, 0x4f, 0xa7, 0xfd, 0xcd, 0x4f, 0xa2, 0xe7, 0x5b, 0x27, 0xd1, - 0x49, 0xb4, 0x85, 0xbf, 0xed, 0x4f, 0x9f, 0xe1, 0xdf, 0xf0, 0x2f, 0xf8, 0x27, 0xb2, 0x6a, 0xbd, - 0x7e, 0x12, 0x45, 0x27, 0x83, 0x30, 0xaf, 0x3a, 0x9e, 0x8e, 0x7b, 0xf1, 0x69, 0x34, 0xa4, 0xdf, - 0xdf, 0x14, 0xbf, 0x8f, 0x4f, 0x9f, 0x87, 0x93, 0xb8, 0xf7, 0x7c, 0xa4, 0x02, 0xf8, 0x6c, 0xdc, - 0x1b, 0x8d, 0xc2, 0x31, 0xa5, 0xb5, 0xf1, 0xfb, 0x1a, 0x42, 0x1f, 0x0e, 0xa3, 0xcf, 0x86, 0x47, - 0x09, 0x3d, 0xe7, 0x2d, 0x54, 0x3d, 0x9e, 0x8e, 0xdd, 0xca, 0xad, 0xca, 0xdd, 0x25, 0xef, 0x6b, - 0x9b, 0x64, 0xf1, 0x66, 0xba, 0x78, 0xf3, 0x3e, 0x3d, 0x7a, 0x27, 0xa9, 0x72, 0xde, 0x44, 0x97, - 0xe2, 0x89, 0x7b, 0x09, 0xd7, 0xae, 0x4b, 0xb5, 0x47, 0x29, 0x93, 0xce, 0xa5, 0x78, 0xe2, 0x6c, - 0xa2, 0xea, 0x71, 0x7f, 0xe0, 0x56, 0x71, 0xf1, 0x37, 0x64, 0xe0, 0x68, 0xda, 0x1f, 0x84, 0x4f, - 0x7b, 0x83, 0x69, 0xd8, 0x49, 0x0a, 0x9d, 0xb7, 0x51, 0xf5, 0xd9, 0x20, 0x76, 0x6b, 0xb8, 0xfe, - 0xeb, 0x52, 0xfd, 0xc3, 0x41, 0xd4, 0x8b, 0x69, 0xf9, 0xb3, 0x41, 0x9c, 0x94, 0x9f, 0xee, 0x6c, - 0xbb, 0xf3, 0x8a, 0xf2, 0xe6, 0x30, 0xde, 0xd9, 0xa6, 0xe5, 0xa7, 0x3b, 0xdb, 0x09, 0x9b, 0xe9, - 0xce, 0xb6, 0x7b, 0x59, 0xc1, 0xa6, 0xcb, 0xd6, 0x4f, 0x77, 0xb6, 0x31, 0xbc, 0xef, 0xb9, 0x57, - 0xd4, 0xf0, 0xbe, 0x97, 0xc2, 0xfb, 0x1e, 0x86, 0xf7, 0x3d, 0x77, 0x41, 0x03, 0x9f, 0xd5, 0x4f, - 0x71, 0x7d, 0xad, 0x1f, 0x45, 0x03, 0x77, 0x51, 0xd1, 0xca, 0x20, 0x8a, 0x06, 0xa4, 0x1c, 0xd7, - 0x25, 0xf8, 0x93, 0x78, 0xec, 0x22, 0x05, 0xfe, 0x61, 0x3c, 0x3e, 0x1d, 0x9e, 0x50, 0xfc, 0x49, - 0x3c, 0x76, 0xde, 0x41, 0xf3, 0xfd, 0x17, 0x71, 0x38, 0x71, 0x97, 0x14, 0x27, 0x10, 0x24, 0xdf, - 0x92, 0x05, 0xa4, 0xf2, 0x5e, 0xed, 0xdf, 0x7f, 0xbc, 0x59, 0xd9, 0xf8, 0xf5, 0x32, 0x42, 0xed, - 0xa4, 0x88, 0xa8, 0x63, 0x0f, 0xad, 0x0d, 0xa7, 0x83, 0x41, 0xaf, 0x3f, 0x08, 0xb3, 0xab, 0x4b, - 0xb5, 0xa2, 0xbb, 0xfe, 0xf2, 0x22, 0xe7, 0x01, 0x5a, 0x4d, 0x3f, 0x4c, 0x35, 0x45, 0x85, 0xa4, - 0x11, 0x9d, 0xb4, 0xc4, 0xb9, 0x8f, 0xae, 0x66, 0x9f, 0x61, 0x05, 0x15, 0x12, 0x98, 0xb0, 0xc6, - 0xf9, 0x00, 0xad, 0xa4, 0x9f, 0x60, 0x5d, 0x15, 0x51, 0x1d, 0xbf, 0x82, 0x85, 0xc0, 0xda, 0x29, - 0xa2, 0x44, 0x7e, 0x05, 0x7b, 0x2e, 0x44, 0x7f, 0x85, 0xe4, 0x29, 0xac, 0x11, 0x88, 0x14, 0xd3, - 0x2c, 0xbf, 0x42, 0x24, 0x52, 0x50, 0xc8, 0xc2, 0x1a, 0xe7, 0x3d, 0xb4, 0x9c, 0x7e, 0x12, 0x14, - 0xd3, 0x36, 0x57, 0xcf, 0xb2, 0x20, 0x7a, 0x2e, 0x24, 0x77, 0x61, 0x0d, 0xdb, 0x8e, 0xa0, 0xe8, - 0x1d, 0xc0, 0xaf, 0x70, 0xde, 0x43, 0x8b, 0xd9, 0x1f, 0x55, 0x77, 0xd9, 0x24, 0xf6, 0xa0, 0xf6, - 0xf9, 0x3f, 0x6e, 0xce, 0x75, 0xf2, 0x25, 0xce, 0xf7, 0xd1, 0x42, 0xfa, 0x47, 0xdb, 0x5d, 0x31, - 0x48, 0x9c, 0xae, 0xce, 0x16, 0x38, 0x7b, 0x68, 0x65, 0x18, 0x0d, 0x13, 0x42, 0x54, 0xdf, 0x57, - 0xcd, 0xfa, 0xa6, 0x20, 0xfc, 0x42, 0xe7, 0x01, 0x5a, 0xa6, 0x1f, 0x10, 0x8d, 0x5f, 0x33, 0x6a, - 0x9c, 0xe2, 0x70, 0xcb, 0x18, 0x18, 0xa2, 0xd1, 0x55, 0xa3, 0xce, 0x05, 0x18, 0x22, 0xd3, 0xfc, - 0xbc, 0xa8, 0xd6, 0xd7, 0xcc, 0x5a, 0x17, 0xce, 0x8b, 0x0a, 0x9e, 0x23, 0xe4, 0x7b, 0xae, 0x63, - 0xd4, 0xbb, 0x4c, 0xc8, 0xf7, 0x04, 0x42, 0xbe, 0xe7, 0x5e, 0x37, 0x6b, 0x1e, 0x20, 0xe4, 0x7b, - 0x4e, 0x80, 0x96, 0xe8, 0x07, 0x58, 0xf7, 0xaf, 0x98, 0x74, 0x4f, 0x51, 0xd8, 0x45, 0x0c, 0x1b, - 0xaa, 0xfd, 0x1b, 0x66, 0xed, 0x0b, 0x6c, 0xe8, 0x0d, 0x90, 0xb7, 0x87, 0xe8, 0xff, 0x55, 0xa3, - 0xfe, 0x85, 0xf6, 0x04, 0x8c, 0x1d, 0xfc, 0x77, 0x19, 0x2d, 0x1c, 0xc6, 0xc7, 0xc4, 0x0c, 0x1e, - 0x95, 0x32, 0x83, 0xa0, 0xf6, 0x9b, 0x7f, 0xde, 0xac, 0x40, 0x96, 0xf0, 0x61, 0x09, 0x4b, 0x08, - 0x6a, 0xbf, 0x4b, 0xd0, 0x64, 0x63, 0x68, 0x95, 0x31, 0x86, 0xa0, 0xf6, 0x87, 0x04, 0x4d, 0xb4, - 0x87, 0x86, 0xbd, 0x3d, 0x50, 0x24, 0xc1, 0x24, 0x1a, 0xf6, 0x26, 0x21, 0x02, 0x11, 0xcd, 0xb7, - 0xca, 0x58, 0x85, 0x78, 0x76, 0xf4, 0xfe, 0x69, 0xd8, 0x1b, 0x06, 0x40, 0xca, 0xf7, 0x44, 0x52, - 0xc5, 0x6c, 0x03, 0x22, 0x85, 0x2d, 0xc8, 0xd2, 0x3c, 0x28, 0x0e, 0x6f, 0x21, 0xad, 0x32, 0x16, - 0x22, 0x32, 0xa2, 0xf7, 0x51, 0xc3, 0xde, 0x48, 0xc4, 0x36, 0x11, 0x3b, 0x09, 0xec, 0xec, 0x64, - 0x21, 0xb9, 0x19, 0xf1, 0x2d, 0xc3, 0x58, 0xca, 0xae, 0x8d, 0xa5, 0x60, 0x04, 0x7c, 0x9b, 0xe4, - 0xb6, 0xb2, 0x5f, 0xc6, 0x56, 0x30, 0x10, 0x3d, 0x25, 0xce, 0x5a, 0x9a, 0xf6, 0xd6, 0x92, 0x63, - 0xf1, 0xf6, 0xd2, 0xb4, 0xb7, 0x17, 0x19, 0x8a, 0x08, 0x7b, 0xbf, 0x8c, 0xc5, 0xc8, 0xe7, 0x48, - 0x6f, 0x93, 0xa6, 0xbd, 0xcd, 0x80, 0xc4, 0x7c, 0x4f, 0x20, 0x56, 0xd0, 0x6a, 0x60, 0x62, 0xbe, - 0xe7, 0x3c, 0xb4, 0xb5, 0x9b, 0x1c, 0x89, 0xb3, 0x9c, 0xfd, 0x32, 0x96, 0x23, 0xb3, 0xa2, 0xb7, - 0x4b, 0xd3, 0xde, 0x76, 0xe4, 0x76, 0xe1, 0x2f, 0x37, 0x7e, 0xbb, 0x8c, 0x56, 0x3a, 0xe1, 0x88, - 0x89, 0x21, 0x2d, 0xe4, 0x48, 0xf6, 0x31, 0x71, 0x2b, 0xb7, 0xaa, 0x86, 0x1c, 0x02, 0xac, 0x72, - 0x1a, 0xb9, 0x8b, 0xa5, 0x77, 0x4c, 0x12, 0x69, 0xab, 0xfa, 0x24, 0x22, 0xaf, 0x71, 0xde, 0x47, - 0x28, 0xce, 0xc9, 0x54, 0x4d, 0x64, 0xa8, 0xcb, 0x32, 0x6b, 0x9c, 0x77, 0xd1, 0xe2, 0x71, 0x46, - 0xa1, 0x66, 0xa0, 0x90, 0xee, 0x33, 0xb3, 0x15, 0x40, 0x16, 0x9a, 0xc7, 0x18, 0x76, 0x59, 0x48, - 0xda, 0x70, 0x5e, 0x36, 0x83, 0xc0, 0x1b, 0x4e, 0x29, 0x55, 0x5d, 0xc1, 0x48, 0x36, 0xa9, 0x4a, - 0xdc, 0xb3, 0x2e, 0x18, 0x11, 0xc0, 0x3d, 0xab, 0x14, 0xce, 0x16, 0x15, 0x38, 0xea, 0x70, 0x26, - 0x6e, 0x7b, 0x91, 0x11, 0x01, 0xdc, 0xf6, 0xca, 0x19, 0x6f, 0x49, 0xd1, 0x5e, 0x5d, 0xc6, 0x93, - 0x36, 0xcf, 0xcb, 0x66, 0x10, 0x78, 0xf3, 0x2c, 0xa5, 0xc5, 0x15, 0xf5, 0x79, 0x29, 0xd2, 0xa2, - 0xb8, 0xff, 0xbe, 0x6a, 0x44, 0x00, 0xf7, 0xdf, 0x72, 0xe8, 0xbc, 0xa6, 0x39, 0x29, 0x55, 0xe8, - 0x94, 0x76, 0xf1, 0xab, 0x66, 0x10, 0x78, 0x17, 0x2f, 0xc6, 0xd7, 0x35, 0xc5, 0x0d, 0xad, 0x8a, - 0xaf, 0x42, 0x0a, 0x70, 0x4c, 0xcb, 0xa1, 0x14, 0x20, 0x47, 0xe0, 0xeb, 0x8a, 0xd3, 0xd1, 0x45, - 0x60, 0x29, 0x4b, 0xbc, 0x62, 0x06, 0x81, 0xb3, 0x84, 0x14, 0xa6, 0x6f, 0x28, 0xae, 0xb5, 0x3a, - 0x4c, 0xcb, 0x71, 0xa4, 0x5a, 0x3e, 0x8e, 0xfc, 0x7f, 0x19, 0x2d, 0x75, 0xc2, 0x51, 0x96, 0x48, - 0xda, 0xe5, 0x7c, 0x81, 0x46, 0x12, 0xc8, 0x1d, 0x0e, 0xca, 0xb8, 0x03, 0x0d, 0x25, 0x80, 0x47, - 0xdc, 0xb7, 0xf4, 0x88, 0x7c, 0xf3, 0xc7, 0xfa, 0xc4, 0x07, 0x56, 0x3e, 0x91, 0x6f, 0xff, 0x18, - 0xaf, 0x68, 0x95, 0xf1, 0x0a, 0x45, 0x3c, 0xda, 0x2f, 0xe3, 0x18, 0xca, 0xbd, 0x64, 0xc3, 0xde, - 0x35, 0xe0, 0xb0, 0xd5, 0xb4, 0xf7, 0x0e, 0xd5, 0xa6, 0xb4, 0x61, 0xef, 0x1f, 0x70, 0x6e, 0x6b, - 0xda, 0xbb, 0x88, 0x6a, 0x77, 0xdb, 0x2a, 0xe3, 0x24, 0x8a, 0x08, 0xb8, 0x5f, 0xc6, 0x4f, 0x94, - 0x3b, 0xe5, 0x86, 0xbd, 0xa7, 0xc0, 0x81, 0xb2, 0x69, 0xef, 0x2c, 0xaa, 0x2d, 0x77, 0xab, 0x8c, - 0xbb, 0x28, 0xb2, 0xe9, 0x7e, 0x19, 0x8f, 0x51, 0x6e, 0xdf, 0xef, 0xdb, 0xfa, 0x0c, 0x98, 0x74, - 0x1f, 0xda, 0xba, 0x8d, 0x22, 0x04, 0xb4, 0xca, 0x38, 0x8e, 0x22, 0x31, 0xef, 0x97, 0xf1, 0x1d, - 0x65, 0xa0, 0x68, 0xd8, 0x7b, 0x0f, 0x9c, 0xbf, 0x9b, 0xf6, 0x0e, 0xa4, 0x4a, 0x26, 0x7f, 0xae, - 0xa3, 0x95, 0x83, 0x1e, 0x9b, 0x4c, 0x7e, 0x04, 0xcf, 0xc4, 0x92, 0x23, 0xbc, 0xb5, 0x49, 0x9e, - 0x06, 0x72, 0x0b, 0x36, 0x1f, 0x89, 0xd5, 0x0f, 0x86, 0xf1, 0xf8, 0x05, 0x34, 0x1e, 0x6b, 0xb0, - 0x73, 0x03, 0x62, 0x41, 0xaf, 0x81, 0x90, 0x3c, 0x94, 0x3c, 0x8f, 0x7e, 0x0a, 0xcc, 0xd9, 0x88, - 0x15, 0xbd, 0xa9, 0xa5, 0x98, 0x16, 0x13, 0x86, 0xd0, 0xb3, 0x98, 0x7c, 0x28, 0x41, 0x5c, 0x69, - 0x03, 0xc4, 0xe3, 0x70, 0xa4, 0x81, 0x77, 0x5b, 0xe1, 0x4c, 0x77, 0xf5, 0xdc, 0x70, 0x29, 0x61, - 0x26, 0xfa, 0xd3, 0x21, 0xec, 0x4f, 0x6f, 0xc0, 0x80, 0x6c, 0x25, 0xcb, 0x50, 0xb0, 0xa9, 0x03, - 0xd8, 0xa6, 0xde, 0xd0, 0xb2, 0xc4, 0x95, 0x84, 0xa4, 0x60, 0x56, 0x6d, 0xd0, 0xac, 0xee, 0xe8, - 0x28, 0xe6, 0x60, 0x60, 0xe6, 0x39, 0x80, 0x3d, 0x4b, 0x4f, 0x10, 0x57, 0x0a, 0x04, 0xc9, 0x1f, - 0xf5, 0x36, 0xe8, 0x5c, 0x5a, 0x82, 0x39, 0x18, 0x18, 0x85, 0xda, 0x0a, 0x03, 0xd3, 0x5f, 0xe8, - 0x2e, 0x43, 0x51, 0xb4, 0xb1, 0x43, 0xd8, 0xc6, 0xb4, 0x17, 0xba, 0x2b, 0xb1, 0x14, 0xdc, 0xec, - 0x00, 0x76, 0x33, 0x63, 0x1f, 0x7d, 0x4f, 0xee, 0xa3, 0xef, 0xf1, 0x7d, 0xcc, 0x3c, 0xcd, 0xd4, - 0x47, 0x0a, 0x06, 0x06, 0xa7, 0xb6, 0xc2, 0xda, 0xcc, 0x7d, 0x4c, 0x29, 0x8a, 0x06, 0x77, 0x08, - 0x1b, 0x9c, 0xb1, 0x8f, 0x3c, 0x4b, 0xc1, 0xe7, 0x5a, 0xa0, 0xcf, 0xdd, 0xd1, 0x92, 0x4c, 0x0a, - 0x09, 0x45, 0xde, 0xed, 0x0e, 0x20, 0xb7, 0xbb, 0xad, 0xa3, 0x97, 0x21, 0x41, 0x31, 0xab, 0xad, - 0x30, 0x3d, 0x7d, 0x07, 0x49, 0xa9, 0xd0, 0x41, 0x6a, 0x56, 0x87, 0xb0, 0xf5, 0x69, 0x3b, 0xc8, - 0xe0, 0xc1, 0xe9, 0xeb, 0x00, 0x76, 0x40, 0xbd, 0x12, 0x71, 0xa5, 0xa0, 0x44, 0xe2, 0x83, 0x6d, - 0xd0, 0x07, 0xb5, 0x4a, 0xcc, 0xc1, 0xa0, 0x50, 0xb6, 0xfe, 0x73, 0xf4, 0x2a, 0x6c, 0x67, 0xce, - 0x2a, 0xaa, 0xfe, 0x22, 0x7c, 0x81, 0x1f, 0x0e, 0xcd, 0x77, 0x92, 0x1f, 0x9d, 0x6f, 0xa3, 0xf9, - 0x5f, 0x26, 0xde, 0x5a, 0xe0, 0xbf, 0x47, 0x48, 0xe1, 0xbd, 0x4b, 0xdf, 0xad, 0xac, 0xff, 0x10, - 0x5d, 0xbd, 0x20, 0xe4, 0x9f, 0xa2, 0x1b, 0xa0, 0xcf, 0x01, 0x07, 0xd8, 0xe2, 0x0f, 0xa0, 0x99, - 0x12, 0x32, 0xf8, 0x4f, 0xd1, 0xca, 0x85, 0xe0, 0xfe, 0x0c, 0x5d, 0x07, 0x3c, 0x10, 0x40, 0xf7, - 0x78, 0x74, 0xfd, 0x50, 0x90, 0x6b, 0x8c, 0x23, 0x7b, 0xe2, 0x39, 0xe2, 0x7f, 0x8c, 0x1c, 0xd9, - 0x1e, 0x01, 0xfc, 0x77, 0x78, 0x7c, 0xed, 0x14, 0x91, 0x81, 0xff, 0x09, 0x5a, 0x93, 0xfc, 0xf2, - 0xfc, 0xd0, 0x19, 0xf2, 0xb9, 0x8f, 0x94, 0x81, 0x67, 0x86, 0x7d, 0x20, 0xf9, 0x8b, 0x40, 0x67, - 0xa4, 0xd3, 0xd5, 0xe2, 0x1b, 0x2f, 0x6d, 0x17, 0x3e, 0x40, 0x2e, 0x9d, 0x8b, 0xc1, 0xe7, 0xbb, - 0x4f, 0xdd, 0xa7, 0x64, 0x7f, 0xd2, 0x81, 0xa2, 0xaa, 0xfb, 0xe7, 0x8e, 0x2e, 0x74, 0x5f, 0x8d, - 0x5f, 0xa8, 0x3b, 0xc0, 0x01, 0xf8, 0xee, 0x9f, 0x3f, 0xfe, 0x8f, 0xd1, 0x9a, 0xe4, 0xd3, 0x65, - 0xfe, 0x1c, 0xe7, 0x03, 0x54, 0x06, 0xfc, 0x23, 0xb4, 0x2a, 0x3a, 0xf7, 0xb9, 0x61, 0x33, 0x9d, - 0x67, 0x3c, 0xb7, 0x4c, 0x67, 0xd8, 0xa9, 0x2b, 0xd8, 0xf9, 0x8b, 0xc1, 0x67, 0x74, 0x9f, 0x3b, - 0x72, 0x19, 0x65, 0xb2, 0xff, 0xf5, 0x07, 0xe9, 0xfe, 0x02, 0xd0, 0x37, 0xfe, 0x53, 0x47, 0x4b, - 0x07, 0xbd, 0x7c, 0x66, 0xfb, 0xb1, 0x3a, 0x31, 0x7f, 0x2b, 0xdf, 0x8b, 0xa4, 0xe5, 0x8a, 0xbc, - 0xac, 0xfe, 0xa7, 0x92, 0xa6, 0x9c, 0x9a, 0xbf, 0x09, 0xc0, 0x0a, 0x70, 0xe0, 0x43, 0xf7, 0x8f, - 0x94, 0xb9, 0xf9, 0xae, 0x86, 0xa8, 0x90, 0x76, 0x15, 0xff, 0xae, 0xf2, 0x50, 0xca, 0xce, 0xb7, - 0x00, 0x4c, 0x1e, 0x0b, 0x7a, 0xae, 0x7f, 0xa4, 0x48, 0xcf, 0x77, 0x74, 0x0c, 0xd9, 0xac, 0x0b, - 0x4e, 0x78, 0xbb, 0x70, 0x82, 0xbe, 0x0d, 0x81, 0xca, 0xf9, 0x59, 0x39, 0xea, 0x7d, 0x02, 0x67, - 0xe8, 0xdb, 0x1a, 0xae, 0x6c, 0xe8, 0x85, 0x86, 0xbe, 0x1d, 0x30, 0x47, 0xbf, 0xae, 0x26, 0xca, - 0x00, 0xaa, 0xa6, 0xbf, 0x4f, 0xe0, 0x24, 0xad, 0xa3, 0xc9, 0x86, 0x4a, 0x68, 0x0e, 0xdc, 0x01, - 0xd3, 0xb4, 0x86, 0x26, 0x03, 0xa8, 0x1a, 0x08, 0x1f, 0x29, 0xf2, 0xb4, 0xee, 0xd2, 0x77, 0x25, - 0xa2, 0x62, 0xa6, 0xee, 0xc2, 0x99, 0x5a, 0x73, 0xe9, 0xbb, 0x20, 0x57, 0x21, 0x55, 0x3f, 0x81, - 0x53, 0xb5, 0xa1, 0xa7, 0x59, 0xc0, 0x84, 0xa6, 0xc5, 0x1d, 0x30, 0x59, 0xeb, 0x7b, 0x9a, 0x02, - 0xaa, 0xc6, 0xc6, 0x47, 0x8a, 0x6c, 0x6d, 0xea, 0x29, 0x4f, 0x54, 0xcc, 0xd7, 0x5d, 0x38, 0x5f, - 0x1b, 0x7a, 0x2a, 0x73, 0x15, 0x12, 0xf6, 0x23, 0x30, 0x61, 0xbf, 0xae, 0xa1, 0xca, 0xa4, 0x62, - 0x60, 0xa6, 0xfc, 0x18, 0x4a, 0xd9, 0xaf, 0xa9, 0x49, 0xe6, 0x68, 0x8a, 0xe1, 0xf2, 0x91, 0x22, - 0x67, 0xeb, 0xba, 0xc9, 0xa5, 0x62, 0x70, 0xcc, 0xdc, 0x85, 0xb3, 0xb6, 0xa6, 0x9b, 0x2c, 0xa6, - 0x72, 0xde, 0xfc, 0x04, 0x4e, 0xdb, 0x3a, 0x85, 0xb2, 0xf1, 0x18, 0x9a, 0x3c, 0x77, 0xc0, 0xc4, - 0xad, 0x51, 0x28, 0x03, 0xa8, 0x18, 0x41, 0xcf, 0x32, 0xf7, 0x2c, 0x73, 0xcf, 0x32, 0xf7, 0x2c, - 0x73, 0xcf, 0x32, 0xf7, 0x2c, 0x73, 0xcf, 0x32, 0xf7, 0x2c, 0x73, 0xc3, 0x99, 0xfb, 0x2f, 0xf3, - 0xe8, 0xda, 0xe3, 0x61, 0x18, 0x3d, 0x63, 0x9e, 0x54, 0xdf, 0x63, 0x83, 0xb1, 0xf1, 0xad, 0x8d, - 0x3d, 0xee, 0x09, 0xf2, 0x77, 0x98, 0xb4, 0x6a, 0x32, 0xce, 0x3d, 0xf6, 0xe1, 0xee, 0x0f, 0xd0, - 0xe2, 0x38, 0x1c, 0x15, 0x7f, 0x21, 0x23, 0x39, 0x6c, 0xb6, 0xc0, 0xf9, 0x1e, 0x5a, 0x18, 0x87, - 0xa3, 0xa2, 0xaf, 0x60, 0x24, 0x07, 0x4e, 0xcb, 0xe9, 0xd2, 0xa2, 0x2f, 0x5d, 0xd0, 0xa5, 0x24, - 0xaa, 0x10, 0xce, 0xc5, 0x5f, 0xb3, 0xa0, 0x9c, 0x69, 0xd0, 0xc9, 0x0e, 0x5c, 0xe8, 0xc5, 0x8a, - 0xfc, 0xc0, 0xbe, 0xc7, 0x1c, 0xb8, 0xd8, 0xab, 0x14, 0xcc, 0x81, 0x7d, 0xcf, 0xd9, 0x41, 0x57, - 0xc6, 0xe1, 0xa8, 0xd8, 0xcb, 0x13, 0x7b, 0x73, 0x9d, 0xb4, 0x98, 0x1e, 0xb5, 0xf8, 0xeb, 0x12, - 0xf4, 0xa8, 0x74, 0xd7, 0x4c, 0x4e, 0xb7, 0xe8, 0x0b, 0x12, 0xf4, 0x74, 0xf1, 0x07, 0xc1, 0x1a, - 0xd6, 0xe8, 0x63, 0xaa, 0xd1, 0x44, 0x6b, 0x1b, 0xff, 0x9b, 0x47, 0x2b, 0x58, 0xb7, 0xd9, 0xb4, - 0xe8, 0x7d, 0x2b, 0xd5, 0x92, 0xb1, 0x10, 0xaf, 0xdd, 0x77, 0x2d, 0xb4, 0x4b, 0xc6, 0x35, 0x9c, - 0x82, 0x03, 0x4b, 0x05, 0x93, 0x24, 0xc0, 0xeb, 0x78, 0xd7, 0x4a, 0xc7, 0x19, 0x42, 0xae, 0xe6, - 0x5d, 0x2b, 0x35, 0x73, 0x00, 0x44, 0x95, 0x81, 0xa5, 0xa6, 0xb9, 0xb3, 0xa0, 0xca, 0xde, 0xb5, - 0x52, 0xb6, 0x48, 0x02, 0xbf, 0x27, 0x67, 0xa7, 0x6f, 0x89, 0x04, 0xbe, 0x47, 0x8a, 0xab, 0x3c, - 0x5b, 0x9f, 0x69, 0x3d, 0xb0, 0xd4, 0x3a, 0xc7, 0x80, 0x2a, 0x7e, 0xd7, 0x4a, 0xf1, 0x5c, 0x1b, - 0x88, 0xee, 0xaf, 0x61, 0x8d, 0x3f, 0xc6, 0x1a, 0x4f, 0x54, 0x1a, 0xdc, 0xfd, 0xe2, 0xcb, 0x7a, - 0xe5, 0xe5, 0x97, 0xf5, 0xca, 0x9f, 0xce, 0xea, 0x95, 0xbf, 0x9e, 0xd5, 0x2b, 0x7f, 0x3b, 0xab, - 0x57, 0x3e, 0x3f, 0xab, 0xcf, 0xfd, 0xfd, 0xac, 0x3e, 0xf7, 0xc5, 0x59, 0xbd, 0xf2, 0xf2, 0xac, - 0x3e, 0xf7, 0xab, 0x7f, 0xd5, 0xe7, 0xfa, 0x97, 0xf1, 0x11, 0xfc, 0xaf, 0x02, 0x00, 0x00, 0xff, - 0xff, 0xf1, 0x88, 0x43, 0x17, 0x77, 0x40, 0x00, 0x00, + // 2327 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcf, 0x73, 0x23, 0x47, + 0x19, 0xb5, 0x2c, 0x69, 0xd7, 0x6e, 0x4b, 0xbb, 0xf6, 0x6c, 0x36, 0x0c, 0x26, 0xa5, 0x5d, 0x9c, + 0xec, 0x0f, 0x92, 0x8a, 0x4c, 0x66, 0x5c, 0x06, 0x16, 0x12, 0x27, 0xaa, 0xdd, 0x95, 0xa5, 0x58, + 0xbb, 0x5a, 0xd9, 0xda, 0x82, 0x40, 0x00, 0x69, 0x3d, 0xeb, 0xb8, 0xd0, 0x6a, 0x54, 0xd2, 0x88, + 0xd4, 0xde, 0xf8, 0x03, 0x38, 0x70, 0x83, 0x23, 0xdc, 0xb8, 0x72, 0xa0, 0x8a, 0x23, 0x07, 0x0e, + 0x39, 0xf2, 0x17, 0x40, 0x62, 0x2e, 0x5c, 0x81, 0x4b, 0x2e, 0x54, 0xa5, 0xa6, 0xbb, 0x67, 0xa6, + 0x7f, 0x7c, 0xdd, 0x33, 0x3d, 0x65, 0xdf, 0x74, 0xb3, 0x35, 0x5f, 0xbf, 0x79, 0xf3, 0xe9, 0x8d, + 0x5f, 0xbf, 0x6f, 0x3c, 0x68, 0xf3, 0x99, 0xff, 0x62, 0xe8, 0xcf, 0xb6, 0xc7, 0xde, 0x69, 0xf0, + 0x89, 0x37, 0xdd, 0x0e, 0x5e, 0x4e, 0xbc, 0x59, 0x7d, 0x32, 0xf5, 0x03, 0xdf, 0x2a, 0xe3, 0x5f, + 0x36, 0xdf, 0x3e, 0x39, 0x0d, 0x3e, 0x99, 0x0f, 0xeb, 0xcf, 0xfc, 0x17, 0xdb, 0x27, 0xfe, 0x89, + 0xbf, 0x8d, 0x8f, 0x0e, 0xe7, 0xcf, 0xf1, 0x6f, 0xf8, 0x17, 0xfc, 0x13, 0x59, 0xb5, 0x59, 0x3b, + 0xf1, 0xfd, 0x93, 0x91, 0x97, 0x54, 0x1d, 0xcf, 0xa7, 0x83, 0xe0, 0xd4, 0x1f, 0xd3, 0xe3, 0xaf, + 0x89, 0xc7, 0x67, 0xc1, 0x74, 0xfe, 0x2c, 0xa0, 0x47, 0x6f, 0x88, 0x47, 0x83, 0xd3, 0x17, 0xde, + 0x2c, 0x18, 0xbc, 0x98, 0xa8, 0xe0, 0x3f, 0x9d, 0x0e, 0x26, 0x13, 0x6f, 0x4a, 0x49, 0x6f, 0xfd, + 0xad, 0x84, 0xd0, 0x87, 0x63, 0xff, 0xd3, 0xf1, 0x51, 0x48, 0xde, 0x7a, 0x0b, 0x15, 0x8f, 0xe7, + 0x53, 0xbb, 0x70, 0xb3, 0x70, 0x77, 0xcd, 0xf9, 0x7a, 0x9d, 0x2c, 0xae, 0x47, 0x8b, 0xeb, 0xf7, + 0x29, 0xb7, 0x5e, 0x58, 0x65, 0xbd, 0x89, 0x96, 0x83, 0x99, 0xbd, 0x8c, 0x6b, 0x37, 0xa5, 0xda, + 0xa3, 0x88, 0x49, 0x6f, 0x39, 0x98, 0x59, 0x75, 0x54, 0x3c, 0x1e, 0x8e, 0xec, 0x22, 0x2e, 0x7e, + 0x4d, 0x06, 0xf6, 0xe7, 0xc3, 0x91, 0xf7, 0x74, 0x30, 0x9a, 0x7b, 0xbd, 0xb0, 0xd0, 0x7a, 0x1b, + 0x15, 0x9f, 0x8f, 0x02, 0xbb, 0x84, 0xeb, 0xbf, 0x21, 0xd5, 0x3f, 0x1c, 0xf9, 0x83, 0x80, 0x96, + 0x3f, 0x1f, 0x05, 0x61, 0xf9, 0xe9, 0xee, 0x8e, 0x5d, 0x56, 0x94, 0xb7, 0xc6, 0xc1, 0xee, 0x0e, + 0x2d, 0x3f, 0xdd, 0xdd, 0x09, 0xd9, 0xcc, 0x77, 0x77, 0xec, 0x4b, 0x0a, 0x36, 0x7d, 0xb6, 0x7e, + 0xbe, 0xbb, 0x83, 0xe1, 0x5d, 0xc7, 0xbe, 0xac, 0x86, 0x77, 0x9d, 0x08, 0xde, 0x75, 0x30, 0xbc, + 0xeb, 0xd8, 0x2b, 0x1a, 0xf8, 0xb8, 0x7e, 0x8e, 0xeb, 0x4b, 0x43, 0xdf, 0x1f, 0xd9, 0xab, 0x8a, + 0x56, 0x36, 0x7c, 0x7f, 0x44, 0xca, 0x71, 0x5d, 0x88, 0x3f, 0x0b, 0xa6, 0x36, 0x52, 0xe0, 0x1f, + 0x06, 0xd3, 0xd3, 0xf1, 0x09, 0xc5, 0x9f, 0x05, 0x53, 0xeb, 0x1d, 0x54, 0x1e, 0xbe, 0x0c, 0xbc, + 0x99, 0xbd, 0xa6, 0xb8, 0x80, 0x46, 0x78, 0x94, 0x2c, 0x20, 0x95, 0xd6, 0x1d, 0xb4, 0x3c, 0x0b, + 0xec, 0x0a, 0xae, 0xff, 0x1a, 0x74, 0x86, 0xf9, 0xb3, 0xa0, 0xb7, 0x3c, 0x0b, 0xee, 0x95, 0xfe, + 0xfd, 0x87, 0x1b, 0x85, 0xad, 0x5f, 0x57, 0x10, 0xea, 0x86, 0x47, 0x89, 0x8c, 0xf6, 0xd1, 0xc6, + 0x78, 0x3e, 0x1a, 0x0d, 0x86, 0x23, 0x2f, 0x96, 0x01, 0x15, 0x95, 0x4e, 0x28, 0xf2, 0x22, 0xeb, + 0x01, 0x5a, 0x8f, 0x3e, 0x8c, 0xc4, 0x47, 0x15, 0xa7, 0x51, 0xa7, 0xb4, 0xc4, 0xba, 0x8f, 0xae, + 0xc4, 0x9f, 0x61, 0xa9, 0x65, 0x52, 0xa2, 0xb0, 0xc6, 0xfa, 0x00, 0x55, 0xa3, 0x4f, 0xb0, 0x00, + 0xb3, 0xc8, 0x93, 0x5f, 0xc1, 0x42, 0x60, 0x91, 0x65, 0x91, 0x2c, 0xbf, 0x82, 0xbd, 0x16, 0x22, + 0xd4, 0x4c, 0x3a, 0x16, 0xd6, 0x08, 0x44, 0xb2, 0x89, 0x9b, 0x5f, 0x21, 0x12, 0xc9, 0xa8, 0x78, + 0x61, 0x8d, 0xf5, 0x1e, 0xaa, 0x44, 0x9f, 0x34, 0xb2, 0xdd, 0x04, 0x5c, 0x3d, 0xcb, 0x82, 0x08, + 0x3f, 0xd3, 0x7d, 0x21, 0xac, 0x61, 0xdb, 0xd1, 0xc8, 0x7a, 0xab, 0xf0, 0x2b, 0xac, 0xf7, 0xd0, + 0x6a, 0xfc, 0xd7, 0x97, 0xde, 0x39, 0x1a, 0xb1, 0x37, 0x4a, 0x9f, 0xfd, 0xe3, 0xc6, 0x52, 0x2f, + 0x59, 0x62, 0x7d, 0x1f, 0xad, 0x44, 0x7f, 0xfb, 0xed, 0x6a, 0x8a, 0xc4, 0xe9, 0xea, 0x78, 0x81, + 0xb5, 0x8f, 0xaa, 0x63, 0x7f, 0x1c, 0x12, 0xa2, 0xfa, 0xbe, 0x92, 0xae, 0x6f, 0x0a, 0xc2, 0x2f, + 0xb4, 0x1e, 0xa0, 0x0a, 0xfd, 0x80, 0x68, 0xfc, 0x6a, 0xaa, 0xc6, 0x29, 0x0e, 0xb7, 0x8c, 0x81, + 0x21, 0x1a, 0x5d, 0x4f, 0xd5, 0xb9, 0x00, 0x43, 0x64, 0x9a, 0x5c, 0x17, 0xd5, 0xfa, 0x46, 0xba, + 0xd6, 0x85, 0xeb, 0xa2, 0x82, 0xe7, 0x08, 0xb9, 0x8e, 0x6d, 0xa5, 0xea, 0x5d, 0x26, 0xe4, 0x3a, + 0x02, 0x21, 0xd7, 0xb1, 0xaf, 0xa5, 0x6b, 0x1e, 0x20, 0xe4, 0x3a, 0x56, 0x03, 0xad, 0xd1, 0x0f, + 0xb0, 0xee, 0x5f, 0x49, 0xd3, 0x3d, 0x45, 0x61, 0x17, 0x31, 0x6c, 0xa8, 0xf6, 0xaf, 0xa7, 0x6b, + 0x5f, 0x60, 0x43, 0x6f, 0x80, 0xa4, 0x3d, 0x44, 0xff, 0xaf, 0xa6, 0xea, 0x5f, 0x68, 0x0f, 0x3e, + 0x40, 0xed, 0xe0, 0xbf, 0x15, 0xb4, 0x72, 0x18, 0x1c, 0x13, 0x33, 0x78, 0x94, 0xcb, 0x0c, 0x1a, + 0xa5, 0xdf, 0xfc, 0xf3, 0x46, 0x01, 0xb2, 0x84, 0x0f, 0x73, 0x58, 0x42, 0xa3, 0xf4, 0xbb, 0x10, + 0x4d, 0x36, 0x86, 0x76, 0x1e, 0x63, 0x68, 0x94, 0x7e, 0x1f, 0xa2, 0x89, 0xf6, 0xd0, 0x34, 0xb7, + 0x07, 0x8a, 0x24, 0x98, 0x44, 0xd3, 0xdc, 0x24, 0x44, 0x20, 0xa2, 0xf9, 0x76, 0x1e, 0xab, 0x10, + 0xaf, 0x8e, 0xde, 0x3f, 0x4d, 0x73, 0xc3, 0x00, 0x48, 0xb9, 0x8e, 0x48, 0x2a, 0x9b, 0x6d, 0x40, + 0xa4, 0xb0, 0x05, 0x19, 0x9a, 0x07, 0xc5, 0xe1, 0x2d, 0xa4, 0x9d, 0xc7, 0x42, 0x44, 0x46, 0xf4, + 0x3e, 0x6a, 0x9a, 0x1b, 0x89, 0xd8, 0x26, 0x62, 0x27, 0x0d, 0x33, 0x3b, 0x59, 0x09, 0x6f, 0x46, + 0x7c, 0xcb, 0x30, 0x96, 0xb2, 0x67, 0x62, 0x29, 0x18, 0x01, 0xdf, 0x26, 0x89, 0xad, 0x1c, 0xe4, + 0xb1, 0x15, 0x0c, 0x44, 0x2f, 0x89, 0xb3, 0x96, 0x96, 0xb9, 0xb5, 0x24, 0x58, 0xbc, 0xbd, 0xb4, + 0xcc, 0xed, 0x45, 0x86, 0x22, 0xc2, 0x3e, 0xc8, 0x63, 0x31, 0xf2, 0x35, 0xd2, 0xdb, 0xa4, 0x65, + 0x6e, 0x33, 0x20, 0x31, 0xd7, 0x11, 0x88, 0x65, 0xb4, 0x1a, 0x98, 0x98, 0xeb, 0x58, 0x0f, 0x4d, + 0xed, 0x26, 0x41, 0xe2, 0x2c, 0xe7, 0x20, 0x8f, 0xe5, 0xc8, 0xac, 0xe8, 0xed, 0xd2, 0x32, 0xb7, + 0x1d, 0xb9, 0x5d, 0xf8, 0xe0, 0xd6, 0x6f, 0x2b, 0xa8, 0xda, 0xf3, 0x26, 0x4c, 0x0c, 0x69, 0x23, + 0x4b, 0xb2, 0x8f, 0x99, 0x5d, 0xb8, 0x59, 0x4c, 0xc9, 0x21, 0xc0, 0x2a, 0xab, 0x99, 0xb8, 0x58, + 0x74, 0xc7, 0x84, 0xd9, 0xb7, 0xa8, 0x4f, 0x22, 0xf2, 0x1a, 0xeb, 0x7d, 0x84, 0x82, 0x84, 0x4c, + 0x31, 0x8d, 0x0c, 0x75, 0x59, 0x66, 0x8d, 0xf5, 0x2e, 0x5a, 0x3d, 0x8e, 0x29, 0x94, 0x52, 0x28, + 0x44, 0xfb, 0xcc, 0x78, 0x05, 0x90, 0x85, 0xca, 0x18, 0xc3, 0x2c, 0x0b, 0x49, 0x1b, 0xce, 0x4b, + 0xe9, 0x20, 0xf0, 0x86, 0x53, 0x4a, 0x55, 0x97, 0x31, 0x92, 0x49, 0xaa, 0x12, 0xf7, 0xac, 0x2b, + 0xa9, 0x08, 0xe0, 0x9e, 0x55, 0x0a, 0x67, 0xab, 0x0a, 0x1c, 0x75, 0x38, 0x13, 0xb7, 0xbd, 0x28, + 0x15, 0x01, 0xdc, 0xf6, 0xca, 0x19, 0x6f, 0x4d, 0xd1, 0x5e, 0x5d, 0xc6, 0x93, 0x36, 0xcf, 0x95, + 0x74, 0x10, 0x78, 0xf3, 0x2c, 0xa5, 0xc5, 0xaa, 0xfa, 0xba, 0x14, 0x69, 0x51, 0xdc, 0x7f, 0x5f, + 0x49, 0x45, 0x00, 0xf7, 0xdf, 0x72, 0xe8, 0xbc, 0xaa, 0xb9, 0x28, 0x55, 0xe8, 0x94, 0x76, 0xf1, + 0xeb, 0xe9, 0x20, 0xf0, 0x2e, 0x5e, 0x8c, 0xaf, 0x1b, 0x8a, 0x1b, 0x5a, 0x15, 0x5f, 0x85, 0x14, + 0x60, 0xa5, 0x2d, 0x87, 0x52, 0x80, 0x1c, 0x81, 0xaf, 0x29, 0x2e, 0x47, 0x17, 0x81, 0xa5, 0x2c, + 0xf1, 0x4a, 0x3a, 0x08, 0x9c, 0x25, 0xa4, 0x30, 0x7d, 0x5d, 0xf1, 0x5d, 0xab, 0xc3, 0xb4, 0x1c, + 0x47, 0x8a, 0xf9, 0xe3, 0xc8, 0xff, 0x2b, 0x68, 0xad, 0xe7, 0x4d, 0xe2, 0x44, 0xd2, 0xcd, 0xe7, + 0x0b, 0x34, 0x92, 0x40, 0xee, 0xd0, 0xc9, 0xe3, 0x0e, 0x34, 0x94, 0x00, 0x1e, 0x71, 0xdf, 0xd0, + 0x23, 0x92, 0xcd, 0x1f, 0xeb, 0x13, 0x1f, 0x18, 0xf9, 0x44, 0xb2, 0xfd, 0x63, 0xbc, 0xa2, 0x9d, + 0xc7, 0x2b, 0x14, 0xf1, 0xe8, 0x20, 0x8f, 0x63, 0x28, 0xf7, 0x92, 0x4d, 0x73, 0xd7, 0x80, 0xc3, + 0x56, 0xcb, 0xdc, 0x3b, 0x54, 0x9b, 0xd2, 0xa6, 0xb9, 0x7f, 0xc0, 0xb9, 0xad, 0x65, 0xee, 0x22, + 0xaa, 0xdd, 0x6d, 0x3b, 0x8f, 0x93, 0x28, 0x22, 0xe0, 0x41, 0x1e, 0x3f, 0x51, 0xee, 0x94, 0x9b, + 0xe6, 0x9e, 0x02, 0x07, 0xca, 0x96, 0xb9, 0xb3, 0xa8, 0xb6, 0xdc, 0xed, 0x3c, 0xee, 0xa2, 0xc8, + 0xa6, 0x07, 0x79, 0x3c, 0x46, 0xb9, 0x7d, 0xbf, 0x6f, 0xea, 0x33, 0x60, 0xd2, 0x7d, 0x68, 0xea, + 0x36, 0x8a, 0x10, 0xd0, 0xce, 0xe3, 0x38, 0x8a, 0xc4, 0x7c, 0x90, 0xc7, 0x77, 0x94, 0x81, 0xa2, + 0x69, 0xee, 0x3d, 0x70, 0xfe, 0x6e, 0x99, 0x3b, 0x90, 0x2a, 0x99, 0xfc, 0xa9, 0x86, 0xaa, 0x9d, + 0x01, 0x9b, 0x4c, 0x7e, 0x04, 0xcf, 0xc4, 0xc2, 0x33, 0xbc, 0x55, 0x27, 0x0f, 0x15, 0xb9, 0x05, + 0xf5, 0x47, 0x62, 0xf5, 0x83, 0x71, 0x30, 0x7d, 0x09, 0x8d, 0xc7, 0x9a, 0xec, 0xdc, 0x80, 0x58, + 0xd0, 0xeb, 0x20, 0x24, 0x0f, 0x25, 0xcf, 0xa3, 0x9f, 0x02, 0x73, 0x36, 0x62, 0x45, 0x6f, 0x6a, + 0x29, 0x46, 0xc5, 0x84, 0x21, 0xf4, 0x2c, 0x26, 0x19, 0x4a, 0x10, 0x57, 0xda, 0x02, 0xf1, 0x38, + 0x1c, 0x69, 0xe0, 0xdd, 0x55, 0x38, 0xd3, 0x5d, 0x3d, 0x37, 0x5c, 0x4a, 0x98, 0x89, 0xfe, 0x74, + 0x08, 0xfb, 0xd3, 0x1d, 0x18, 0x90, 0xad, 0x64, 0x19, 0x0a, 0x36, 0xd5, 0x81, 0x6d, 0xea, 0x8e, + 0x96, 0x25, 0xae, 0x24, 0x24, 0x05, 0xb3, 0xea, 0x82, 0x66, 0x75, 0x5b, 0x47, 0x31, 0x01, 0x03, + 0x33, 0x4f, 0x07, 0xf6, 0x2c, 0x3d, 0x41, 0x5c, 0x29, 0x10, 0x24, 0x7f, 0xd4, 0xbb, 0xa0, 0x73, + 0x69, 0x09, 0x26, 0x60, 0x60, 0x14, 0xea, 0x2a, 0x0c, 0x4c, 0xff, 0x45, 0xf7, 0x19, 0x8a, 0xa2, + 0x8d, 0x1d, 0xc2, 0x36, 0xa6, 0xfd, 0xa2, 0xfb, 0x12, 0x4b, 0xc1, 0xcd, 0x3a, 0xb0, 0x9b, 0xa5, + 0xf6, 0xd1, 0x75, 0xe4, 0x3e, 0xba, 0x0e, 0xdf, 0xc7, 0xd8, 0xd3, 0xd2, 0xfa, 0x48, 0xc1, 0xc0, + 0xe0, 0xd4, 0x55, 0x58, 0x5b, 0x7a, 0x1f, 0x23, 0x8a, 0xa2, 0xc1, 0x1d, 0xc2, 0x06, 0x97, 0xda, + 0x47, 0x9e, 0xa5, 0xe0, 0x73, 0x6d, 0xd0, 0xe7, 0x6e, 0x6b, 0x49, 0x86, 0x85, 0x84, 0x22, 0xef, + 0x76, 0x1d, 0xc8, 0xed, 0x6e, 0xe9, 0xe8, 0xc5, 0x48, 0x50, 0xcc, 0xea, 0x2a, 0x4c, 0x4f, 0xdf, + 0x41, 0x52, 0x2a, 0x74, 0x90, 0x9a, 0xd5, 0x21, 0x6c, 0x7d, 0xda, 0x0e, 0x32, 0x78, 0x70, 0xfa, + 0xea, 0xc0, 0x0e, 0xa8, 0x57, 0x22, 0xae, 0x14, 0x94, 0x48, 0x7c, 0xb0, 0x0b, 0xfa, 0xa0, 0x56, + 0x89, 0x09, 0x18, 0x14, 0xca, 0x36, 0x7f, 0x8e, 0x5e, 0x85, 0xed, 0xcc, 0x5a, 0x47, 0xc5, 0x5f, + 0x78, 0x2f, 0xf1, 0xc3, 0xa1, 0x72, 0x2f, 0xfc, 0xd1, 0xfa, 0x36, 0x2a, 0xff, 0x32, 0xf4, 0xd6, + 0x0c, 0xff, 0x66, 0x42, 0x0a, 0xef, 0x2d, 0x7f, 0xb7, 0xb0, 0xf9, 0x43, 0x74, 0xe5, 0x82, 0x90, + 0x7f, 0x8a, 0xae, 0x83, 0x3e, 0x07, 0x9c, 0x60, 0x9b, 0x3f, 0x81, 0x66, 0x4a, 0xc8, 0xe0, 0x3f, + 0x45, 0xd5, 0x0b, 0xc1, 0xfd, 0x19, 0xba, 0x06, 0x78, 0x20, 0x80, 0xee, 0xf0, 0xe8, 0xfa, 0xa1, + 0x20, 0xd7, 0x18, 0x4b, 0xf6, 0xc4, 0x73, 0xc4, 0xff, 0x18, 0x59, 0xb2, 0x3d, 0x02, 0xf8, 0xef, + 0xf0, 0xf8, 0xda, 0x29, 0x22, 0x03, 0xff, 0x13, 0xb4, 0x21, 0xf9, 0xe5, 0xf9, 0xa1, 0x33, 0xe4, + 0x13, 0x1f, 0xc9, 0x03, 0xcf, 0x0c, 0xfb, 0x40, 0xf2, 0x17, 0x81, 0xce, 0x48, 0xa7, 0xaf, 0xc5, + 0x4f, 0xfd, 0x6a, 0xfb, 0xf0, 0x09, 0x12, 0xe9, 0x5c, 0x0c, 0x3e, 0xdf, 0x7d, 0xea, 0x3e, 0x39, + 0xfb, 0x13, 0x0d, 0x14, 0x55, 0xdd, 0x3f, 0x77, 0x74, 0xa1, 0xfb, 0x6a, 0xfc, 0x4c, 0xdd, 0x01, + 0x4e, 0xc0, 0x77, 0xff, 0xfc, 0xf1, 0x7f, 0x8c, 0x36, 0x24, 0x9f, 0xce, 0xf3, 0xe7, 0x38, 0x19, + 0xa0, 0x32, 0xe0, 0x1f, 0xa1, 0x75, 0xd1, 0xb9, 0xcf, 0x0d, 0x9b, 0xe9, 0x3c, 0xe3, 0xb9, 0x79, + 0x3a, 0xc3, 0x4e, 0x5d, 0xc1, 0xce, 0x5f, 0x0c, 0x3e, 0xa3, 0xfb, 0xc4, 0x91, 0xf3, 0x28, 0x93, + 0xfd, 0xf7, 0x40, 0x48, 0xf7, 0x17, 0x80, 0xbe, 0xf5, 0x9f, 0x1a, 0x5a, 0xeb, 0x0c, 0x92, 0x99, + 0xed, 0xc7, 0xea, 0xc4, 0xfc, 0xad, 0x64, 0x2f, 0x12, 0x95, 0x2b, 0xf2, 0xb2, 0xfa, 0x9f, 0x4a, + 0x5a, 0x72, 0x6a, 0xfe, 0x26, 0x00, 0x2b, 0xc0, 0x81, 0x0f, 0xdd, 0x3f, 0x52, 0xe6, 0xe6, 0xbb, + 0x1a, 0xa2, 0x42, 0xda, 0x55, 0xfc, 0xbb, 0xca, 0x43, 0x29, 0x3b, 0xdf, 0x04, 0x30, 0x79, 0x2c, + 0xe8, 0xb9, 0xfe, 0x91, 0x22, 0x3d, 0xdf, 0xd6, 0x31, 0x64, 0xb3, 0x2e, 0x38, 0xe1, 0xed, 0xc3, + 0x09, 0xfa, 0x16, 0x04, 0x2a, 0xe7, 0x67, 0xe5, 0xa8, 0xf7, 0x09, 0x9c, 0xa1, 0x6f, 0x69, 0xb8, + 0xb2, 0xa1, 0x17, 0x1a, 0xfa, 0xf6, 0xc0, 0x1c, 0xfd, 0x86, 0x9a, 0x28, 0x03, 0xa8, 0x9a, 0xfe, + 0x3e, 0x81, 0x93, 0xb4, 0x8e, 0x26, 0x1b, 0x2a, 0xa1, 0x39, 0x70, 0x0f, 0x4c, 0xd3, 0x1a, 0x9a, + 0x0c, 0xa0, 0x6a, 0x20, 0x7c, 0xa4, 0xc8, 0xd3, 0xba, 0xaf, 0xbe, 0x2f, 0x11, 0x15, 0x33, 0x75, + 0x1f, 0xce, 0xd4, 0x9a, 0xaf, 0xbe, 0x0f, 0x72, 0x15, 0x52, 0xf5, 0x13, 0x38, 0x55, 0xa7, 0xf4, + 0x34, 0x0e, 0x98, 0xd0, 0xb4, 0xb8, 0x07, 0x26, 0x6b, 0x7d, 0x4f, 0x23, 0x40, 0xd5, 0xd8, 0xf8, + 0x48, 0x91, 0xad, 0xd3, 0x7a, 0xca, 0x13, 0x15, 0xf3, 0x75, 0x1f, 0xce, 0xd7, 0x29, 0x3d, 0x95, + 0xb9, 0x0a, 0x09, 0xfb, 0x11, 0x98, 0xb0, 0xdf, 0xd0, 0x50, 0x65, 0x52, 0x31, 0x30, 0x53, 0x7e, + 0x0c, 0xa5, 0xec, 0xd7, 0xd5, 0x24, 0x13, 0x34, 0xc5, 0x70, 0xf9, 0x48, 0x91, 0xb3, 0x75, 0xdd, + 0xe4, 0x52, 0x31, 0x38, 0x66, 0xee, 0xc3, 0x59, 0x5b, 0xd3, 0x4d, 0x16, 0x53, 0x39, 0x6f, 0x7e, + 0x02, 0xa7, 0x6d, 0x9d, 0x42, 0xd9, 0x78, 0x0c, 0x4d, 0x9e, 0x7b, 0x60, 0xe2, 0xd6, 0x28, 0x94, + 0x01, 0x54, 0x8c, 0xa0, 0x17, 0x99, 0x7b, 0x91, 0xb9, 0x17, 0x99, 0x7b, 0x91, 0xb9, 0x17, 0x99, + 0x7b, 0x91, 0xb9, 0x17, 0x99, 0x7b, 0x91, 0xb9, 0xe1, 0xcc, 0xfd, 0xe7, 0x32, 0xba, 0xfa, 0x78, + 0xec, 0xf9, 0xcf, 0x99, 0x27, 0xd5, 0xf7, 0xd8, 0x60, 0x9c, 0xfa, 0xd6, 0xc6, 0x3e, 0xf7, 0x04, + 0xf9, 0x3b, 0x4c, 0x5a, 0x4d, 0x33, 0xce, 0x7d, 0xf6, 0xe1, 0xee, 0x0f, 0xd0, 0xea, 0xd4, 0x9b, + 0x64, 0x7f, 0x21, 0x23, 0x3c, 0x6d, 0xbc, 0xc0, 0xfa, 0x1e, 0x5a, 0x99, 0x7a, 0x93, 0xac, 0xaf, + 0x60, 0x84, 0x27, 0x8e, 0xca, 0xe9, 0xd2, 0xac, 0x2f, 0x5d, 0xd0, 0xa5, 0x24, 0xaa, 0x10, 0xce, + 0xd9, 0x5f, 0xb3, 0xa0, 0x9c, 0x69, 0xd0, 0x89, 0x4f, 0x9c, 0xe9, 0xc5, 0x8a, 0xe4, 0xc4, 0xae, + 0xc3, 0x9c, 0x38, 0xdb, 0xab, 0x14, 0xcc, 0x89, 0x5d, 0xc7, 0xda, 0x45, 0x97, 0xa7, 0xde, 0x24, + 0xdb, 0xcb, 0x13, 0xfb, 0x4b, 0xbd, 0xa8, 0x98, 0x9e, 0x35, 0xfb, 0xeb, 0x12, 0xf4, 0xac, 0x74, + 0xd7, 0x4c, 0x2e, 0x37, 0xeb, 0x0b, 0x12, 0xf4, 0x72, 0xf1, 0x07, 0x8d, 0x0d, 0xac, 0xd1, 0xc7, + 0x54, 0xa3, 0xa1, 0xd6, 0xb6, 0xfe, 0x57, 0x46, 0x55, 0xac, 0xdb, 0x78, 0x5a, 0xf4, 0xbe, 0x91, + 0x6a, 0xc9, 0x58, 0x88, 0xd7, 0xee, 0xbb, 0x06, 0xda, 0x25, 0xe3, 0x1a, 0x4e, 0xc1, 0x0d, 0x43, + 0x05, 0x93, 0x24, 0xc0, 0xeb, 0x78, 0xcf, 0x48, 0xc7, 0x31, 0x42, 0xa2, 0xe6, 0x3d, 0x23, 0x35, + 0x73, 0x00, 0x44, 0x95, 0x0d, 0x43, 0x4d, 0x73, 0x57, 0x41, 0x95, 0xbd, 0x67, 0xa4, 0x6c, 0x91, + 0x04, 0x7e, 0x4f, 0xce, 0x4c, 0xdf, 0x12, 0x09, 0x7c, 0x8f, 0x64, 0x57, 0x79, 0xbc, 0x3e, 0xd6, + 0x7a, 0xc3, 0x50, 0xeb, 0x1c, 0x03, 0xaa, 0xf8, 0x3d, 0x23, 0xc5, 0x73, 0x6d, 0x20, 0xba, 0xbf, + 0x8a, 0x35, 0xfe, 0x18, 0x6b, 0x3c, 0x54, 0x69, 0xe3, 0xee, 0xe7, 0x5f, 0xd4, 0x0a, 0x5f, 0x7e, + 0x51, 0x2b, 0xfc, 0xf1, 0xac, 0x56, 0xf8, 0xcb, 0x59, 0xad, 0xf0, 0xd7, 0xb3, 0x5a, 0xe1, 0xb3, + 0xb3, 0xda, 0xd2, 0xdf, 0xcf, 0x6a, 0x4b, 0x9f, 0x9f, 0xd5, 0x0a, 0x5f, 0x9e, 0xd5, 0x96, 0x7e, + 0xf5, 0xaf, 0xda, 0xd2, 0xf0, 0x12, 0x3e, 0x83, 0xfb, 0x55, 0x00, 0x00, 0x00, 0xff, 0xff, 0x21, + 0x65, 0x8f, 0x44, 0xbe, 0x40, 0x00, 0x00, } func (this *KnownTypes) Compare(that interface{}) int { @@ -2605,6 +2050,9 @@ if c := this.Bytes.Compare(that1.Bytes); c != 0 { return c } + if c := this.St.Compare(that1.St); c != 0 { + return c + } if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { return c } @@ -3036,6 +2484,9 @@ if !this.Bytes.Equal(that1.Bytes) { return fmt.Errorf("Bytes this(%v) Not Equal that(%v)", this.Bytes, that1.Bytes) } + if !this.St.Equal(that1.St) { + return fmt.Errorf("St this(%v) Not Equal that(%v)", this.St, that1.St) + } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized) } @@ -3093,6 +2544,9 @@ if !this.Bytes.Equal(that1.Bytes) { return false } + if !this.St.Equal(that1.St) { + return false + } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return false } @@ -6792,78 +6246,81 @@ } func NewPopulatedKnownTypes(r randyTypes, easy bool) *KnownTypes { this := &KnownTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Dur = types.NewPopulatedDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Ts = types.NewPopulatedTimestamp(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Dbl = types.NewPopulatedDoubleValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Flt = types.NewPopulatedFloatValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.I64 = types.NewPopulatedInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.U64 = types.NewPopulatedUInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.I32 = types.NewPopulatedInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.U32 = types.NewPopulatedUInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bool = types.NewPopulatedBoolValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Str = types.NewPopulatedStringValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bytes = types.NewPopulatedBytesValue(r, easy) } + if r.Intn(5) != 0 { + this.St = types.NewPopulatedStruct(r, easy) + } if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedTypes(r, 12) + this.XXX_unrecognized = randUnrecognizedTypes(r, 13) } return this } func NewPopulatedProtoTypes(r randyTypes, easy bool) *ProtoTypes { this := &ProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableTimestamp = types.NewPopulatedTimestamp(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDuration = types.NewPopulatedDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDouble = types.NewPopulatedDoubleValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableFloat = types.NewPopulatedFloatValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt64 = types.NewPopulatedInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt64 = types.NewPopulatedUInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt32 = types.NewPopulatedInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt32 = types.NewPopulatedUInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBool = types.NewPopulatedBoolValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableString = types.NewPopulatedStringValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBytes = types.NewPopulatedBytesValue(r, easy) } v1 := types.NewPopulatedTimestamp(r, easy) @@ -6896,37 +6353,37 @@ func NewPopulatedStdTypes(r randyTypes, easy bool) *StdTypes { this := &StdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableTimestamp = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDuration = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDouble = github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableFloat = github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt64 = github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt64 = github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt32 = github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt32 = github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBool = github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableString = github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBytes = github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) } v12 := github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) @@ -6959,21 +6416,21 @@ func NewPopulatedRepProtoTypes(r randyTypes, easy bool) *RepProtoTypes { this := &RepProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(5) this.NullableTimestamps = make([]*types.Timestamp, v23) for i := 0; i < v23; i++ { this.NullableTimestamps[i] = types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(5) this.NullableDurations = make([]*types.Duration, v24) for i := 0; i < v24; i++ { this.NullableDurations[i] = types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(5) this.Timestamps = make([]types.Timestamp, v25) for i := 0; i < v25; i++ { @@ -6981,7 +6438,7 @@ this.Timestamps[i] = *v26 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(5) this.Durations = make([]types.Duration, v27) for i := 0; i < v27; i++ { @@ -6989,14 +6446,14 @@ this.Durations[i] = *v28 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(5) this.NullableDouble = make([]*types.DoubleValue, v29) for i := 0; i < v29; i++ { this.NullableDouble[i] = types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(5) this.NonnullDouble = make([]types.DoubleValue, v30) for i := 0; i < v30; i++ { @@ -7004,14 +6461,14 @@ this.NonnullDouble[i] = *v31 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(5) this.NullableFloat = make([]*types.FloatValue, v32) for i := 0; i < v32; i++ { this.NullableFloat[i] = types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(5) this.NonnullFloat = make([]types.FloatValue, v33) for i := 0; i < v33; i++ { @@ -7019,14 +6476,14 @@ this.NonnullFloat[i] = *v34 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(5) this.NullableInt64 = make([]*types.Int64Value, v35) for i := 0; i < v35; i++ { this.NullableInt64[i] = types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(5) this.NonnullInt64 = make([]types.Int64Value, v36) for i := 0; i < v36; i++ { @@ -7034,14 +6491,14 @@ this.NonnullInt64[i] = *v37 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(5) this.NullableUInt64 = make([]*types.UInt64Value, v38) for i := 0; i < v38; i++ { this.NullableUInt64[i] = types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(5) this.NonnullUInt64 = make([]types.UInt64Value, v39) for i := 0; i < v39; i++ { @@ -7049,14 +6506,14 @@ this.NonnullUInt64[i] = *v40 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(5) this.NullableInt32 = make([]*types.Int32Value, v41) for i := 0; i < v41; i++ { this.NullableInt32[i] = types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(5) this.NonnullInt32 = make([]types.Int32Value, v42) for i := 0; i < v42; i++ { @@ -7064,14 +6521,14 @@ this.NonnullInt32[i] = *v43 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(5) this.NullableUInt32 = make([]*types.UInt32Value, v44) for i := 0; i < v44; i++ { this.NullableUInt32[i] = types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(5) this.NonnullUInt32 = make([]types.UInt32Value, v45) for i := 0; i < v45; i++ { @@ -7079,14 +6536,14 @@ this.NonnullUInt32[i] = *v46 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(5) this.NullableBool = make([]*types.BoolValue, v47) for i := 0; i < v47; i++ { this.NullableBool[i] = types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v48 := r.Intn(5) this.NonnullBool = make([]types.BoolValue, v48) for i := 0; i < v48; i++ { @@ -7094,14 +6551,14 @@ this.NonnullBool[i] = *v49 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(5) this.NullableString = make([]*types.StringValue, v50) for i := 0; i < v50; i++ { this.NullableString[i] = types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(5) this.NonnullString = make([]types.StringValue, v51) for i := 0; i < v51; i++ { @@ -7109,14 +6566,14 @@ this.NonnullString[i] = *v52 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(5) this.NullableBytes = make([]*types.BytesValue, v53) for i := 0; i < v53; i++ { this.NullableBytes[i] = types.NewPopulatedBytesValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(5) this.NonnullBytes = make([]types.BytesValue, v54) for i := 0; i < v54; i++ { @@ -7132,21 +6589,21 @@ func NewPopulatedRepStdTypes(r randyTypes, easy bool) *RepStdTypes { this := &RepStdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(5) this.NullableTimestamps = make([]*time.Time, v56) for i := 0; i < v56; i++ { this.NullableTimestamps[i] = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(5) this.NullableDurations = make([]*time.Duration, v57) for i := 0; i < v57; i++ { this.NullableDurations[i] = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(5) this.Timestamps = make([]time.Time, v58) for i := 0; i < v58; i++ { @@ -7154,7 +6611,7 @@ this.Timestamps[i] = *v59 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(5) this.Durations = make([]time.Duration, v60) for i := 0; i < v60; i++ { @@ -7162,14 +6619,14 @@ this.Durations[i] = *v61 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(5) this.NullableDouble = make([]*float64, v62) for i := 0; i < v62; i++ { this.NullableDouble[i] = github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(5) this.NonnullDouble = make([]float64, v63) for i := 0; i < v63; i++ { @@ -7177,14 +6634,14 @@ this.NonnullDouble[i] = *v64 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(5) this.NullableFloat = make([]*float32, v65) for i := 0; i < v65; i++ { this.NullableFloat[i] = github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v66 := r.Intn(5) this.NonnullFloat = make([]float32, v66) for i := 0; i < v66; i++ { @@ -7192,14 +6649,14 @@ this.NonnullFloat[i] = *v67 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(5) this.NullableInt64 = make([]*int64, v68) for i := 0; i < v68; i++ { this.NullableInt64[i] = github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(5) this.NonnullInt64 = make([]int64, v69) for i := 0; i < v69; i++ { @@ -7207,14 +6664,14 @@ this.NonnullInt64[i] = *v70 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(5) this.NullableUInt64 = make([]*uint64, v71) for i := 0; i < v71; i++ { this.NullableUInt64[i] = github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v72 := r.Intn(5) this.NonnullUInt64 = make([]uint64, v72) for i := 0; i < v72; i++ { @@ -7222,14 +6679,14 @@ this.NonnullUInt64[i] = *v73 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v74 := r.Intn(5) this.NullableInt32 = make([]*int32, v74) for i := 0; i < v74; i++ { this.NullableInt32[i] = github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v75 := r.Intn(5) this.NonnullInt32 = make([]int32, v75) for i := 0; i < v75; i++ { @@ -7237,14 +6694,14 @@ this.NonnullInt32[i] = *v76 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v77 := r.Intn(5) this.NullableUInt32 = make([]*uint32, v77) for i := 0; i < v77; i++ { this.NullableUInt32[i] = github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v78 := r.Intn(5) this.NonnullUInt32 = make([]uint32, v78) for i := 0; i < v78; i++ { @@ -7252,14 +6709,14 @@ this.NonnullUInt32[i] = *v79 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v80 := r.Intn(5) this.NullableBool = make([]*bool, v80) for i := 0; i < v80; i++ { this.NullableBool[i] = github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v81 := r.Intn(5) this.NonnullBool = make([]bool, v81) for i := 0; i < v81; i++ { @@ -7267,14 +6724,14 @@ this.NonnullBool[i] = *v82 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v83 := r.Intn(5) this.NullableString = make([]*string, v83) for i := 0; i < v83; i++ { this.NullableString[i] = github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v84 := r.Intn(5) this.NonnullString = make([]string, v84) for i := 0; i < v84; i++ { @@ -7282,14 +6739,14 @@ this.NonnullString[i] = *v85 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v86 := r.Intn(5) this.NullableBytes = make([]*[]byte, v86) for i := 0; i < v86; i++ { this.NullableBytes[i] = github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v87 := r.Intn(5) this.NonnullBytes = make([][]byte, v87) for i := 0; i < v87; i++ { @@ -7305,154 +6762,154 @@ func NewPopulatedMapProtoTypes(r randyTypes, easy bool) *MapProtoTypes { this := &MapProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v89 := r.Intn(10) this.NullableTimestamp = make(map[int32]*types.Timestamp) for i := 0; i < v89; i++ { this.NullableTimestamp[int32(r.Int31())] = types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v90 := r.Intn(10) this.Timestamp = make(map[int32]types.Timestamp) for i := 0; i < v90; i++ { this.Timestamp[int32(r.Int31())] = *types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v91 := r.Intn(10) this.NullableDuration = make(map[int32]*types.Duration) for i := 0; i < v91; i++ { this.NullableDuration[int32(r.Int31())] = types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v92 := r.Intn(10) this.Duration = make(map[int32]types.Duration) for i := 0; i < v92; i++ { this.Duration[int32(r.Int31())] = *types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v93 := r.Intn(10) this.NullableDouble = make(map[int32]*types.DoubleValue) for i := 0; i < v93; i++ { this.NullableDouble[int32(r.Int31())] = types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v94 := r.Intn(10) this.NonnullDouble = make(map[int32]types.DoubleValue) for i := 0; i < v94; i++ { this.NonnullDouble[int32(r.Int31())] = *types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v95 := r.Intn(10) this.NullableFloat = make(map[int32]*types.FloatValue) for i := 0; i < v95; i++ { this.NullableFloat[int32(r.Int31())] = types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v96 := r.Intn(10) this.NonnullFloat = make(map[int32]types.FloatValue) for i := 0; i < v96; i++ { this.NonnullFloat[int32(r.Int31())] = *types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v97 := r.Intn(10) this.NullableInt64 = make(map[int32]*types.Int64Value) for i := 0; i < v97; i++ { this.NullableInt64[int32(r.Int31())] = types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v98 := r.Intn(10) this.NonnullInt64 = make(map[int32]types.Int64Value) for i := 0; i < v98; i++ { this.NonnullInt64[int32(r.Int31())] = *types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v99 := r.Intn(10) this.NullableUInt64 = make(map[int32]*types.UInt64Value) for i := 0; i < v99; i++ { this.NullableUInt64[int32(r.Int31())] = types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v100 := r.Intn(10) this.NonnullUInt64 = make(map[int32]types.UInt64Value) for i := 0; i < v100; i++ { this.NonnullUInt64[int32(r.Int31())] = *types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v101 := r.Intn(10) this.NullableInt32 = make(map[int32]*types.Int32Value) for i := 0; i < v101; i++ { this.NullableInt32[int32(r.Int31())] = types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v102 := r.Intn(10) this.NonnullInt32 = make(map[int32]types.Int32Value) for i := 0; i < v102; i++ { this.NonnullInt32[int32(r.Int31())] = *types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v103 := r.Intn(10) this.NullableUInt32 = make(map[int32]*types.UInt32Value) for i := 0; i < v103; i++ { this.NullableUInt32[int32(r.Int31())] = types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v104 := r.Intn(10) this.NonnullUInt32 = make(map[int32]types.UInt32Value) for i := 0; i < v104; i++ { this.NonnullUInt32[int32(r.Int31())] = *types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v105 := r.Intn(10) this.NullableBool = make(map[int32]*types.BoolValue) for i := 0; i < v105; i++ { this.NullableBool[int32(r.Int31())] = types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v106 := r.Intn(10) this.NonnullBool = make(map[int32]types.BoolValue) for i := 0; i < v106; i++ { this.NonnullBool[int32(r.Int31())] = *types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v107 := r.Intn(10) this.NullableString = make(map[int32]*types.StringValue) for i := 0; i < v107; i++ { this.NullableString[int32(r.Int31())] = types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v108 := r.Intn(10) this.NonnullString = make(map[int32]types.StringValue) for i := 0; i < v108; i++ { this.NonnullString[int32(r.Int31())] = *types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v109 := r.Intn(10) this.NullableBytes = make(map[int32]*types.BytesValue) for i := 0; i < v109; i++ { this.NullableBytes[int32(r.Int31())] = types.NewPopulatedBytesValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v110 := r.Intn(10) this.NonnullBytes = make(map[int32]types.BytesValue) for i := 0; i < v110; i++ { @@ -7467,154 +6924,154 @@ func NewPopulatedMapStdTypes(r randyTypes, easy bool) *MapStdTypes { this := &MapStdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v111 := r.Intn(10) this.NullableTimestamp = make(map[int32]*time.Time) for i := 0; i < v111; i++ { this.NullableTimestamp[int32(r.Int31())] = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v112 := r.Intn(10) this.Timestamp = make(map[int32]time.Time) for i := 0; i < v112; i++ { this.Timestamp[int32(r.Int31())] = *github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v113 := r.Intn(10) this.NullableDuration = make(map[int32]*time.Duration) for i := 0; i < v113; i++ { this.NullableDuration[int32(r.Int31())] = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v114 := r.Intn(10) this.Duration = make(map[int32]time.Duration) for i := 0; i < v114; i++ { this.Duration[int32(r.Int31())] = *github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v115 := r.Intn(10) this.NullableDouble = make(map[int32]*float64) for i := 0; i < v115; i++ { this.NullableDouble[int32(r.Int31())] = (*float64)(github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v116 := r.Intn(10) this.NonnullDouble = make(map[int32]float64) for i := 0; i < v116; i++ { this.NonnullDouble[int32(r.Int31())] = (float64)(*github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v117 := r.Intn(10) this.NullableFloat = make(map[int32]*float32) for i := 0; i < v117; i++ { this.NullableFloat[int32(r.Int31())] = (*float32)(github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v118 := r.Intn(10) this.NonnullFloat = make(map[int32]float32) for i := 0; i < v118; i++ { this.NonnullFloat[int32(r.Int31())] = (float32)(*github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v119 := r.Intn(10) this.NullableInt64 = make(map[int32]*int64) for i := 0; i < v119; i++ { this.NullableInt64[int32(r.Int31())] = (*int64)(github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v120 := r.Intn(10) this.NonnullInt64 = make(map[int32]int64) for i := 0; i < v120; i++ { this.NonnullInt64[int32(r.Int31())] = (int64)(*github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v121 := r.Intn(10) this.NullableUInt64 = make(map[int32]*uint64) for i := 0; i < v121; i++ { this.NullableUInt64[int32(r.Int31())] = (*uint64)(github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v122 := r.Intn(10) this.NonnullUInt64 = make(map[int32]uint64) for i := 0; i < v122; i++ { this.NonnullUInt64[int32(r.Int31())] = (uint64)(*github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v123 := r.Intn(10) this.NullableInt32 = make(map[int32]*int32) for i := 0; i < v123; i++ { this.NullableInt32[int32(r.Int31())] = (*int32)(github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v124 := r.Intn(10) this.NonnullInt32 = make(map[int32]int32) for i := 0; i < v124; i++ { this.NonnullInt32[int32(r.Int31())] = (int32)(*github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v125 := r.Intn(10) this.NullableUInt32 = make(map[int32]*uint32) for i := 0; i < v125; i++ { this.NullableUInt32[int32(r.Int31())] = (*uint32)(github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v126 := r.Intn(10) this.NonnullUInt32 = make(map[int32]uint32) for i := 0; i < v126; i++ { this.NonnullUInt32[int32(r.Int31())] = (uint32)(*github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v127 := r.Intn(10) this.NullableBool = make(map[int32]*bool) for i := 0; i < v127; i++ { this.NullableBool[int32(r.Int31())] = (*bool)(github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v128 := r.Intn(10) this.NonnullBool = make(map[int32]bool) for i := 0; i < v128; i++ { this.NonnullBool[int32(r.Int31())] = (bool)(*github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v129 := r.Intn(10) this.NullableString = make(map[int32]*string) for i := 0; i < v129; i++ { this.NullableString[int32(r.Int31())] = (*string)(github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v130 := r.Intn(10) this.NonnullString = make(map[int32]string) for i := 0; i < v130; i++ { this.NonnullString[int32(r.Int31())] = (string)(*github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v131 := r.Intn(10) this.NullableBytes = make(map[int32]*[]byte) for i := 0; i < v131; i++ { this.NullableBytes[int32(r.Int31())] = (*[]byte)(github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v132 := r.Intn(10) this.NonnullBytes = make(map[int32][]byte) for i := 0; i < v132; i++ { @@ -7926,6 +7383,10 @@ l = m.Bytes.Size() n += 1 + l + sovTypes(uint64(l)) } + if m.St != nil { + l = m.St.Size() + n += 1 + l + sovTypes(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/neither/types.proto golang-gogoprotobuf-1.3.1/test/types/combos/neither/types.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/neither/types.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/types/combos/neither/types.proto 2020-05-17 12:22:58.000000000 +0000 @@ -34,7 +34,7 @@ //import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; -//import "google/protobuf/struct.proto"; +import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; @@ -64,7 +64,7 @@ google.protobuf.BytesValue bytes = 11; // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed - // google.protobuf.Struct st = 12; + google.protobuf.Struct st = 12; // google.protobuf.Any an = 14; } @@ -134,7 +134,7 @@ repeated google.protobuf.FloatValue nullableFloat = 7; repeated google.protobuf.FloatValue nonnullFloat = 8 [(gogoproto.nullable) = false]; - + repeated google.protobuf.Int64Value nullableInt64 = 9; repeated google.protobuf.Int64Value nonnullInt64 = 10 [(gogoproto.nullable) = false]; diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/unmarshaler/types.pb.go golang-gogoprotobuf-1.3.1/test/types/combos/unmarshaler/types.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/unmarshaler/types.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/types/combos/unmarshaler/types.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -26,23 +26,25 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type KnownTypes struct { - Dur *types.Duration `protobuf:"bytes,1,opt,name=dur,proto3" json:"dur,omitempty"` - Ts *types.Timestamp `protobuf:"bytes,2,opt,name=ts,proto3" json:"ts,omitempty"` - Dbl *types.DoubleValue `protobuf:"bytes,3,opt,name=dbl,proto3" json:"dbl,omitempty"` - Flt *types.FloatValue `protobuf:"bytes,4,opt,name=flt,proto3" json:"flt,omitempty"` - I64 *types.Int64Value `protobuf:"bytes,5,opt,name=i64,proto3" json:"i64,omitempty"` - U64 *types.UInt64Value `protobuf:"bytes,6,opt,name=u64,proto3" json:"u64,omitempty"` - I32 *types.Int32Value `protobuf:"bytes,7,opt,name=i32,proto3" json:"i32,omitempty"` - U32 *types.UInt32Value `protobuf:"bytes,8,opt,name=u32,proto3" json:"u32,omitempty"` - Bool *types.BoolValue `protobuf:"bytes,9,opt,name=bool,proto3" json:"bool,omitempty"` - Str *types.StringValue `protobuf:"bytes,10,opt,name=str,proto3" json:"str,omitempty"` - Bytes *types.BytesValue `protobuf:"bytes,11,opt,name=bytes,proto3" json:"bytes,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Dur *types.Duration `protobuf:"bytes,1,opt,name=dur,proto3" json:"dur,omitempty"` + Ts *types.Timestamp `protobuf:"bytes,2,opt,name=ts,proto3" json:"ts,omitempty"` + Dbl *types.DoubleValue `protobuf:"bytes,3,opt,name=dbl,proto3" json:"dbl,omitempty"` + Flt *types.FloatValue `protobuf:"bytes,4,opt,name=flt,proto3" json:"flt,omitempty"` + I64 *types.Int64Value `protobuf:"bytes,5,opt,name=i64,proto3" json:"i64,omitempty"` + U64 *types.UInt64Value `protobuf:"bytes,6,opt,name=u64,proto3" json:"u64,omitempty"` + I32 *types.Int32Value `protobuf:"bytes,7,opt,name=i32,proto3" json:"i32,omitempty"` + U32 *types.UInt32Value `protobuf:"bytes,8,opt,name=u32,proto3" json:"u32,omitempty"` + Bool *types.BoolValue `protobuf:"bytes,9,opt,name=bool,proto3" json:"bool,omitempty"` + Str *types.StringValue `protobuf:"bytes,10,opt,name=str,proto3" json:"str,omitempty"` + Bytes *types.BytesValue `protobuf:"bytes,11,opt,name=bytes,proto3" json:"bytes,omitempty"` + // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed + St *types.Struct `protobuf:"bytes,12,opt,name=st,proto3" json:"st,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *KnownTypes) Reset() { *m = KnownTypes{} } @@ -146,6 +148,13 @@ return nil } +func (m *KnownTypes) GetSt() *types.Struct { + if m != nil { + return m.St + } + return nil +} + type ProtoTypes struct { NullableTimestamp *types.Timestamp `protobuf:"bytes,1,opt,name=nullableTimestamp,proto3" json:"nullableTimestamp,omitempty"` NullableDuration *types.Duration `protobuf:"bytes,2,opt,name=nullableDuration,proto3" json:"nullableDuration,omitempty"` @@ -1433,37 +1442,37 @@ } type OneofProtoTypes_Timestamp struct { - Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof"` + Timestamp *types.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof" json:"timestamp,omitempty"` } type OneofProtoTypes_Duration struct { - Duration *types.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof"` + Duration *types.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof" json:"duration,omitempty"` } type OneofProtoTypes_RepDouble struct { - RepDouble *types.DoubleValue `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof"` + RepDouble *types.DoubleValue `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof" json:"repDouble,omitempty"` } type OneofProtoTypes_RepFloat struct { - RepFloat *types.FloatValue `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof"` + RepFloat *types.FloatValue `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof" json:"repFloat,omitempty"` } type OneofProtoTypes_RepInt64 struct { - RepInt64 *types.Int64Value `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof"` + RepInt64 *types.Int64Value `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof" json:"repInt64,omitempty"` } type OneofProtoTypes_RepUInt64 struct { - RepUInt64 *types.UInt64Value `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof"` + RepUInt64 *types.UInt64Value `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof" json:"repUInt64,omitempty"` } type OneofProtoTypes_RepInt32 struct { - RepInt32 *types.Int32Value `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof"` + RepInt32 *types.Int32Value `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof" json:"repInt32,omitempty"` } type OneofProtoTypes_RepUInt32 struct { - RepUInt32 *types.UInt32Value `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof"` + RepUInt32 *types.UInt32Value `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof" json:"repUInt32,omitempty"` } type OneofProtoTypes_RepBool struct { - RepBool *types.BoolValue `protobuf:"bytes,9,opt,name=repBool,proto3,oneof"` + RepBool *types.BoolValue `protobuf:"bytes,9,opt,name=repBool,proto3,oneof" json:"repBool,omitempty"` } type OneofProtoTypes_RepString struct { - RepString *types.StringValue `protobuf:"bytes,10,opt,name=repString,proto3,oneof"` + RepString *types.StringValue `protobuf:"bytes,10,opt,name=repString,proto3,oneof" json:"repString,omitempty"` } type OneofProtoTypes_RepBytes struct { - RepBytes *types.BytesValue `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof"` + RepBytes *types.BytesValue `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof" json:"repBytes,omitempty"` } func (*OneofProtoTypes_Timestamp) isOneofProtoTypes_OneOfProtoTimes() {} @@ -1562,9 +1571,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*OneofProtoTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _OneofProtoTypes_OneofMarshaler, _OneofProtoTypes_OneofUnmarshaler, _OneofProtoTypes_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*OneofProtoTypes) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*OneofProtoTypes_Timestamp)(nil), (*OneofProtoTypes_Duration)(nil), (*OneofProtoTypes_RepDouble)(nil), @@ -1579,234 +1588,6 @@ } } -func _OneofProtoTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*OneofProtoTypes) - // OneOfProtoTimes - switch x := m.OneOfProtoTimes.(type) { - case *OneofProtoTypes_Timestamp: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Timestamp); err != nil { - return err - } - case *OneofProtoTypes_Duration: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.Duration); err != nil { - return err - } - case *OneofProtoTypes_RepDouble: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepDouble); err != nil { - return err - } - case *OneofProtoTypes_RepFloat: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepFloat); err != nil { - return err - } - case *OneofProtoTypes_RepInt64: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepInt64); err != nil { - return err - } - case *OneofProtoTypes_RepUInt64: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepUInt64); err != nil { - return err - } - case *OneofProtoTypes_RepInt32: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepInt32); err != nil { - return err - } - case *OneofProtoTypes_RepUInt32: - _ = b.EncodeVarint(8<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepUInt32); err != nil { - return err - } - case *OneofProtoTypes_RepBool: - _ = b.EncodeVarint(9<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepBool); err != nil { - return err - } - case *OneofProtoTypes_RepString: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepString); err != nil { - return err - } - case *OneofProtoTypes_RepBytes: - _ = b.EncodeVarint(11<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.RepBytes); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("OneofProtoTypes.OneOfProtoTimes has unexpected type %T", x) - } - return nil -} - -func _OneofProtoTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*OneofProtoTypes) - switch tag { - case 1: // OneOfProtoTimes.timestamp - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Timestamp) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_Timestamp{msg} - return true, err - case 2: // OneOfProtoTimes.duration - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Duration) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_Duration{msg} - return true, err - case 3: // OneOfProtoTimes.repDouble - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.DoubleValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepDouble{msg} - return true, err - case 4: // OneOfProtoTimes.repFloat - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.FloatValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepFloat{msg} - return true, err - case 5: // OneOfProtoTimes.repInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Int64Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepInt64{msg} - return true, err - case 6: // OneOfProtoTimes.repUInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.UInt64Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepUInt64{msg} - return true, err - case 7: // OneOfProtoTimes.repInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.Int32Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepInt32{msg} - return true, err - case 8: // OneOfProtoTimes.repUInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.UInt32Value) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepUInt32{msg} - return true, err - case 9: // OneOfProtoTimes.repBool - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.BoolValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepBool{msg} - return true, err - case 10: // OneOfProtoTimes.repString - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.StringValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepString{msg} - return true, err - case 11: // OneOfProtoTimes.repBytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(types.BytesValue) - err := b.DecodeMessage(msg) - m.OneOfProtoTimes = &OneofProtoTypes_RepBytes{msg} - return true, err - default: - return false, nil - } -} - -func _OneofProtoTypes_OneofSizer(msg proto.Message) (n int) { - m := msg.(*OneofProtoTypes) - // OneOfProtoTimes - switch x := m.OneOfProtoTimes.(type) { - case *OneofProtoTypes_Timestamp: - s := proto.Size(x.Timestamp) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_Duration: - s := proto.Size(x.Duration) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepDouble: - s := proto.Size(x.RepDouble) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepFloat: - s := proto.Size(x.RepFloat) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepInt64: - s := proto.Size(x.RepInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepUInt64: - s := proto.Size(x.RepUInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepInt32: - s := proto.Size(x.RepInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepUInt32: - s := proto.Size(x.RepUInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepBool: - s := proto.Size(x.RepBool) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepString: - s := proto.Size(x.RepString) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofProtoTypes_RepBytes: - s := proto.Size(x.RepBytes) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - type OneofStdTypes struct { // Types that are valid to be assigned to OneOfStdTimes: // *OneofStdTypes_Timestamp @@ -1858,37 +1639,37 @@ } type OneofStdTypes_Timestamp struct { - Timestamp *time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof,stdtime"` + Timestamp *time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,oneof,stdtime" json:"timestamp,omitempty"` } type OneofStdTypes_Duration struct { - Duration *time.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof,stdduration"` + Duration *time.Duration `protobuf:"bytes,2,opt,name=duration,proto3,oneof,stdduration" json:"duration,omitempty"` } type OneofStdTypes_RepDouble struct { - RepDouble *float64 `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof,wktptr"` + RepDouble *float64 `protobuf:"bytes,3,opt,name=repDouble,proto3,oneof,wktptr" json:"repDouble,omitempty"` } type OneofStdTypes_RepFloat struct { - RepFloat *float32 `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof,wktptr"` + RepFloat *float32 `protobuf:"bytes,4,opt,name=repFloat,proto3,oneof,wktptr" json:"repFloat,omitempty"` } type OneofStdTypes_RepInt64 struct { - RepInt64 *int64 `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof,wktptr"` + RepInt64 *int64 `protobuf:"bytes,5,opt,name=repInt64,proto3,oneof,wktptr" json:"repInt64,omitempty"` } type OneofStdTypes_RepUInt64 struct { - RepUInt64 *uint64 `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof,wktptr"` + RepUInt64 *uint64 `protobuf:"bytes,6,opt,name=repUInt64,proto3,oneof,wktptr" json:"repUInt64,omitempty"` } type OneofStdTypes_RepInt32 struct { - RepInt32 *int32 `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof,wktptr"` + RepInt32 *int32 `protobuf:"bytes,7,opt,name=repInt32,proto3,oneof,wktptr" json:"repInt32,omitempty"` } type OneofStdTypes_RepUInt32 struct { - RepUInt32 *uint32 `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof,wktptr"` + RepUInt32 *uint32 `protobuf:"bytes,8,opt,name=repUInt32,proto3,oneof,wktptr" json:"repUInt32,omitempty"` } type OneofStdTypes_RepBool struct { - RepBool *bool `protobuf:"bytes,9,opt,name=repBool,proto3,oneof,wktptr"` + RepBool *bool `protobuf:"bytes,9,opt,name=repBool,proto3,oneof,wktptr" json:"repBool,omitempty"` } type OneofStdTypes_RepString struct { - RepString *string `protobuf:"bytes,10,opt,name=repString,proto3,oneof,wktptr"` + RepString *string `protobuf:"bytes,10,opt,name=repString,proto3,oneof,wktptr" json:"repString,omitempty"` } type OneofStdTypes_RepBytes struct { - RepBytes *[]byte `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof,wktptr"` + RepBytes *[]byte `protobuf:"bytes,11,opt,name=repBytes,proto3,oneof,wktptr" json:"repBytes,omitempty"` } func (*OneofStdTypes_Timestamp) isOneofStdTypes_OneOfStdTimes() {} @@ -1987,9 +1768,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*OneofStdTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _OneofStdTypes_OneofMarshaler, _OneofStdTypes_OneofUnmarshaler, _OneofStdTypes_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*OneofStdTypes) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*OneofStdTypes_Timestamp)(nil), (*OneofStdTypes_Duration)(nil), (*OneofStdTypes_RepDouble)(nil), @@ -2004,344 +1785,6 @@ } } -func _OneofStdTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*OneofStdTypes) - // OneOfStdTimes - switch x := m.OneOfStdTimes.(type) { - case *OneofStdTypes_Timestamp: - _ = b.EncodeVarint(1<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdTimeMarshal(*x.Timestamp) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_Duration: - _ = b.EncodeVarint(2<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdDurationMarshal(*x.Duration) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepDouble: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdDoubleMarshal(*x.RepDouble) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepFloat: - _ = b.EncodeVarint(4<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdFloatMarshal(*x.RepFloat) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepInt64: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdInt64Marshal(*x.RepInt64) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepUInt64: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdUInt64Marshal(*x.RepUInt64) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepInt32: - _ = b.EncodeVarint(7<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdInt32Marshal(*x.RepInt32) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepUInt32: - _ = b.EncodeVarint(8<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdUInt32Marshal(*x.RepUInt32) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepBool: - _ = b.EncodeVarint(9<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdBoolMarshal(*x.RepBool) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepString: - _ = b.EncodeVarint(10<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdStringMarshal(*x.RepString) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case *OneofStdTypes_RepBytes: - _ = b.EncodeVarint(11<<3 | proto.WireBytes) - dAtA, err := github_com_gogo_protobuf_types.StdBytesMarshal(*x.RepBytes) - if err != nil { - return err - } - if err := b.EncodeRawBytes(dAtA); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("OneofStdTypes.OneOfStdTimes has unexpected type %T", x) - } - return nil -} - -func _OneofStdTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*OneofStdTypes) - switch tag { - case 1: // OneOfStdTimes.timestamp - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(time.Time) - if err2 := github_com_gogo_protobuf_types.StdTimeUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_Timestamp{c} - return true, err - case 2: // OneOfStdTimes.duration - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(time.Duration) - if err2 := github_com_gogo_protobuf_types.StdDurationUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_Duration{c} - return true, err - case 3: // OneOfStdTimes.repDouble - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(float64) - if err2 := github_com_gogo_protobuf_types.StdDoubleUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepDouble{c} - return true, err - case 4: // OneOfStdTimes.repFloat - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(float32) - if err2 := github_com_gogo_protobuf_types.StdFloatUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepFloat{c} - return true, err - case 5: // OneOfStdTimes.repInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(int64) - if err2 := github_com_gogo_protobuf_types.StdInt64Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepInt64{c} - return true, err - case 6: // OneOfStdTimes.repUInt64 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(uint64) - if err2 := github_com_gogo_protobuf_types.StdUInt64Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepUInt64{c} - return true, err - case 7: // OneOfStdTimes.repInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(int32) - if err2 := github_com_gogo_protobuf_types.StdInt32Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepInt32{c} - return true, err - case 8: // OneOfStdTimes.repUInt32 - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(uint32) - if err2 := github_com_gogo_protobuf_types.StdUInt32Unmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepUInt32{c} - return true, err - case 9: // OneOfStdTimes.repBool - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(bool) - if err2 := github_com_gogo_protobuf_types.StdBoolUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepBool{c} - return true, err - case 10: // OneOfStdTimes.repString - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new(string) - if err2 := github_com_gogo_protobuf_types.StdStringUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepString{c} - return true, err - case 11: // OneOfStdTimes.repBytes - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeRawBytes(true) - if err != nil { - return true, err - } - c := new([]byte) - if err2 := github_com_gogo_protobuf_types.StdBytesUnmarshal(c, x); err2 != nil { - return true, err - } - m.OneOfStdTimes = &OneofStdTypes_RepBytes{c} - return true, err - default: - return false, nil - } -} - -func _OneofStdTypes_OneofSizer(msg proto.Message) (n int) { - m := msg.(*OneofStdTypes) - // OneOfStdTimes - switch x := m.OneOfStdTimes.(type) { - case *OneofStdTypes_Timestamp: - s := github_com_gogo_protobuf_types.SizeOfStdTime(*x.Timestamp) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_Duration: - s := github_com_gogo_protobuf_types.SizeOfStdDuration(*x.Duration) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepDouble: - s := github_com_gogo_protobuf_types.SizeOfStdDouble(*x.RepDouble) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepFloat: - s := github_com_gogo_protobuf_types.SizeOfStdFloat(*x.RepFloat) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepInt64: - s := github_com_gogo_protobuf_types.SizeOfStdInt64(*x.RepInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepUInt64: - s := github_com_gogo_protobuf_types.SizeOfStdUInt64(*x.RepUInt64) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepInt32: - s := github_com_gogo_protobuf_types.SizeOfStdInt32(*x.RepInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepUInt32: - s := github_com_gogo_protobuf_types.SizeOfStdUInt32(*x.RepUInt32) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepBool: - s := github_com_gogo_protobuf_types.SizeOfStdBool(*x.RepBool) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepString: - s := github_com_gogo_protobuf_types.SizeOfStdString(*x.RepString) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *OneofStdTypes_RepBytes: - s := github_com_gogo_protobuf_types.SizeOfStdBytes(*x.RepBytes) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func init() { proto.RegisterType((*KnownTypes)(nil), "types.KnownTypes") proto.RegisterType((*ProtoTypes)(nil), "types.ProtoTypes") @@ -2401,151 +1844,153 @@ func init() { proto.RegisterFile("combos/unmarshaler/types.proto", fileDescriptor_b3cdd6d81a3ac3e5) } var fileDescriptor_b3cdd6d81a3ac3e5 = []byte{ - // 2300 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcf, 0x73, 0x1c, 0x47, - 0x19, 0xd5, 0x7a, 0x57, 0xb6, 0xd4, 0x92, 0x6c, 0x69, 0x1c, 0xa7, 0x06, 0x41, 0xad, 0x8d, 0x12, - 0x3b, 0x26, 0xa9, 0x48, 0x64, 0x46, 0x25, 0xc0, 0x90, 0x28, 0x99, 0xb2, 0xbd, 0xda, 0x8d, 0x64, - 0xaf, 0x57, 0x5a, 0x17, 0x04, 0x02, 0xec, 0x46, 0x63, 0x45, 0xc5, 0x6a, 0x67, 0x6b, 0x77, 0x96, - 0x94, 0x6e, 0xfc, 0x01, 0x1c, 0xb8, 0x41, 0x15, 0x17, 0xb8, 0x71, 0xe5, 0x40, 0x15, 0x47, 0x8e, - 0x39, 0xf2, 0x17, 0x40, 0x22, 0x2e, 0x5c, 0x81, 0x8b, 0x2f, 0x54, 0xa5, 0xa6, 0xbb, 0x67, 0xa6, - 0x7f, 0x7c, 0xdd, 0x3d, 0x3d, 0x25, 0xdd, 0x74, 0x93, 0x76, 0xbf, 0x7e, 0xf3, 0xe6, 0x9b, 0x37, - 0x7a, 0xfd, 0xbe, 0xd1, 0xa0, 0xfa, 0x27, 0xd1, 0x49, 0x3f, 0x9a, 0x6c, 0x4c, 0x87, 0x27, 0xbd, - 0xf1, 0xe4, 0xd3, 0xde, 0x20, 0x1c, 0x6f, 0xc4, 0xa7, 0xa3, 0x70, 0xb2, 0x3e, 0x1a, 0x47, 0x71, - 0xe4, 0xcc, 0xe2, 0x5f, 0x56, 0xdf, 0x3e, 0x3a, 0x8e, 0x3f, 0x9d, 0xf6, 0xd7, 0x3f, 0x89, 0x4e, - 0x36, 0x8e, 0xa2, 0xa3, 0x68, 0x03, 0x7f, 0xdb, 0x9f, 0xbe, 0xc0, 0xbf, 0xe1, 0x5f, 0xf0, 0x4f, - 0x64, 0xd5, 0x6a, 0xfd, 0x28, 0x8a, 0x8e, 0x06, 0x61, 0x5e, 0x75, 0x38, 0x1d, 0xf7, 0xe2, 0xe3, - 0x68, 0x48, 0xbf, 0xbf, 0x2d, 0x7e, 0x1f, 0x1f, 0x9f, 0x84, 0x93, 0xb8, 0x77, 0x32, 0x52, 0x01, - 0x7c, 0x36, 0xee, 0x8d, 0x46, 0xe1, 0x98, 0xd2, 0x5a, 0xfb, 0x7d, 0x0d, 0xa1, 0x0f, 0x87, 0xd1, - 0x67, 0xc3, 0x83, 0x84, 0x9e, 0xf3, 0x16, 0xaa, 0x1e, 0x4e, 0xc7, 0x6e, 0xe5, 0x4e, 0xe5, 0xfe, - 0x82, 0xf7, 0xb5, 0x75, 0xb2, 0x78, 0x3d, 0x5d, 0xbc, 0xfe, 0x90, 0x1e, 0xbd, 0x93, 0x54, 0x39, - 0x6f, 0xa2, 0x2b, 0xf1, 0xc4, 0xbd, 0x82, 0x6b, 0x57, 0xa5, 0xda, 0x83, 0x94, 0x49, 0xe7, 0x4a, - 0x3c, 0x71, 0xd6, 0x51, 0xf5, 0xb0, 0x3f, 0x70, 0xab, 0xb8, 0xf8, 0x1b, 0x32, 0x70, 0x34, 0xed, - 0x0f, 0xc2, 0xe7, 0xbd, 0xc1, 0x34, 0xec, 0x24, 0x85, 0xce, 0xdb, 0xa8, 0xfa, 0x62, 0x10, 0xbb, - 0x35, 0x5c, 0xff, 0x75, 0xa9, 0xfe, 0xf1, 0x20, 0xea, 0xc5, 0xb4, 0xfc, 0xc5, 0x20, 0x4e, 0xca, - 0x8f, 0xb7, 0x36, 0xdd, 0x59, 0x45, 0x79, 0x73, 0x18, 0x6f, 0x6d, 0xd2, 0xf2, 0xe3, 0xad, 0xcd, - 0x84, 0xcd, 0x74, 0x6b, 0xd3, 0xbd, 0xaa, 0x60, 0xd3, 0x65, 0xeb, 0xa7, 0x5b, 0x9b, 0x18, 0xde, - 0xf7, 0xdc, 0x6b, 0x6a, 0x78, 0xdf, 0x4b, 0xe1, 0x7d, 0x0f, 0xc3, 0xfb, 0x9e, 0x3b, 0xa7, 0x81, - 0xcf, 0xea, 0xa7, 0xb8, 0xbe, 0xd6, 0x8f, 0xa2, 0x81, 0x3b, 0xaf, 0x68, 0x65, 0x10, 0x45, 0x03, - 0x52, 0x8e, 0xeb, 0x12, 0xfc, 0x49, 0x3c, 0x76, 0x91, 0x02, 0x7f, 0x3f, 0x1e, 0x1f, 0x0f, 0x8f, - 0x28, 0xfe, 0x24, 0x1e, 0x3b, 0xef, 0xa0, 0xd9, 0xfe, 0x69, 0x1c, 0x4e, 0xdc, 0x05, 0xc5, 0x09, - 0x04, 0xc9, 0xb7, 0x64, 0x01, 0xa9, 0x7c, 0x50, 0xfb, 0xf7, 0x1f, 0x6f, 0x57, 0xd6, 0x7e, 0xbd, - 0x88, 0x50, 0x3b, 0x29, 0x22, 0xea, 0xd8, 0x41, 0x2b, 0xc3, 0xe9, 0x60, 0xd0, 0xeb, 0x0f, 0xc2, - 0xec, 0xea, 0x52, 0xad, 0xe8, 0xae, 0xbf, 0xbc, 0xc8, 0x79, 0x84, 0x96, 0xd3, 0x0f, 0x53, 0x4d, - 0x51, 0x21, 0x69, 0x44, 0x27, 0x2d, 0x71, 0x1e, 0xa2, 0xeb, 0xd9, 0x67, 0x58, 0x41, 0x85, 0x04, - 0x26, 0xac, 0x71, 0x3e, 0x40, 0x4b, 0xe9, 0x27, 0x58, 0x57, 0x45, 0x54, 0xc7, 0xaf, 0x60, 0x21, - 0xb0, 0x76, 0x8a, 0x28, 0x91, 0x5f, 0xc1, 0x9e, 0x0b, 0xd1, 0x5f, 0x21, 0x79, 0x0a, 0x6b, 0x04, - 0x22, 0xc5, 0x34, 0xcb, 0xaf, 0x10, 0x89, 0x14, 0x14, 0xb2, 0xb0, 0xc6, 0x79, 0x0f, 0x2d, 0xa6, - 0x9f, 0x04, 0xc5, 0xb4, 0xcd, 0xd5, 0xb3, 0x2c, 0x88, 0x9e, 0x0b, 0xc9, 0x5d, 0x58, 0xc3, 0xb6, - 0x23, 0x28, 0x7a, 0x07, 0xf0, 0x2b, 0x9c, 0xf7, 0xd0, 0x7c, 0xf6, 0x47, 0xd5, 0x5d, 0x34, 0x89, - 0x3d, 0xa8, 0x7d, 0xfe, 0x8f, 0xdb, 0x33, 0x9d, 0x7c, 0x89, 0xf3, 0x7d, 0x34, 0x97, 0xfe, 0xd1, - 0x76, 0x97, 0x0c, 0x12, 0xa7, 0xab, 0xb3, 0x05, 0xce, 0x0e, 0x5a, 0x1a, 0x46, 0xc3, 0x84, 0x10, - 0xd5, 0xf7, 0x75, 0xb3, 0xbe, 0x29, 0x08, 0xbf, 0xd0, 0x79, 0x84, 0x16, 0xe9, 0x07, 0x44, 0xe3, - 0x37, 0x8c, 0x1a, 0xa7, 0x38, 0xdc, 0x32, 0x06, 0x86, 0x68, 0x74, 0xd9, 0xa8, 0x73, 0x01, 0x86, - 0xc8, 0x34, 0x3f, 0x2f, 0xaa, 0xf5, 0x15, 0xb3, 0xd6, 0x85, 0xf3, 0xa2, 0x82, 0xe7, 0x08, 0xf9, - 0x9e, 0xeb, 0x18, 0xf5, 0x2e, 0x13, 0xf2, 0x3d, 0x81, 0x90, 0xef, 0xb9, 0x37, 0xcd, 0x9a, 0x07, - 0x08, 0xf9, 0x9e, 0x13, 0xa0, 0x05, 0xfa, 0x01, 0xd6, 0xfd, 0x2b, 0x26, 0xdd, 0x53, 0x14, 0x76, - 0x11, 0xc3, 0x86, 0x6a, 0xff, 0x96, 0x59, 0xfb, 0x02, 0x1b, 0x7a, 0x03, 0xe4, 0xed, 0x21, 0xfa, - 0x7f, 0xd5, 0xa8, 0x7f, 0xa1, 0x3d, 0x01, 0x63, 0x07, 0xff, 0x5d, 0x44, 0x73, 0xfb, 0xf1, 0x21, - 0x31, 0x83, 0x27, 0xa5, 0xcc, 0x20, 0xa8, 0xfd, 0xe6, 0x9f, 0xb7, 0x2b, 0x90, 0x25, 0x7c, 0x58, - 0xc2, 0x12, 0x82, 0xda, 0xef, 0x12, 0x34, 0xd9, 0x18, 0x5a, 0x65, 0x8c, 0x21, 0xa8, 0xfd, 0x21, - 0x41, 0x13, 0xed, 0xa1, 0x61, 0x6f, 0x0f, 0x14, 0x49, 0x30, 0x89, 0x86, 0xbd, 0x49, 0x88, 0x40, - 0x44, 0xf3, 0xad, 0x32, 0x56, 0x21, 0x9e, 0x1d, 0xbd, 0x7f, 0x1a, 0xf6, 0x86, 0x01, 0x90, 0xf2, - 0x3d, 0x91, 0x54, 0x31, 0xdb, 0x80, 0x48, 0x61, 0x0b, 0xb2, 0x34, 0x0f, 0x8a, 0xc3, 0x5b, 0x48, - 0xab, 0x8c, 0x85, 0x88, 0x8c, 0xe8, 0x7d, 0xd4, 0xb0, 0x37, 0x12, 0xb1, 0x4d, 0xc4, 0x4e, 0x02, - 0x3b, 0x3b, 0x99, 0x4b, 0x6e, 0x46, 0x7c, 0xcb, 0x30, 0x96, 0xb2, 0x6d, 0x63, 0x29, 0x18, 0x01, - 0xdf, 0x26, 0xb9, 0xad, 0xec, 0x96, 0xb1, 0x15, 0x0c, 0x44, 0x4f, 0x89, 0xb3, 0x96, 0xa6, 0xbd, - 0xb5, 0xe4, 0x58, 0xbc, 0xbd, 0x34, 0xed, 0xed, 0x45, 0x86, 0x22, 0xc2, 0xde, 0x2d, 0x63, 0x31, - 0xf2, 0x39, 0xd2, 0xdb, 0xa4, 0x69, 0x6f, 0x33, 0x20, 0x31, 0xdf, 0x13, 0x88, 0x15, 0xb4, 0x1a, - 0x98, 0x98, 0xef, 0x39, 0x8f, 0x6d, 0xed, 0x26, 0x47, 0xe2, 0x2c, 0x67, 0xb7, 0x8c, 0xe5, 0xc8, - 0xac, 0xe8, 0xed, 0xd2, 0xb4, 0xb7, 0x1d, 0xb9, 0x5d, 0xf8, 0xcb, 0xb5, 0xdf, 0x2e, 0xa2, 0xa5, - 0x4e, 0x38, 0x62, 0x62, 0x48, 0x0b, 0x39, 0x92, 0x7d, 0x4c, 0xdc, 0xca, 0x9d, 0xaa, 0x21, 0x87, - 0x00, 0xab, 0x9c, 0x46, 0xee, 0x62, 0xe9, 0x1d, 0x93, 0x44, 0xda, 0xaa, 0x3e, 0x89, 0xc8, 0x6b, - 0x9c, 0xf7, 0x11, 0x8a, 0x73, 0x32, 0x55, 0x13, 0x19, 0xea, 0xb2, 0xcc, 0x1a, 0xe7, 0x5d, 0x34, - 0x7f, 0x98, 0x51, 0xa8, 0x19, 0x28, 0xa4, 0xfb, 0xcc, 0x6c, 0x05, 0x90, 0x85, 0x66, 0x31, 0x86, - 0x5d, 0x16, 0x92, 0x36, 0x9c, 0x57, 0xcd, 0x20, 0xf0, 0x86, 0x53, 0x4a, 0x55, 0xd7, 0x30, 0x92, - 0x4d, 0xaa, 0x12, 0xf7, 0xac, 0x73, 0x46, 0x04, 0x70, 0xcf, 0x2a, 0x85, 0xb3, 0x79, 0x05, 0x8e, - 0x3a, 0x9c, 0x89, 0xdb, 0x5e, 0x64, 0x44, 0x00, 0xb7, 0xbd, 0x72, 0xc6, 0x5b, 0x50, 0xb4, 0x57, - 0x97, 0xf1, 0xa4, 0xcd, 0xf3, 0xa2, 0x19, 0x04, 0xde, 0x3c, 0x4b, 0x69, 0x71, 0x49, 0x7d, 0x5e, - 0x8a, 0xb4, 0x28, 0xee, 0xbf, 0xaf, 0x1b, 0x11, 0xc0, 0xfd, 0xb7, 0x1c, 0x3a, 0x6f, 0x68, 0x4e, - 0x4a, 0x15, 0x3a, 0xa5, 0x5d, 0xfc, 0xb2, 0x19, 0x04, 0xde, 0xc5, 0x8b, 0xf1, 0x75, 0x45, 0x71, - 0x43, 0xab, 0xe2, 0xab, 0x90, 0x02, 0x1c, 0xd3, 0x72, 0x28, 0x05, 0xc8, 0x11, 0xf8, 0xa6, 0xe2, - 0x74, 0x74, 0x11, 0x58, 0xca, 0x12, 0xaf, 0x98, 0x41, 0xe0, 0x2c, 0x21, 0x85, 0xe9, 0x5b, 0x8a, - 0x6b, 0xad, 0x0e, 0xd3, 0x72, 0x1c, 0xa9, 0x96, 0x8f, 0x23, 0xff, 0x5f, 0x44, 0x0b, 0x9d, 0x70, - 0x94, 0x25, 0x92, 0x76, 0x39, 0x5f, 0xa0, 0x91, 0x04, 0x72, 0x87, 0xbd, 0x32, 0xee, 0x40, 0x43, - 0x09, 0xe0, 0x11, 0x0f, 0x2d, 0x3d, 0x22, 0xdf, 0xfc, 0xb1, 0x3e, 0xf1, 0x81, 0x95, 0x4f, 0xe4, - 0xdb, 0x3f, 0xc6, 0x2b, 0x5a, 0x65, 0xbc, 0x42, 0x11, 0x8f, 0x76, 0xcb, 0x38, 0x86, 0x72, 0x2f, - 0xd9, 0xb0, 0x77, 0x0d, 0x38, 0x6c, 0x35, 0xed, 0xbd, 0x43, 0xb5, 0x29, 0x6d, 0xd8, 0xfb, 0x07, - 0x9c, 0xdb, 0x9a, 0xf6, 0x2e, 0xa2, 0xda, 0xdd, 0xb6, 0xca, 0x38, 0x89, 0x22, 0x02, 0xee, 0x96, - 0xf1, 0x13, 0xe5, 0x4e, 0xb9, 0x61, 0xef, 0x29, 0x70, 0xa0, 0x6c, 0xda, 0x3b, 0x8b, 0x6a, 0xcb, - 0xdd, 0x2a, 0xe3, 0x2e, 0x8a, 0x6c, 0xba, 0x5b, 0xc6, 0x63, 0x94, 0xdb, 0xf7, 0x87, 0xb6, 0x3e, - 0x03, 0x26, 0xdd, 0xc7, 0xb6, 0x6e, 0xa3, 0x08, 0x01, 0xad, 0x32, 0x8e, 0xa3, 0x48, 0xcc, 0xbb, - 0x65, 0x7c, 0x47, 0x19, 0x28, 0x1a, 0xf6, 0xde, 0x03, 0xe7, 0xef, 0xa6, 0xbd, 0x03, 0xa9, 0x92, - 0xc9, 0x9f, 0xeb, 0x68, 0x69, 0xaf, 0xc7, 0x26, 0x93, 0x1f, 0xc1, 0x33, 0xb1, 0xe4, 0x08, 0x6f, - 0xad, 0x93, 0xa7, 0x81, 0xdc, 0x82, 0xf5, 0x27, 0x62, 0xf5, 0xa3, 0x61, 0x3c, 0x3e, 0x85, 0xc6, - 0x63, 0x0d, 0x76, 0x6e, 0x40, 0x2c, 0xe8, 0x35, 0x10, 0x92, 0x87, 0x92, 0xe7, 0xd1, 0xcf, 0x81, - 0x39, 0x1b, 0xb1, 0xa2, 0x37, 0xb5, 0x14, 0xd3, 0x62, 0xc2, 0x10, 0x7a, 0x16, 0x93, 0x0f, 0x25, - 0x88, 0x2b, 0xad, 0x81, 0x78, 0x1c, 0x8e, 0x34, 0xf0, 0x6e, 0x2b, 0x9c, 0xe9, 0xbe, 0x9e, 0x1b, - 0x2e, 0x25, 0xcc, 0x44, 0x7f, 0xda, 0x87, 0xfd, 0xe9, 0x0d, 0x18, 0x90, 0xad, 0x64, 0x19, 0x0a, - 0x36, 0xb5, 0x07, 0xdb, 0xd4, 0x1b, 0x5a, 0x96, 0xb8, 0x92, 0x90, 0x14, 0xcc, 0xaa, 0x0d, 0x9a, - 0xd5, 0x3d, 0x1d, 0xc5, 0x1c, 0x0c, 0xcc, 0x3c, 0x7b, 0xb0, 0x67, 0xe9, 0x09, 0xe2, 0x4a, 0x81, - 0x20, 0xf9, 0xa3, 0xde, 0x06, 0x9d, 0x4b, 0x4b, 0x30, 0x07, 0x03, 0xa3, 0x50, 0x5b, 0x61, 0x60, - 0xfa, 0x0b, 0xdd, 0x65, 0x28, 0x8a, 0x36, 0xb6, 0x0f, 0xdb, 0x98, 0xf6, 0x42, 0x77, 0x25, 0x96, - 0x82, 0x9b, 0xed, 0xc1, 0x6e, 0x66, 0xec, 0xa3, 0xef, 0xc9, 0x7d, 0xf4, 0x3d, 0xbe, 0x8f, 0x99, - 0xa7, 0x99, 0xfa, 0x48, 0xc1, 0xc0, 0xe0, 0xd4, 0x56, 0x58, 0x9b, 0xb9, 0x8f, 0x29, 0x45, 0xd1, - 0xe0, 0xf6, 0x61, 0x83, 0x33, 0xf6, 0x91, 0x67, 0x29, 0xf8, 0x5c, 0x0b, 0xf4, 0xb9, 0x7b, 0x5a, - 0x92, 0x49, 0x21, 0xa1, 0xc8, 0xbb, 0xdd, 0x1e, 0xe4, 0x76, 0x77, 0x75, 0xf4, 0x32, 0x24, 0x28, - 0x66, 0xb5, 0x15, 0xa6, 0xa7, 0xef, 0x20, 0x29, 0x15, 0x3a, 0x48, 0xcd, 0x6a, 0x1f, 0xb6, 0x3e, - 0x6d, 0x07, 0x19, 0x3c, 0x38, 0x7d, 0xed, 0xc1, 0x0e, 0xa8, 0x57, 0x22, 0xae, 0x14, 0x94, 0x48, - 0x7c, 0xb0, 0x0d, 0xfa, 0xa0, 0x56, 0x89, 0x39, 0x18, 0x14, 0xca, 0x56, 0x7f, 0x8e, 0x5e, 0x85, - 0xed, 0xcc, 0x59, 0x46, 0xd5, 0x5f, 0x84, 0xa7, 0xf8, 0xe1, 0xd0, 0x6c, 0x27, 0xf9, 0xd1, 0xf9, - 0x36, 0x9a, 0xfd, 0x65, 0xe2, 0xad, 0x05, 0xfe, 0x7b, 0x84, 0x14, 0x3e, 0xb8, 0xf2, 0xdd, 0xca, - 0xea, 0x0f, 0xd1, 0xf5, 0x0b, 0x42, 0xfe, 0x29, 0xba, 0x05, 0xfa, 0x1c, 0x70, 0x80, 0x0d, 0xfe, - 0x00, 0x9a, 0x29, 0x21, 0x83, 0xff, 0x1c, 0x2d, 0x5d, 0x08, 0xee, 0xcf, 0xd0, 0x4d, 0xc0, 0x03, - 0x01, 0x74, 0x8f, 0x47, 0xd7, 0x0f, 0x05, 0xb9, 0xc6, 0x38, 0xb2, 0x27, 0x9e, 0x23, 0xfe, 0xc7, - 0xc8, 0x91, 0xed, 0x11, 0xc0, 0x7f, 0x87, 0xc7, 0xd7, 0x4e, 0x11, 0x19, 0xf8, 0x9f, 0xa0, 0x15, - 0xc9, 0x2f, 0xcf, 0x0f, 0x9d, 0x21, 0x9f, 0xfb, 0x48, 0x19, 0x78, 0x66, 0xd8, 0x07, 0x92, 0xbf, - 0x08, 0x74, 0x46, 0x3a, 0x5d, 0x2d, 0xbe, 0xf1, 0xd2, 0x76, 0xe1, 0x03, 0xe4, 0xd2, 0xb9, 0x18, - 0x7c, 0xbe, 0xfb, 0xd4, 0x7d, 0x4a, 0xf6, 0x27, 0x1d, 0x28, 0xaa, 0xba, 0x7f, 0xee, 0xe8, 0x42, - 0xf7, 0xd5, 0xf8, 0x85, 0xba, 0x03, 0x1c, 0x80, 0xef, 0xfe, 0xf9, 0xe3, 0xff, 0x18, 0xad, 0x48, - 0x3e, 0x5d, 0xe6, 0xcf, 0x71, 0x3e, 0x40, 0x65, 0xc0, 0x3f, 0x42, 0xcb, 0xa2, 0x73, 0x9f, 0x1b, - 0x36, 0xd3, 0x79, 0xc6, 0x73, 0xcb, 0x74, 0x86, 0x9d, 0xba, 0x82, 0x9d, 0xbf, 0x18, 0x7c, 0x46, - 0xf7, 0xb9, 0x23, 0x97, 0x51, 0x26, 0xfb, 0x5f, 0x7f, 0x90, 0xee, 0x2f, 0x00, 0x7d, 0xed, 0x3f, - 0x75, 0xb4, 0xb0, 0xd7, 0xcb, 0x67, 0xb6, 0x1f, 0xab, 0x13, 0xf3, 0xb7, 0xf2, 0xbd, 0x48, 0x5a, - 0xae, 0xc8, 0xcb, 0xea, 0x7f, 0x2a, 0x69, 0xca, 0xa9, 0xf9, 0x9b, 0x00, 0xac, 0x00, 0x07, 0x3e, - 0x74, 0xff, 0x48, 0x99, 0x9b, 0xef, 0x6b, 0x88, 0x0a, 0x69, 0x57, 0xf1, 0xef, 0x2a, 0x8f, 0xa5, - 0xec, 0x7c, 0x07, 0xc0, 0xe4, 0xb1, 0xa0, 0xe7, 0xfa, 0x07, 0x8a, 0xf4, 0x7c, 0x4f, 0xc7, 0x90, - 0xcd, 0xba, 0xe0, 0x84, 0xb7, 0x0b, 0x27, 0xe8, 0xbb, 0x10, 0xa8, 0x9c, 0x9f, 0x95, 0xa3, 0xde, - 0x67, 0x70, 0x86, 0xbe, 0xab, 0xe1, 0xca, 0x86, 0x5e, 0x68, 0xe8, 0xdb, 0x01, 0x73, 0xf4, 0xeb, - 0x6a, 0xa2, 0x0c, 0xa0, 0x6a, 0xfa, 0xfb, 0x0c, 0x4e, 0xd2, 0x3a, 0x9a, 0x6c, 0xa8, 0x84, 0xe6, - 0xc0, 0x1d, 0x30, 0x4d, 0x6b, 0x68, 0x32, 0x80, 0xaa, 0x81, 0xf0, 0x81, 0x22, 0x4f, 0xeb, 0x2e, - 0x7d, 0x57, 0x22, 0x2a, 0x66, 0xea, 0x2e, 0x9c, 0xa9, 0x35, 0x97, 0xbe, 0x0b, 0x72, 0x15, 0x52, - 0xf5, 0x33, 0x38, 0x55, 0x1b, 0x7a, 0x9a, 0x05, 0x4c, 0x68, 0x5a, 0xdc, 0x01, 0x93, 0xb5, 0xbe, - 0xa7, 0x29, 0xa0, 0x6a, 0x6c, 0x7c, 0xa0, 0xc8, 0xd6, 0xa6, 0x9e, 0xf2, 0x44, 0xc5, 0x7c, 0xdd, - 0x85, 0xf3, 0xb5, 0xa1, 0xa7, 0x32, 0x57, 0x21, 0x61, 0x3f, 0x01, 0x13, 0xf6, 0xeb, 0x1a, 0xaa, - 0x4c, 0x2a, 0x06, 0x66, 0xca, 0x4f, 0xa1, 0x94, 0xfd, 0x9a, 0x9a, 0x64, 0x8e, 0xa6, 0x18, 0x2e, - 0x1f, 0x28, 0x72, 0xb6, 0xae, 0x9b, 0x5c, 0x2a, 0x06, 0xc7, 0xcc, 0x5d, 0x38, 0x6b, 0x6b, 0xba, - 0xc9, 0x62, 0x2a, 0xe7, 0xcd, 0xcf, 0xe0, 0xb4, 0xad, 0x53, 0x28, 0x1b, 0x8f, 0xa1, 0xc9, 0x73, - 0x07, 0x4c, 0xdc, 0x1a, 0x85, 0x32, 0x80, 0x8a, 0x11, 0xf4, 0x65, 0xe6, 0xbe, 0xcc, 0xdc, 0x97, - 0x99, 0xfb, 0x32, 0x73, 0x5f, 0x66, 0xee, 0xcb, 0xcc, 0x7d, 0x99, 0xb9, 0x2f, 0x33, 0x37, 0x9c, - 0xb9, 0xff, 0x32, 0x8b, 0x6e, 0x3c, 0x1d, 0x86, 0xd1, 0x0b, 0xe6, 0x49, 0xf5, 0x03, 0x36, 0x18, - 0x1b, 0xdf, 0xda, 0xd8, 0xe1, 0x9e, 0x20, 0x7f, 0x87, 0x49, 0xab, 0x26, 0xe3, 0xdc, 0x61, 0x1f, - 0xee, 0xfe, 0x00, 0xcd, 0x8f, 0xc3, 0x51, 0xf1, 0x17, 0x32, 0x92, 0xc3, 0x66, 0x0b, 0x9c, 0xef, - 0xa1, 0xb9, 0x71, 0x38, 0x2a, 0xfa, 0x0a, 0x46, 0x72, 0xe0, 0xb4, 0x9c, 0x2e, 0x2d, 0xfa, 0xd2, - 0x05, 0x5d, 0x4a, 0xa2, 0x0a, 0xe1, 0x5c, 0xfc, 0x35, 0x0b, 0xca, 0x99, 0x06, 0x9d, 0xec, 0xc0, - 0x85, 0x5e, 0xac, 0xc8, 0x0f, 0xec, 0x7b, 0xcc, 0x81, 0x8b, 0xbd, 0x4a, 0xc1, 0x1c, 0xd8, 0xf7, - 0x9c, 0x2d, 0x74, 0x6d, 0x1c, 0x8e, 0x8a, 0xbd, 0x3c, 0xb1, 0x33, 0xd3, 0x49, 0x8b, 0xe9, 0x51, - 0x8b, 0xbf, 0x2e, 0x41, 0x8f, 0x4a, 0x77, 0xcd, 0xe4, 0x74, 0x8b, 0xbe, 0x20, 0x41, 0x4f, 0x17, - 0x7f, 0x10, 0xac, 0x60, 0x8d, 0x3e, 0xa5, 0x1a, 0x4d, 0xb4, 0xb6, 0xf6, 0xbf, 0x59, 0xb4, 0x84, - 0x75, 0x9b, 0x4d, 0x8b, 0xde, 0xb7, 0x52, 0x2d, 0x19, 0x0b, 0xf1, 0xda, 0x7d, 0xd7, 0x42, 0xbb, - 0x64, 0x5c, 0xc3, 0x29, 0x38, 0xb0, 0x54, 0x30, 0x49, 0x02, 0xbc, 0x8e, 0xb7, 0xad, 0x74, 0x9c, - 0x21, 0xe4, 0x6a, 0xde, 0xb6, 0x52, 0x33, 0x07, 0x40, 0x54, 0x19, 0x58, 0x6a, 0x9a, 0x3b, 0x0b, - 0xaa, 0xec, 0x6d, 0x2b, 0x65, 0x8b, 0x24, 0xf0, 0x7b, 0x72, 0x76, 0xfa, 0x96, 0x48, 0xe0, 0x7b, - 0xa4, 0xb8, 0xca, 0xb3, 0xf5, 0x99, 0xd6, 0x03, 0x4b, 0xad, 0x73, 0x0c, 0xa8, 0xe2, 0xb7, 0xad, - 0x14, 0xcf, 0xb5, 0x81, 0xe8, 0xfe, 0x06, 0xd6, 0xf8, 0x53, 0xac, 0xf1, 0x44, 0xa5, 0xc1, 0xfd, - 0x2f, 0xbe, 0xac, 0x57, 0x5e, 0x7e, 0x59, 0xaf, 0xfc, 0xe9, 0xac, 0x5e, 0xf9, 0xeb, 0x59, 0xbd, - 0xf2, 0xb7, 0xb3, 0x7a, 0xe5, 0xf3, 0xb3, 0xfa, 0xcc, 0xdf, 0xcf, 0xea, 0x95, 0x2f, 0xce, 0xea, - 0x95, 0x97, 0x67, 0xf5, 0x99, 0x5f, 0xfd, 0xab, 0x3e, 0xd3, 0xbf, 0x8a, 0x8f, 0xe0, 0x7f, 0x15, - 0x00, 0x00, 0xff, 0xff, 0xc0, 0xbf, 0x2e, 0x8e, 0x7b, 0x40, 0x00, 0x00, + // 2330 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcf, 0x73, 0x23, 0x47, + 0x19, 0xb5, 0x2c, 0x79, 0xd7, 0x6e, 0x4b, 0xbb, 0xf6, 0x6c, 0x36, 0x0c, 0x26, 0xa5, 0x5d, 0x9c, + 0xec, 0x0f, 0x92, 0x8a, 0x4c, 0x66, 0x5c, 0x06, 0x16, 0x12, 0x27, 0xaa, 0xdd, 0x95, 0xa5, 0x58, + 0xbb, 0x5a, 0xd9, 0xda, 0x82, 0x40, 0x00, 0x69, 0x3d, 0xeb, 0xb8, 0x90, 0x35, 0x2a, 0x69, 0x44, + 0xca, 0x37, 0xfe, 0x00, 0x0e, 0xdc, 0xe0, 0x08, 0x37, 0xae, 0x1c, 0xa8, 0xe2, 0xc8, 0x81, 0x43, + 0x8e, 0xfc, 0x05, 0x90, 0x98, 0x0b, 0x57, 0xe0, 0x92, 0x0b, 0x55, 0xa9, 0xe9, 0xee, 0x99, 0xe9, + 0x1f, 0x5f, 0xf7, 0x4c, 0x4f, 0xd9, 0x37, 0xdd, 0x6c, 0xcd, 0xd7, 0x6f, 0xde, 0x7c, 0x7a, 0xe3, + 0xd7, 0xef, 0x1b, 0x0f, 0xaa, 0xbe, 0xf0, 0x4f, 0x07, 0xfe, 0x74, 0x6b, 0x36, 0x3a, 0xed, 0x4f, + 0xa6, 0x9f, 0xf4, 0x87, 0xde, 0x64, 0x2b, 0x38, 0x1b, 0x7b, 0xd3, 0xda, 0x78, 0xe2, 0x07, 0xbe, + 0xb5, 0x84, 0x7f, 0xd9, 0x78, 0xfb, 0xf8, 0x24, 0xf8, 0x64, 0x36, 0xa8, 0xbd, 0xf0, 0x4f, 0xb7, + 0x8e, 0xfd, 0x63, 0x7f, 0x0b, 0x1f, 0x1d, 0xcc, 0x5e, 0xe2, 0xdf, 0xf0, 0x2f, 0xf8, 0x27, 0xb2, + 0x6a, 0xa3, 0x7a, 0xec, 0xfb, 0xc7, 0x43, 0x2f, 0xa9, 0x3a, 0x9a, 0x4d, 0xfa, 0xc1, 0x89, 0x3f, + 0xa2, 0xc7, 0x5f, 0x13, 0x8f, 0x4f, 0x83, 0xc9, 0xec, 0x45, 0x40, 0x8f, 0xde, 0x12, 0x8f, 0x06, + 0x27, 0xa7, 0xde, 0x34, 0xe8, 0x9f, 0x8e, 0x55, 0xf0, 0x9f, 0x4e, 0xfa, 0xe3, 0xb1, 0x37, 0xa1, + 0xa4, 0x37, 0xff, 0x56, 0x42, 0xe8, 0xc3, 0x91, 0xff, 0xe9, 0xe8, 0x30, 0x24, 0x6f, 0xbd, 0x85, + 0x8a, 0x47, 0xb3, 0x89, 0x5d, 0xb8, 0x5d, 0xb8, 0xbf, 0xea, 0x7c, 0xbd, 0x46, 0x16, 0xd7, 0xa2, + 0xc5, 0xb5, 0x87, 0x94, 0x5b, 0x37, 0xac, 0xb2, 0xde, 0x44, 0x8b, 0xc1, 0xd4, 0x5e, 0xc4, 0xb5, + 0x1b, 0x52, 0xed, 0x61, 0xc4, 0xa4, 0xbb, 0x18, 0x4c, 0xad, 0x1a, 0x2a, 0x1e, 0x0d, 0x86, 0x76, + 0x11, 0x17, 0xbf, 0x26, 0x03, 0xfb, 0xb3, 0xc1, 0xd0, 0x7b, 0xde, 0x1f, 0xce, 0xbc, 0x6e, 0x58, + 0x68, 0xbd, 0x8d, 0x8a, 0x2f, 0x87, 0x81, 0x5d, 0xc2, 0xf5, 0xdf, 0x90, 0xea, 0x1f, 0x0f, 0xfd, + 0x7e, 0x40, 0xcb, 0x5f, 0x0e, 0x83, 0xb0, 0xfc, 0x64, 0x67, 0xdb, 0x5e, 0x52, 0x94, 0x37, 0x47, + 0xc1, 0xce, 0x36, 0x2d, 0x3f, 0xd9, 0xd9, 0x0e, 0xd9, 0xcc, 0x76, 0xb6, 0xed, 0x2b, 0x0a, 0x36, + 0x3d, 0xb6, 0x7e, 0xb6, 0xb3, 0x8d, 0xe1, 0x5d, 0xc7, 0xbe, 0xaa, 0x86, 0x77, 0x9d, 0x08, 0xde, + 0x75, 0x30, 0xbc, 0xeb, 0xd8, 0xcb, 0x1a, 0xf8, 0xb8, 0x7e, 0x86, 0xeb, 0x4b, 0x03, 0xdf, 0x1f, + 0xda, 0x2b, 0x8a, 0x56, 0xd6, 0x7d, 0x7f, 0x48, 0xca, 0x71, 0x5d, 0x88, 0x3f, 0x0d, 0x26, 0x36, + 0x52, 0xe0, 0x1f, 0x04, 0x93, 0x93, 0xd1, 0x31, 0xc5, 0x9f, 0x06, 0x13, 0xeb, 0x1d, 0xb4, 0x34, + 0x38, 0x0b, 0xbc, 0xa9, 0xbd, 0xaa, 0xb8, 0x80, 0x7a, 0x78, 0x94, 0x2c, 0x20, 0x95, 0xd6, 0x3d, + 0xb4, 0x38, 0x0d, 0xec, 0x32, 0xae, 0xff, 0x1a, 0x74, 0x86, 0xd9, 0x8b, 0xa0, 0xbb, 0x38, 0x0d, + 0x1e, 0x94, 0xfe, 0xfd, 0x87, 0x5b, 0x85, 0xcd, 0x5f, 0x97, 0x11, 0xea, 0x84, 0x47, 0x89, 0x8c, + 0xf6, 0xd0, 0xfa, 0x68, 0x36, 0x1c, 0xf6, 0x07, 0x43, 0x2f, 0x96, 0x01, 0x15, 0x95, 0x4e, 0x28, + 0xf2, 0x22, 0xeb, 0x11, 0x5a, 0x8b, 0x3e, 0x8c, 0xc4, 0x47, 0x15, 0xa7, 0x51, 0xa7, 0xb4, 0xc4, + 0x7a, 0x88, 0xae, 0xc5, 0x9f, 0x61, 0xa9, 0x65, 0x52, 0xa2, 0xb0, 0xc6, 0xfa, 0x00, 0x55, 0xa2, + 0x4f, 0xb0, 0x00, 0xb3, 0xc8, 0x93, 0x5f, 0xc1, 0x42, 0x60, 0x91, 0x65, 0x91, 0x2c, 0xbf, 0x82, + 0xbd, 0x16, 0x22, 0xd4, 0x4c, 0x3a, 0x16, 0xd6, 0x08, 0x44, 0xb2, 0x89, 0x9b, 0x5f, 0x21, 0x12, + 0xc9, 0xa8, 0x78, 0x61, 0x8d, 0xf5, 0x1e, 0x2a, 0x47, 0x9f, 0xd4, 0xb3, 0xdd, 0x04, 0x5c, 0x3d, + 0xcb, 0x82, 0x08, 0x3f, 0xd3, 0x7d, 0x21, 0xac, 0x61, 0xdb, 0x51, 0xcf, 0x7a, 0xab, 0xf0, 0x2b, + 0xac, 0xf7, 0xd0, 0x4a, 0xfc, 0xd7, 0x97, 0xde, 0x39, 0x1a, 0xb1, 0xd7, 0x4b, 0x9f, 0xfd, 0xe3, + 0xd6, 0x42, 0x37, 0x59, 0x62, 0x7d, 0x1f, 0x2d, 0x47, 0x7f, 0xfb, 0xed, 0x4a, 0x8a, 0xc4, 0xe9, + 0xea, 0x78, 0x81, 0xb5, 0x87, 0x2a, 0x23, 0x7f, 0x14, 0x12, 0xa2, 0xfa, 0xbe, 0x96, 0xae, 0x6f, + 0x0a, 0xc2, 0x2f, 0xb4, 0x1e, 0xa1, 0x32, 0xfd, 0x80, 0x68, 0xfc, 0x7a, 0xaa, 0xc6, 0x29, 0x0e, + 0xb7, 0x8c, 0x81, 0x21, 0x1a, 0x5d, 0x4b, 0xd5, 0xb9, 0x00, 0x43, 0x64, 0x9a, 0x5c, 0x17, 0xd5, + 0xfa, 0x7a, 0xba, 0xd6, 0x85, 0xeb, 0xa2, 0x82, 0xe7, 0x08, 0xb9, 0x8e, 0x6d, 0xa5, 0xea, 0x5d, + 0x26, 0xe4, 0x3a, 0x02, 0x21, 0xd7, 0xb1, 0x6f, 0xa4, 0x6b, 0x1e, 0x20, 0xe4, 0x3a, 0x56, 0x1d, + 0xad, 0xd2, 0x0f, 0xb0, 0xee, 0x5f, 0x49, 0xd3, 0x3d, 0x45, 0x61, 0x17, 0x31, 0x6c, 0xa8, 0xf6, + 0x6f, 0xa6, 0x6b, 0x5f, 0x60, 0x43, 0x6f, 0x80, 0xa4, 0x3d, 0x44, 0xff, 0xaf, 0xa6, 0xea, 0x5f, + 0x68, 0x0f, 0x3e, 0x40, 0xed, 0xe0, 0xbf, 0x65, 0xb4, 0x7c, 0x10, 0x1c, 0x11, 0x33, 0x78, 0x92, + 0xcb, 0x0c, 0xea, 0xa5, 0xdf, 0xfc, 0xf3, 0x56, 0x01, 0xb2, 0x84, 0x0f, 0x73, 0x58, 0x42, 0xbd, + 0xf4, 0xbb, 0x10, 0x4d, 0x36, 0x86, 0x56, 0x1e, 0x63, 0xa8, 0x97, 0x7e, 0x1f, 0xa2, 0x89, 0xf6, + 0xd0, 0x30, 0xb7, 0x07, 0x8a, 0x24, 0x98, 0x44, 0xc3, 0xdc, 0x24, 0x44, 0x20, 0xa2, 0xf9, 0x56, + 0x1e, 0xab, 0x10, 0xaf, 0x8e, 0xde, 0x3f, 0x0d, 0x73, 0xc3, 0x00, 0x48, 0xb9, 0x8e, 0x48, 0x2a, + 0x9b, 0x6d, 0x40, 0xa4, 0xb0, 0x05, 0x19, 0x9a, 0x07, 0xc5, 0xe1, 0x2d, 0xa4, 0x95, 0xc7, 0x42, + 0x44, 0x46, 0xf4, 0x3e, 0x6a, 0x98, 0x1b, 0x89, 0xd8, 0x26, 0x62, 0x27, 0x75, 0x33, 0x3b, 0x59, + 0x0e, 0x6f, 0x46, 0x7c, 0xcb, 0x30, 0x96, 0xb2, 0x6b, 0x62, 0x29, 0x18, 0x01, 0xdf, 0x26, 0x89, + 0xad, 0xec, 0xe7, 0xb1, 0x15, 0x0c, 0x44, 0x2f, 0x89, 0xb3, 0x96, 0xa6, 0xb9, 0xb5, 0x24, 0x58, + 0xbc, 0xbd, 0x34, 0xcd, 0xed, 0x45, 0x86, 0x22, 0xc2, 0xde, 0xcf, 0x63, 0x31, 0xf2, 0x35, 0xd2, + 0xdb, 0xa4, 0x69, 0x6e, 0x33, 0x20, 0x31, 0xd7, 0x11, 0x88, 0x65, 0xb4, 0x1a, 0x98, 0x98, 0xeb, + 0x58, 0x8f, 0x4d, 0xed, 0x26, 0x41, 0xe2, 0x2c, 0x67, 0x3f, 0x8f, 0xe5, 0xc8, 0xac, 0xe8, 0xed, + 0xd2, 0x34, 0xb7, 0x1d, 0xb9, 0x5d, 0xf8, 0xe0, 0xe6, 0x6f, 0xcb, 0xa8, 0xd2, 0xf5, 0xc6, 0x4c, + 0x0c, 0x69, 0x21, 0x4b, 0xb2, 0x8f, 0xa9, 0x5d, 0xb8, 0x5d, 0x4c, 0xc9, 0x21, 0xc0, 0x2a, 0xab, + 0x91, 0xb8, 0x58, 0x74, 0xc7, 0x84, 0xd9, 0xb7, 0xa8, 0x4f, 0x22, 0xf2, 0x1a, 0xeb, 0x7d, 0x84, + 0x82, 0x84, 0x4c, 0x31, 0x8d, 0x0c, 0x75, 0x59, 0x66, 0x8d, 0xf5, 0x2e, 0x5a, 0x39, 0x8a, 0x29, + 0x94, 0x52, 0x28, 0x44, 0xfb, 0xcc, 0x78, 0x05, 0x90, 0x85, 0x96, 0x30, 0x86, 0x59, 0x16, 0x92, + 0x36, 0x9c, 0x57, 0xd2, 0x41, 0xe0, 0x0d, 0xa7, 0x94, 0xaa, 0xae, 0x62, 0x24, 0x93, 0x54, 0x25, + 0xee, 0x59, 0x97, 0x53, 0x11, 0xc0, 0x3d, 0xab, 0x14, 0xce, 0x56, 0x14, 0x38, 0xea, 0x70, 0x26, + 0x6e, 0x7b, 0x51, 0x2a, 0x02, 0xb8, 0xed, 0x95, 0x33, 0xde, 0xaa, 0xa2, 0xbd, 0xba, 0x8c, 0x27, + 0x6d, 0x9e, 0xcb, 0xe9, 0x20, 0xf0, 0xe6, 0x59, 0x4a, 0x8b, 0x15, 0xf5, 0x75, 0x29, 0xd2, 0xa2, + 0xb8, 0xff, 0xbe, 0x96, 0x8a, 0x00, 0xee, 0xbf, 0xe5, 0xd0, 0x79, 0x5d, 0x73, 0x51, 0xaa, 0xd0, + 0x29, 0xed, 0xe2, 0xd7, 0xd2, 0x41, 0xe0, 0x5d, 0xbc, 0x18, 0x5f, 0xd7, 0x15, 0x37, 0xb4, 0x2a, + 0xbe, 0x0a, 0x29, 0xc0, 0x4a, 0x5b, 0x0e, 0xa5, 0x00, 0x39, 0x02, 0xdf, 0x50, 0x5c, 0x8e, 0x2e, + 0x02, 0x4b, 0x59, 0xe2, 0x95, 0x74, 0x10, 0x38, 0x4b, 0x48, 0x61, 0xfa, 0xa6, 0xe2, 0xbb, 0x56, + 0x87, 0x69, 0x39, 0x8e, 0x14, 0xf3, 0xc7, 0x91, 0xff, 0x97, 0xd1, 0x6a, 0xd7, 0x1b, 0xc7, 0x89, + 0xa4, 0x93, 0xcf, 0x17, 0x68, 0x24, 0x81, 0xdc, 0xa1, 0x9d, 0xc7, 0x1d, 0x68, 0x28, 0x01, 0x3c, + 0xe2, 0xa1, 0xa1, 0x47, 0x24, 0x9b, 0x3f, 0xd6, 0x27, 0x3e, 0x30, 0xf2, 0x89, 0x64, 0xfb, 0xc7, + 0x78, 0x45, 0x2b, 0x8f, 0x57, 0x28, 0xe2, 0xd1, 0x7e, 0x1e, 0xc7, 0x50, 0xee, 0x25, 0x1b, 0xe6, + 0xae, 0x01, 0x87, 0xad, 0xa6, 0xb9, 0x77, 0xa8, 0x36, 0xa5, 0x0d, 0x73, 0xff, 0x80, 0x73, 0x5b, + 0xd3, 0xdc, 0x45, 0x54, 0xbb, 0xdb, 0x56, 0x1e, 0x27, 0x51, 0x44, 0xc0, 0xfd, 0x3c, 0x7e, 0xa2, + 0xdc, 0x29, 0x37, 0xcc, 0x3d, 0x05, 0x0e, 0x94, 0x4d, 0x73, 0x67, 0x51, 0x6d, 0xb9, 0x5b, 0x79, + 0xdc, 0x45, 0x91, 0x4d, 0xf7, 0xf3, 0x78, 0x8c, 0x72, 0xfb, 0xfe, 0xd0, 0xd4, 0x67, 0xc0, 0xa4, + 0xfb, 0xd8, 0xd4, 0x6d, 0x14, 0x21, 0xa0, 0x95, 0xc7, 0x71, 0x14, 0x89, 0x79, 0x3f, 0x8f, 0xef, + 0x28, 0x03, 0x45, 0xc3, 0xdc, 0x7b, 0xe0, 0xfc, 0xdd, 0x34, 0x77, 0x20, 0x55, 0x32, 0xf9, 0x53, + 0x15, 0x55, 0xda, 0x7d, 0x36, 0x99, 0xfc, 0x08, 0x9e, 0x89, 0x85, 0x67, 0x78, 0xab, 0x46, 0x1e, + 0x2a, 0x72, 0x0b, 0x6a, 0x4f, 0xc4, 0xea, 0x47, 0xa3, 0x60, 0x72, 0x06, 0x8d, 0xc7, 0x1a, 0xec, + 0xdc, 0x80, 0x58, 0xd0, 0xeb, 0x20, 0x24, 0x0f, 0x25, 0xcf, 0xa3, 0x9f, 0x03, 0x73, 0x36, 0x62, + 0x45, 0x6f, 0x6a, 0x29, 0x46, 0xc5, 0x84, 0x21, 0xf4, 0x2c, 0x26, 0x19, 0x4a, 0x10, 0x57, 0xda, + 0x04, 0xf1, 0x38, 0x1c, 0x69, 0xe0, 0xdd, 0x51, 0x38, 0xd3, 0x7d, 0x3d, 0x37, 0x5c, 0x4a, 0x98, + 0x89, 0xfe, 0x74, 0x00, 0xfb, 0xd3, 0x3d, 0x18, 0x90, 0xad, 0x64, 0x19, 0x0a, 0x36, 0xd5, 0x86, + 0x6d, 0xea, 0x9e, 0x96, 0x25, 0xae, 0x24, 0x24, 0x05, 0xb3, 0xea, 0x80, 0x66, 0x75, 0x57, 0x47, + 0x31, 0x01, 0x03, 0x33, 0x4f, 0x1b, 0xf6, 0x2c, 0x3d, 0x41, 0x5c, 0x29, 0x10, 0x24, 0x7f, 0xd4, + 0x3b, 0xa0, 0x73, 0x69, 0x09, 0x26, 0x60, 0x60, 0x14, 0xea, 0x28, 0x0c, 0x4c, 0xff, 0x45, 0xf7, + 0x18, 0x8a, 0xa2, 0x8d, 0x1d, 0xc0, 0x36, 0xa6, 0xfd, 0xa2, 0x7b, 0x12, 0x4b, 0xc1, 0xcd, 0xda, + 0xb0, 0x9b, 0xa5, 0xf6, 0xd1, 0x75, 0xe4, 0x3e, 0xba, 0x0e, 0xdf, 0xc7, 0xd8, 0xd3, 0xd2, 0xfa, + 0x48, 0xc1, 0xc0, 0xe0, 0xd4, 0x51, 0x58, 0x5b, 0x7a, 0x1f, 0x23, 0x8a, 0xa2, 0xc1, 0x1d, 0xc0, + 0x06, 0x97, 0xda, 0x47, 0x9e, 0xa5, 0xe0, 0x73, 0x2d, 0xd0, 0xe7, 0xee, 0x6a, 0x49, 0x86, 0x85, + 0x84, 0x22, 0xef, 0x76, 0x6d, 0xc8, 0xed, 0xee, 0xe8, 0xe8, 0xc5, 0x48, 0x50, 0xcc, 0xea, 0x28, + 0x4c, 0x4f, 0xdf, 0x41, 0x52, 0x2a, 0x74, 0x90, 0x9a, 0xd5, 0x01, 0x6c, 0x7d, 0xda, 0x0e, 0x32, + 0x78, 0x70, 0xfa, 0x6a, 0xc3, 0x0e, 0xa8, 0x57, 0x22, 0xae, 0x14, 0x94, 0x48, 0x7c, 0xb0, 0x03, + 0xfa, 0xa0, 0x56, 0x89, 0x09, 0x18, 0x14, 0xca, 0x36, 0x7e, 0x8e, 0x5e, 0x85, 0xed, 0xcc, 0x5a, + 0x43, 0xc5, 0x5f, 0x78, 0x67, 0xf8, 0xe1, 0xd0, 0x52, 0x37, 0xfc, 0xd1, 0xfa, 0x36, 0x5a, 0xfa, + 0x65, 0xe8, 0xad, 0x19, 0xfe, 0xcd, 0x84, 0x14, 0x3e, 0x58, 0xfc, 0x6e, 0x61, 0xe3, 0x87, 0xe8, + 0xda, 0x25, 0x21, 0xff, 0x14, 0xdd, 0x04, 0x7d, 0x0e, 0x38, 0xc1, 0x16, 0x7f, 0x02, 0xcd, 0x94, + 0x90, 0xc1, 0x7f, 0x8e, 0x2a, 0x97, 0x82, 0xfb, 0x33, 0x74, 0x03, 0xf0, 0x40, 0x00, 0xdd, 0xe1, + 0xd1, 0xf5, 0x43, 0x41, 0xae, 0x31, 0x96, 0xec, 0x89, 0x17, 0x88, 0xff, 0x31, 0xb2, 0x64, 0x7b, + 0x04, 0xf0, 0xdf, 0xe1, 0xf1, 0xb5, 0x53, 0x44, 0x06, 0xfe, 0x27, 0x68, 0x5d, 0xf2, 0xcb, 0x8b, + 0x43, 0x67, 0xc8, 0x27, 0x3e, 0x92, 0x07, 0x9e, 0x19, 0xf6, 0x81, 0xe4, 0x2f, 0x03, 0x9d, 0x91, + 0x4e, 0x4f, 0x8b, 0x9f, 0xfa, 0xd5, 0xf6, 0xe0, 0x13, 0x24, 0xd2, 0xb9, 0x1c, 0x7c, 0xbe, 0xfb, + 0xd4, 0x7d, 0x72, 0xf6, 0x27, 0x1a, 0x28, 0xaa, 0xba, 0x7f, 0xe1, 0xe8, 0x42, 0xf7, 0xd5, 0xf8, + 0x99, 0xba, 0x03, 0x9c, 0x80, 0xef, 0xfe, 0xc5, 0xe3, 0xff, 0x18, 0xad, 0x4b, 0x3e, 0x9d, 0xe7, + 0xcf, 0x71, 0x32, 0x40, 0x65, 0xc0, 0x3f, 0x42, 0x6b, 0xa2, 0x73, 0x5f, 0x18, 0x36, 0xd3, 0x79, + 0xc6, 0x73, 0xf3, 0x74, 0x86, 0x9d, 0xba, 0x82, 0x9d, 0xbf, 0x1c, 0x7c, 0x46, 0xf7, 0x89, 0x23, + 0xe7, 0x51, 0x26, 0xfb, 0xef, 0x81, 0x90, 0xee, 0x2f, 0x01, 0x7d, 0xf3, 0x3f, 0x55, 0xb4, 0xda, + 0xee, 0x27, 0x33, 0xdb, 0x8f, 0xd5, 0x89, 0xf9, 0x5b, 0xc9, 0x5e, 0x24, 0x2a, 0x57, 0xe4, 0x65, + 0xf5, 0x3f, 0x95, 0x34, 0xe5, 0xd4, 0xfc, 0x4d, 0x00, 0x56, 0x80, 0x03, 0x1f, 0xba, 0x7f, 0xa4, + 0xcc, 0xcd, 0xf7, 0x35, 0x44, 0x85, 0xb4, 0xab, 0xf8, 0x77, 0x95, 0xc7, 0x52, 0x76, 0xbe, 0x0d, + 0x60, 0xf2, 0x58, 0xd0, 0x73, 0xfd, 0x43, 0x45, 0x7a, 0xbe, 0xab, 0x63, 0xc8, 0x66, 0x5d, 0x70, + 0xc2, 0xdb, 0x83, 0x13, 0xf4, 0x1d, 0x08, 0x54, 0xce, 0xcf, 0xca, 0x51, 0xef, 0x33, 0x38, 0x43, + 0xdf, 0xd1, 0x70, 0x65, 0x43, 0x2f, 0x34, 0xf4, 0xed, 0x82, 0x39, 0xfa, 0x0d, 0x35, 0x51, 0x06, + 0x50, 0x35, 0xfd, 0x7d, 0x06, 0x27, 0x69, 0x1d, 0x4d, 0x36, 0x54, 0x42, 0x73, 0xe0, 0x2e, 0x98, + 0xa6, 0x35, 0x34, 0x19, 0x40, 0xd5, 0x40, 0xf8, 0x50, 0x91, 0xa7, 0x75, 0x5f, 0x7d, 0x4f, 0x22, + 0x2a, 0x66, 0xea, 0x1e, 0x9c, 0xa9, 0x35, 0x5f, 0x7d, 0x0f, 0xe4, 0x2a, 0xa4, 0xea, 0x67, 0x70, + 0xaa, 0x4e, 0xe9, 0x69, 0x1c, 0x30, 0xa1, 0x69, 0x71, 0x17, 0x4c, 0xd6, 0xfa, 0x9e, 0x46, 0x80, + 0xaa, 0xb1, 0xf1, 0xa1, 0x22, 0x5b, 0xa7, 0xf5, 0x94, 0x27, 0x2a, 0xe6, 0xeb, 0x1e, 0x9c, 0xaf, + 0x53, 0x7a, 0x2a, 0x73, 0x15, 0x12, 0xf6, 0x13, 0x30, 0x61, 0xbf, 0xa1, 0xa1, 0xca, 0xa4, 0x62, + 0x60, 0xa6, 0xfc, 0x14, 0x4a, 0xd9, 0xaf, 0xab, 0x49, 0x26, 0x68, 0x8a, 0xe1, 0xf2, 0xa1, 0x22, + 0x67, 0xeb, 0xba, 0xc9, 0xa5, 0x62, 0x70, 0xcc, 0xdc, 0x83, 0xb3, 0xb6, 0xa6, 0x9b, 0x2c, 0xa6, + 0x72, 0xde, 0xfc, 0x0c, 0x4e, 0xdb, 0x3a, 0x85, 0xb2, 0xf1, 0x18, 0x9a, 0x3c, 0x77, 0xc1, 0xc4, + 0xad, 0x51, 0x28, 0x03, 0xa8, 0x18, 0x41, 0xcf, 0x33, 0xf7, 0x3c, 0x73, 0xcf, 0x33, 0xf7, 0x3c, + 0x73, 0xcf, 0x33, 0xf7, 0x3c, 0x73, 0xcf, 0x33, 0xf7, 0x3c, 0x73, 0xc3, 0x99, 0xfb, 0xcf, 0x4b, + 0xe8, 0xfa, 0xd3, 0x91, 0xe7, 0xbf, 0x64, 0x9e, 0x54, 0x3f, 0x60, 0x83, 0x71, 0xea, 0x5b, 0x1b, + 0x7b, 0xdc, 0x13, 0xe4, 0xef, 0x30, 0x69, 0x35, 0xcd, 0x38, 0xf7, 0xd8, 0x87, 0xbb, 0x3f, 0x40, + 0x2b, 0x13, 0x6f, 0x9c, 0xfd, 0x85, 0x8c, 0xf0, 0xb4, 0xf1, 0x02, 0xeb, 0x7b, 0x68, 0x79, 0xe2, + 0x8d, 0xb3, 0xbe, 0x82, 0x11, 0x9e, 0x38, 0x2a, 0xa7, 0x4b, 0xb3, 0xbe, 0x74, 0x41, 0x97, 0x92, + 0xa8, 0x42, 0x38, 0x67, 0x7f, 0xcd, 0x82, 0x72, 0xa6, 0x41, 0x27, 0x3e, 0x71, 0xa6, 0x17, 0x2b, + 0x92, 0x13, 0xbb, 0x0e, 0x73, 0xe2, 0x6c, 0xaf, 0x52, 0x30, 0x27, 0x76, 0x1d, 0x6b, 0x07, 0x5d, + 0x9d, 0x78, 0xe3, 0x6c, 0x2f, 0x4f, 0xec, 0x2d, 0x74, 0xa3, 0x62, 0x7a, 0xd6, 0xec, 0xaf, 0x4b, + 0xd0, 0xb3, 0xd2, 0x5d, 0x33, 0xb9, 0xdc, 0xac, 0x2f, 0x48, 0xd0, 0xcb, 0xc5, 0x1f, 0xd4, 0xd7, + 0xb1, 0x46, 0x9f, 0x52, 0x8d, 0x86, 0x5a, 0xdb, 0xfc, 0xdf, 0x12, 0xaa, 0x60, 0xdd, 0xc6, 0xd3, + 0xa2, 0xf7, 0x8d, 0x54, 0x4b, 0xc6, 0x42, 0xbc, 0x76, 0xdf, 0x35, 0xd0, 0x2e, 0x19, 0xd7, 0x70, + 0x0a, 0xae, 0x1b, 0x2a, 0x98, 0x24, 0x01, 0x5e, 0xc7, 0xbb, 0x46, 0x3a, 0x8e, 0x11, 0x12, 0x35, + 0xef, 0x1a, 0xa9, 0x99, 0x03, 0x20, 0xaa, 0xac, 0x1b, 0x6a, 0x9a, 0xbb, 0x0a, 0xaa, 0xec, 0x5d, + 0x23, 0x65, 0x8b, 0x24, 0xf0, 0x7b, 0x72, 0x66, 0xfa, 0x96, 0x48, 0xe0, 0x7b, 0x24, 0xbb, 0xca, + 0xe3, 0xf5, 0xb1, 0xd6, 0xeb, 0x86, 0x5a, 0xe7, 0x18, 0x50, 0xc5, 0xef, 0x1a, 0x29, 0x9e, 0x6b, + 0x03, 0xd1, 0xfd, 0x75, 0xac, 0xf1, 0xa7, 0x58, 0xe3, 0xa1, 0x4a, 0xeb, 0xf7, 0x3f, 0xff, 0xa2, + 0x5a, 0xf8, 0xf2, 0x8b, 0x6a, 0xe1, 0x8f, 0xe7, 0xd5, 0xc2, 0x5f, 0xce, 0xab, 0x85, 0xbf, 0x9e, + 0x57, 0x0b, 0x9f, 0x9d, 0x57, 0x17, 0xfe, 0x7e, 0x5e, 0x2d, 0x7c, 0x7e, 0x5e, 0x2d, 0x7c, 0x79, + 0x5e, 0x5d, 0xf8, 0xd5, 0xbf, 0xaa, 0x0b, 0x83, 0x2b, 0xf8, 0x0c, 0xee, 0x57, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x5f, 0x2b, 0x6f, 0x53, 0xc2, 0x40, 0x00, 0x00, } func (this *KnownTypes) Compare(that interface{}) int { @@ -2606,6 +2051,9 @@ if c := this.Bytes.Compare(that1.Bytes); c != 0 { return c } + if c := this.St.Compare(that1.St); c != 0 { + return c + } if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { return c } @@ -3037,6 +2485,9 @@ if !this.Bytes.Equal(that1.Bytes) { return fmt.Errorf("Bytes this(%v) Not Equal that(%v)", this.Bytes, that1.Bytes) } + if !this.St.Equal(that1.St) { + return fmt.Errorf("St this(%v) Not Equal that(%v)", this.St, that1.St) + } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return fmt.Errorf("XXX_unrecognized this(%v) Not Equal that(%v)", this.XXX_unrecognized, that1.XXX_unrecognized) } @@ -3094,6 +2545,9 @@ if !this.Bytes.Equal(that1.Bytes) { return false } + if !this.St.Equal(that1.St) { + return false + } if !bytes.Equal(this.XXX_unrecognized, that1.XXX_unrecognized) { return false } @@ -6793,78 +6247,81 @@ } func NewPopulatedKnownTypes(r randyTypes, easy bool) *KnownTypes { this := &KnownTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Dur = types.NewPopulatedDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Ts = types.NewPopulatedTimestamp(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Dbl = types.NewPopulatedDoubleValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Flt = types.NewPopulatedFloatValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.I64 = types.NewPopulatedInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.U64 = types.NewPopulatedUInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.I32 = types.NewPopulatedInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.U32 = types.NewPopulatedUInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bool = types.NewPopulatedBoolValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Str = types.NewPopulatedStringValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Bytes = types.NewPopulatedBytesValue(r, easy) } + if r.Intn(5) != 0 { + this.St = types.NewPopulatedStruct(r, easy) + } if !easy && r.Intn(10) != 0 { - this.XXX_unrecognized = randUnrecognizedTypes(r, 12) + this.XXX_unrecognized = randUnrecognizedTypes(r, 13) } return this } func NewPopulatedProtoTypes(r randyTypes, easy bool) *ProtoTypes { this := &ProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableTimestamp = types.NewPopulatedTimestamp(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDuration = types.NewPopulatedDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDouble = types.NewPopulatedDoubleValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableFloat = types.NewPopulatedFloatValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt64 = types.NewPopulatedInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt64 = types.NewPopulatedUInt64Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt32 = types.NewPopulatedInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt32 = types.NewPopulatedUInt32Value(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBool = types.NewPopulatedBoolValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableString = types.NewPopulatedStringValue(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBytes = types.NewPopulatedBytesValue(r, easy) } v1 := types.NewPopulatedTimestamp(r, easy) @@ -6897,37 +6354,37 @@ func NewPopulatedStdTypes(r randyTypes, easy bool) *StdTypes { this := &StdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableTimestamp = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDuration = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableDouble = github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableFloat = github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt64 = github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt64 = github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableInt32 = github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableUInt32 = github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBool = github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableString = github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.NullableBytes = github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) } v12 := github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) @@ -6960,21 +6417,21 @@ func NewPopulatedRepProtoTypes(r randyTypes, easy bool) *RepProtoTypes { this := &RepProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(5) this.NullableTimestamps = make([]*types.Timestamp, v23) for i := 0; i < v23; i++ { this.NullableTimestamps[i] = types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(5) this.NullableDurations = make([]*types.Duration, v24) for i := 0; i < v24; i++ { this.NullableDurations[i] = types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(5) this.Timestamps = make([]types.Timestamp, v25) for i := 0; i < v25; i++ { @@ -6982,7 +6439,7 @@ this.Timestamps[i] = *v26 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v27 := r.Intn(5) this.Durations = make([]types.Duration, v27) for i := 0; i < v27; i++ { @@ -6990,14 +6447,14 @@ this.Durations[i] = *v28 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v29 := r.Intn(5) this.NullableDouble = make([]*types.DoubleValue, v29) for i := 0; i < v29; i++ { this.NullableDouble[i] = types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v30 := r.Intn(5) this.NonnullDouble = make([]types.DoubleValue, v30) for i := 0; i < v30; i++ { @@ -7005,14 +6462,14 @@ this.NonnullDouble[i] = *v31 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v32 := r.Intn(5) this.NullableFloat = make([]*types.FloatValue, v32) for i := 0; i < v32; i++ { this.NullableFloat[i] = types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v33 := r.Intn(5) this.NonnullFloat = make([]types.FloatValue, v33) for i := 0; i < v33; i++ { @@ -7020,14 +6477,14 @@ this.NonnullFloat[i] = *v34 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v35 := r.Intn(5) this.NullableInt64 = make([]*types.Int64Value, v35) for i := 0; i < v35; i++ { this.NullableInt64[i] = types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v36 := r.Intn(5) this.NonnullInt64 = make([]types.Int64Value, v36) for i := 0; i < v36; i++ { @@ -7035,14 +6492,14 @@ this.NonnullInt64[i] = *v37 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v38 := r.Intn(5) this.NullableUInt64 = make([]*types.UInt64Value, v38) for i := 0; i < v38; i++ { this.NullableUInt64[i] = types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v39 := r.Intn(5) this.NonnullUInt64 = make([]types.UInt64Value, v39) for i := 0; i < v39; i++ { @@ -7050,14 +6507,14 @@ this.NonnullUInt64[i] = *v40 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v41 := r.Intn(5) this.NullableInt32 = make([]*types.Int32Value, v41) for i := 0; i < v41; i++ { this.NullableInt32[i] = types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v42 := r.Intn(5) this.NonnullInt32 = make([]types.Int32Value, v42) for i := 0; i < v42; i++ { @@ -7065,14 +6522,14 @@ this.NonnullInt32[i] = *v43 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v44 := r.Intn(5) this.NullableUInt32 = make([]*types.UInt32Value, v44) for i := 0; i < v44; i++ { this.NullableUInt32[i] = types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v45 := r.Intn(5) this.NonnullUInt32 = make([]types.UInt32Value, v45) for i := 0; i < v45; i++ { @@ -7080,14 +6537,14 @@ this.NonnullUInt32[i] = *v46 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v47 := r.Intn(5) this.NullableBool = make([]*types.BoolValue, v47) for i := 0; i < v47; i++ { this.NullableBool[i] = types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v48 := r.Intn(5) this.NonnullBool = make([]types.BoolValue, v48) for i := 0; i < v48; i++ { @@ -7095,14 +6552,14 @@ this.NonnullBool[i] = *v49 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v50 := r.Intn(5) this.NullableString = make([]*types.StringValue, v50) for i := 0; i < v50; i++ { this.NullableString[i] = types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v51 := r.Intn(5) this.NonnullString = make([]types.StringValue, v51) for i := 0; i < v51; i++ { @@ -7110,14 +6567,14 @@ this.NonnullString[i] = *v52 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v53 := r.Intn(5) this.NullableBytes = make([]*types.BytesValue, v53) for i := 0; i < v53; i++ { this.NullableBytes[i] = types.NewPopulatedBytesValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v54 := r.Intn(5) this.NonnullBytes = make([]types.BytesValue, v54) for i := 0; i < v54; i++ { @@ -7133,21 +6590,21 @@ func NewPopulatedRepStdTypes(r randyTypes, easy bool) *RepStdTypes { this := &RepStdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v56 := r.Intn(5) this.NullableTimestamps = make([]*time.Time, v56) for i := 0; i < v56; i++ { this.NullableTimestamps[i] = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v57 := r.Intn(5) this.NullableDurations = make([]*time.Duration, v57) for i := 0; i < v57; i++ { this.NullableDurations[i] = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v58 := r.Intn(5) this.Timestamps = make([]time.Time, v58) for i := 0; i < v58; i++ { @@ -7155,7 +6612,7 @@ this.Timestamps[i] = *v59 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v60 := r.Intn(5) this.Durations = make([]time.Duration, v60) for i := 0; i < v60; i++ { @@ -7163,14 +6620,14 @@ this.Durations[i] = *v61 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v62 := r.Intn(5) this.NullableDouble = make([]*float64, v62) for i := 0; i < v62; i++ { this.NullableDouble[i] = github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v63 := r.Intn(5) this.NonnullDouble = make([]float64, v63) for i := 0; i < v63; i++ { @@ -7178,14 +6635,14 @@ this.NonnullDouble[i] = *v64 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v65 := r.Intn(5) this.NullableFloat = make([]*float32, v65) for i := 0; i < v65; i++ { this.NullableFloat[i] = github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v66 := r.Intn(5) this.NonnullFloat = make([]float32, v66) for i := 0; i < v66; i++ { @@ -7193,14 +6650,14 @@ this.NonnullFloat[i] = *v67 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v68 := r.Intn(5) this.NullableInt64 = make([]*int64, v68) for i := 0; i < v68; i++ { this.NullableInt64[i] = github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v69 := r.Intn(5) this.NonnullInt64 = make([]int64, v69) for i := 0; i < v69; i++ { @@ -7208,14 +6665,14 @@ this.NonnullInt64[i] = *v70 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v71 := r.Intn(5) this.NullableUInt64 = make([]*uint64, v71) for i := 0; i < v71; i++ { this.NullableUInt64[i] = github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v72 := r.Intn(5) this.NonnullUInt64 = make([]uint64, v72) for i := 0; i < v72; i++ { @@ -7223,14 +6680,14 @@ this.NonnullUInt64[i] = *v73 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v74 := r.Intn(5) this.NullableInt32 = make([]*int32, v74) for i := 0; i < v74; i++ { this.NullableInt32[i] = github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v75 := r.Intn(5) this.NonnullInt32 = make([]int32, v75) for i := 0; i < v75; i++ { @@ -7238,14 +6695,14 @@ this.NonnullInt32[i] = *v76 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v77 := r.Intn(5) this.NullableUInt32 = make([]*uint32, v77) for i := 0; i < v77; i++ { this.NullableUInt32[i] = github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v78 := r.Intn(5) this.NonnullUInt32 = make([]uint32, v78) for i := 0; i < v78; i++ { @@ -7253,14 +6710,14 @@ this.NonnullUInt32[i] = *v79 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v80 := r.Intn(5) this.NullableBool = make([]*bool, v80) for i := 0; i < v80; i++ { this.NullableBool[i] = github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v81 := r.Intn(5) this.NonnullBool = make([]bool, v81) for i := 0; i < v81; i++ { @@ -7268,14 +6725,14 @@ this.NonnullBool[i] = *v82 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v83 := r.Intn(5) this.NullableString = make([]*string, v83) for i := 0; i < v83; i++ { this.NullableString[i] = github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v84 := r.Intn(5) this.NonnullString = make([]string, v84) for i := 0; i < v84; i++ { @@ -7283,14 +6740,14 @@ this.NonnullString[i] = *v85 } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v86 := r.Intn(5) this.NullableBytes = make([]*[]byte, v86) for i := 0; i < v86; i++ { this.NullableBytes[i] = github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v87 := r.Intn(5) this.NonnullBytes = make([][]byte, v87) for i := 0; i < v87; i++ { @@ -7306,154 +6763,154 @@ func NewPopulatedMapProtoTypes(r randyTypes, easy bool) *MapProtoTypes { this := &MapProtoTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v89 := r.Intn(10) this.NullableTimestamp = make(map[int32]*types.Timestamp) for i := 0; i < v89; i++ { this.NullableTimestamp[int32(r.Int31())] = types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v90 := r.Intn(10) this.Timestamp = make(map[int32]types.Timestamp) for i := 0; i < v90; i++ { this.Timestamp[int32(r.Int31())] = *types.NewPopulatedTimestamp(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v91 := r.Intn(10) this.NullableDuration = make(map[int32]*types.Duration) for i := 0; i < v91; i++ { this.NullableDuration[int32(r.Int31())] = types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v92 := r.Intn(10) this.Duration = make(map[int32]types.Duration) for i := 0; i < v92; i++ { this.Duration[int32(r.Int31())] = *types.NewPopulatedDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v93 := r.Intn(10) this.NullableDouble = make(map[int32]*types.DoubleValue) for i := 0; i < v93; i++ { this.NullableDouble[int32(r.Int31())] = types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v94 := r.Intn(10) this.NonnullDouble = make(map[int32]types.DoubleValue) for i := 0; i < v94; i++ { this.NonnullDouble[int32(r.Int31())] = *types.NewPopulatedDoubleValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v95 := r.Intn(10) this.NullableFloat = make(map[int32]*types.FloatValue) for i := 0; i < v95; i++ { this.NullableFloat[int32(r.Int31())] = types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v96 := r.Intn(10) this.NonnullFloat = make(map[int32]types.FloatValue) for i := 0; i < v96; i++ { this.NonnullFloat[int32(r.Int31())] = *types.NewPopulatedFloatValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v97 := r.Intn(10) this.NullableInt64 = make(map[int32]*types.Int64Value) for i := 0; i < v97; i++ { this.NullableInt64[int32(r.Int31())] = types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v98 := r.Intn(10) this.NonnullInt64 = make(map[int32]types.Int64Value) for i := 0; i < v98; i++ { this.NonnullInt64[int32(r.Int31())] = *types.NewPopulatedInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v99 := r.Intn(10) this.NullableUInt64 = make(map[int32]*types.UInt64Value) for i := 0; i < v99; i++ { this.NullableUInt64[int32(r.Int31())] = types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v100 := r.Intn(10) this.NonnullUInt64 = make(map[int32]types.UInt64Value) for i := 0; i < v100; i++ { this.NonnullUInt64[int32(r.Int31())] = *types.NewPopulatedUInt64Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v101 := r.Intn(10) this.NullableInt32 = make(map[int32]*types.Int32Value) for i := 0; i < v101; i++ { this.NullableInt32[int32(r.Int31())] = types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v102 := r.Intn(10) this.NonnullInt32 = make(map[int32]types.Int32Value) for i := 0; i < v102; i++ { this.NonnullInt32[int32(r.Int31())] = *types.NewPopulatedInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v103 := r.Intn(10) this.NullableUInt32 = make(map[int32]*types.UInt32Value) for i := 0; i < v103; i++ { this.NullableUInt32[int32(r.Int31())] = types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v104 := r.Intn(10) this.NonnullUInt32 = make(map[int32]types.UInt32Value) for i := 0; i < v104; i++ { this.NonnullUInt32[int32(r.Int31())] = *types.NewPopulatedUInt32Value(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v105 := r.Intn(10) this.NullableBool = make(map[int32]*types.BoolValue) for i := 0; i < v105; i++ { this.NullableBool[int32(r.Int31())] = types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v106 := r.Intn(10) this.NonnullBool = make(map[int32]types.BoolValue) for i := 0; i < v106; i++ { this.NonnullBool[int32(r.Int31())] = *types.NewPopulatedBoolValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v107 := r.Intn(10) this.NullableString = make(map[int32]*types.StringValue) for i := 0; i < v107; i++ { this.NullableString[int32(r.Int31())] = types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v108 := r.Intn(10) this.NonnullString = make(map[int32]types.StringValue) for i := 0; i < v108; i++ { this.NonnullString[int32(r.Int31())] = *types.NewPopulatedStringValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v109 := r.Intn(10) this.NullableBytes = make(map[int32]*types.BytesValue) for i := 0; i < v109; i++ { this.NullableBytes[int32(r.Int31())] = types.NewPopulatedBytesValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v110 := r.Intn(10) this.NonnullBytes = make(map[int32]types.BytesValue) for i := 0; i < v110; i++ { @@ -7468,154 +6925,154 @@ func NewPopulatedMapStdTypes(r randyTypes, easy bool) *MapStdTypes { this := &MapStdTypes{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v111 := r.Intn(10) this.NullableTimestamp = make(map[int32]*time.Time) for i := 0; i < v111; i++ { this.NullableTimestamp[int32(r.Int31())] = github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v112 := r.Intn(10) this.Timestamp = make(map[int32]time.Time) for i := 0; i < v112; i++ { this.Timestamp[int32(r.Int31())] = *github_com_gogo_protobuf_types.NewPopulatedStdTime(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v113 := r.Intn(10) this.NullableDuration = make(map[int32]*time.Duration) for i := 0; i < v113; i++ { this.NullableDuration[int32(r.Int31())] = github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v114 := r.Intn(10) this.Duration = make(map[int32]time.Duration) for i := 0; i < v114; i++ { this.Duration[int32(r.Int31())] = *github_com_gogo_protobuf_types.NewPopulatedStdDuration(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v115 := r.Intn(10) this.NullableDouble = make(map[int32]*float64) for i := 0; i < v115; i++ { this.NullableDouble[int32(r.Int31())] = (*float64)(github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v116 := r.Intn(10) this.NonnullDouble = make(map[int32]float64) for i := 0; i < v116; i++ { this.NonnullDouble[int32(r.Int31())] = (float64)(*github_com_gogo_protobuf_types.NewPopulatedStdDouble(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v117 := r.Intn(10) this.NullableFloat = make(map[int32]*float32) for i := 0; i < v117; i++ { this.NullableFloat[int32(r.Int31())] = (*float32)(github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v118 := r.Intn(10) this.NonnullFloat = make(map[int32]float32) for i := 0; i < v118; i++ { this.NonnullFloat[int32(r.Int31())] = (float32)(*github_com_gogo_protobuf_types.NewPopulatedStdFloat(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v119 := r.Intn(10) this.NullableInt64 = make(map[int32]*int64) for i := 0; i < v119; i++ { this.NullableInt64[int32(r.Int31())] = (*int64)(github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v120 := r.Intn(10) this.NonnullInt64 = make(map[int32]int64) for i := 0; i < v120; i++ { this.NonnullInt64[int32(r.Int31())] = (int64)(*github_com_gogo_protobuf_types.NewPopulatedStdInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v121 := r.Intn(10) this.NullableUInt64 = make(map[int32]*uint64) for i := 0; i < v121; i++ { this.NullableUInt64[int32(r.Int31())] = (*uint64)(github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v122 := r.Intn(10) this.NonnullUInt64 = make(map[int32]uint64) for i := 0; i < v122; i++ { this.NonnullUInt64[int32(r.Int31())] = (uint64)(*github_com_gogo_protobuf_types.NewPopulatedStdUInt64(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v123 := r.Intn(10) this.NullableInt32 = make(map[int32]*int32) for i := 0; i < v123; i++ { this.NullableInt32[int32(r.Int31())] = (*int32)(github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v124 := r.Intn(10) this.NonnullInt32 = make(map[int32]int32) for i := 0; i < v124; i++ { this.NonnullInt32[int32(r.Int31())] = (int32)(*github_com_gogo_protobuf_types.NewPopulatedStdInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v125 := r.Intn(10) this.NullableUInt32 = make(map[int32]*uint32) for i := 0; i < v125; i++ { this.NullableUInt32[int32(r.Int31())] = (*uint32)(github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v126 := r.Intn(10) this.NonnullUInt32 = make(map[int32]uint32) for i := 0; i < v126; i++ { this.NonnullUInt32[int32(r.Int31())] = (uint32)(*github_com_gogo_protobuf_types.NewPopulatedStdUInt32(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v127 := r.Intn(10) this.NullableBool = make(map[int32]*bool) for i := 0; i < v127; i++ { this.NullableBool[int32(r.Int31())] = (*bool)(github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v128 := r.Intn(10) this.NonnullBool = make(map[int32]bool) for i := 0; i < v128; i++ { this.NonnullBool[int32(r.Int31())] = (bool)(*github_com_gogo_protobuf_types.NewPopulatedStdBool(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v129 := r.Intn(10) this.NullableString = make(map[int32]*string) for i := 0; i < v129; i++ { this.NullableString[int32(r.Int31())] = (*string)(github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v130 := r.Intn(10) this.NonnullString = make(map[int32]string) for i := 0; i < v130; i++ { this.NonnullString[int32(r.Int31())] = (string)(*github_com_gogo_protobuf_types.NewPopulatedStdString(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v131 := r.Intn(10) this.NullableBytes = make(map[int32]*[]byte) for i := 0; i < v131; i++ { this.NullableBytes[int32(r.Int31())] = (*[]byte)(github_com_gogo_protobuf_types.NewPopulatedStdBytes(r, easy)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v132 := r.Intn(10) this.NonnullBytes = make(map[int32][]byte) for i := 0; i < v132; i++ { @@ -7927,6 +7384,10 @@ l = m.Bytes.Size() n += 1 + l + sovTypes(uint64(l)) } + if m.St != nil { + l = m.St.Size() + n += 1 + l + sovTypes(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -9611,6 +9072,42 @@ return err } iNdEx = postIndex + case 12: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field St", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.St == nil { + m.St = &types.Struct{} + } + if err := m.St.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) @@ -18893,6 +18390,7 @@ func skipTypes(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -18924,10 +18422,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -18948,55 +18444,30 @@ return 0, ErrInvalidLengthTypes } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthTypes - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTypes - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipTypes(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthTypes - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTypes + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthTypes + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTypes = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/unmarshaler/types.proto golang-gogoprotobuf-1.3.1/test/types/combos/unmarshaler/types.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/combos/unmarshaler/types.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/types/combos/unmarshaler/types.proto 2020-05-17 12:22:58.000000000 +0000 @@ -34,7 +34,7 @@ //import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; -//import "google/protobuf/struct.proto"; +import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; @@ -64,7 +64,7 @@ google.protobuf.BytesValue bytes = 11; // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed - // google.protobuf.Struct st = 12; + google.protobuf.Struct st = 12; // google.protobuf.Any an = 14; } @@ -134,7 +134,7 @@ repeated google.protobuf.FloatValue nullableFloat = 7; repeated google.protobuf.FloatValue nonnullFloat = 8 [(gogoproto.nullable) = false]; - + repeated google.protobuf.Int64Value nullableInt64 = 9; repeated google.protobuf.Int64Value nonnullInt64 = 10 [(gogoproto.nullable) = false]; diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/types.proto golang-gogoprotobuf-1.3.1/test/types/types.proto --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/types/types.proto 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/types/types.proto 2020-05-17 12:22:58.000000000 +0000 @@ -34,7 +34,7 @@ //import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; -//import "google/protobuf/struct.proto"; +import "google/protobuf/struct.proto"; import "google/protobuf/timestamp.proto"; import "google/protobuf/wrappers.proto"; @@ -64,7 +64,7 @@ google.protobuf.BytesValue bytes = 11; // TODO uncomment this once https://github.com/gogo/protobuf/issues/197 is fixed - // google.protobuf.Struct st = 12; + google.protobuf.Struct st = 12; // google.protobuf.Any an = 14; } @@ -134,7 +134,7 @@ repeated google.protobuf.FloatValue nullableFloat = 7; repeated google.protobuf.FloatValue nonnullFloat = 8 [(gogoproto.nullable) = false]; - + repeated google.protobuf.Int64Value nullableInt64 = 9; repeated google.protobuf.Int64Value nonnullInt64 = 10 [(gogoproto.nullable) = false]; diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/unmarshalmerge/unmarshalmerge.pb.go golang-gogoprotobuf-1.3.1/test/unmarshalmerge/unmarshalmerge.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/unmarshalmerge/unmarshalmerge.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/unmarshalmerge/unmarshalmerge.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -25,7 +25,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Big struct { Sub *Sub `protobuf:"bytes,1,opt,name=Sub" json:"Sub,omitempty"` @@ -741,10 +741,10 @@ } func NewPopulatedBig(r randyUnmarshalmerge, easy bool) *Big { this := &Big{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Sub = NewPopulatedSub(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := int64(r.Int63()) if r.Intn(2) == 0 { v1 *= -1 @@ -759,10 +759,10 @@ func NewPopulatedBigUnsafe(r randyUnmarshalmerge, easy bool) *BigUnsafe { this := &BigUnsafe{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Sub = NewPopulatedSub(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := int64(r.Int63()) if r.Intn(2) == 0 { v2 *= -1 @@ -777,7 +777,7 @@ func NewPopulatedSub(r randyUnmarshalmerge, easy bool) *Sub { this := &Sub{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := int64(r.Int63()) if r.Intn(2) == 0 { v3 *= -1 @@ -1509,6 +1509,7 @@ func skipUnmarshalmerge(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1540,10 +1541,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1564,55 +1563,30 @@ return 0, ErrInvalidLengthUnmarshalmerge } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthUnmarshalmerge - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowUnmarshalmerge - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipUnmarshalmerge(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthUnmarshalmerge - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupUnmarshalmerge + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthUnmarshalmerge + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthUnmarshalmerge = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowUnmarshalmerge = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthUnmarshalmerge = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowUnmarshalmerge = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupUnmarshalmerge = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/unrecognized/unrecognized.pb.go golang-gogoprotobuf-1.3.1/test/unrecognized/unrecognized.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/unrecognized/unrecognized.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/unrecognized/unrecognized.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,7 +29,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type A struct { Field1 *int64 `protobuf:"varint,2,opt,name=Field1" json:"Field1,omitempty"` @@ -51,7 +51,7 @@ return xxx_messageInfo_A.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -92,7 +92,7 @@ return xxx_messageInfo_B.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -131,7 +131,7 @@ return xxx_messageInfo_D.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -175,7 +175,7 @@ return xxx_messageInfo_C.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -214,7 +214,7 @@ return xxx_messageInfo_U.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -283,7 +283,7 @@ return xxx_messageInfo_OldA.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -323,7 +323,7 @@ return xxx_messageInfo_OldB.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -366,7 +366,7 @@ return xxx_messageInfo_OldC.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -406,7 +406,7 @@ return xxx_messageInfo_OldU.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -2045,7 +2045,7 @@ func (m *A) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2053,34 +2053,41 @@ } func (m *A) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *A) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.Field1 != nil { + i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x10 + } if len(m.B) > 0 { - for _, msg := range m.B { - dAtA[i] = 0xa - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.B) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.B[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintUnrecognized(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.Field1 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field1)) - } - return i, nil + return len(dAtA) - i, nil } func (m *B) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2088,50 +2095,62 @@ } func (m *B) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *B) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.C != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(m.C.Size())) - n1, err1 := m.C.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if m.F != nil { + { + size, err := m.F.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintUnrecognized(dAtA, i, uint64(size)) } - i += n1 + i-- + dAtA[i] = 0x2a } if m.D != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(m.D.Size())) - n2, err2 := m.D.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + { + size, err := m.D.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintUnrecognized(dAtA, i, uint64(size)) } - i += n2 + i-- + dAtA[i] = 0x12 } - if m.F != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(m.F.Size())) - n3, err3 := m.F.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + if m.C != nil { + { + size, err := m.C.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintUnrecognized(dAtA, i, uint64(size)) } - i += n3 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *D) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2139,25 +2158,31 @@ } func (m *D) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *D) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Field1 != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *C) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2165,60 +2190,68 @@ } func (m *C) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *C) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field2 != nil { - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field2)))) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field3 != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(len(*m.Field3))) - i += copy(dAtA[i:], *m.Field3) + if len(m.Field7) > 0 { + for iNdEx := len(m.Field7) - 1; iNdEx >= 0; iNdEx-- { + f4 := math.Float32bits(float32(m.Field7[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f4)) + i-- + dAtA[i] = 0x3d + } } - if m.Field4 != nil { - dAtA[i] = 0x21 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field4)))) - i += 8 + if m.Field6 != nil { + i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } if len(m.Field5) > 0 { - for _, b := range m.Field5 { + for iNdEx := len(m.Field5) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Field5[iNdEx]) + copy(dAtA[i:], m.Field5[iNdEx]) + i = encodeVarintUnrecognized(dAtA, i, uint64(len(m.Field5[iNdEx]))) + i-- dAtA[i] = 0x2a - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(len(b))) - i += copy(dAtA[i:], b) } } - if m.Field6 != nil { - dAtA[i] = 0x30 - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field6)) + if m.Field4 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field4)))) + i-- + dAtA[i] = 0x21 } - if len(m.Field7) > 0 { - for _, num := range m.Field7 { - dAtA[i] = 0x3d - i++ - f4 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f4)) - i += 4 - } + if m.Field3 != nil { + i -= len(*m.Field3) + copy(dAtA[i:], *m.Field3) + i = encodeVarintUnrecognized(dAtA, i, uint64(len(*m.Field3))) + i-- + dAtA[i] = 0x1a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field2)))) + i-- + dAtA[i] = 0x11 } - return i, nil + return len(dAtA) - i, nil } func (m *U) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2226,31 +2259,36 @@ } func (m *U) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *U) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.Field3 != nil { + i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field3)) + i-- + dAtA[i] = 0x18 + } if len(m.Field2) > 0 { - for _, num := range m.Field2 { - dAtA[i] = 0x11 - i++ - f5 := math.Float64bits(float64(num)) + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f5 := math.Float64bits(float64(m.Field2[iNdEx])) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f5)) - i += 8 + i-- + dAtA[i] = 0x11 } } - if m.Field3 != nil { - dAtA[i] = 0x18 - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field3)) - } - return i, nil + return len(dAtA) - i, nil } func (m *OldA) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2258,34 +2296,41 @@ } func (m *OldA) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OldA) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.Field1 != nil { + i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x10 + } if len(m.B) > 0 { - for _, msg := range m.B { - dAtA[i] = 0xa - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.B) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.B[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintUnrecognized(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.Field1 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field1)) - } - return i, nil + return len(dAtA) - i, nil } func (m *OldB) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2293,40 +2338,50 @@ } func (m *OldB) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OldB) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.C != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(m.C.Size())) - n6, err6 := m.C.MarshalTo(dAtA[i:]) - if err6 != nil { - return 0, err6 - } - i += n6 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.F != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(m.F.Size())) - n7, err7 := m.F.MarshalTo(dAtA[i:]) - if err7 != nil { - return 0, err7 + { + size, err := m.F.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintUnrecognized(dAtA, i, uint64(size)) } - i += n7 + i-- + dAtA[i] = 0x2a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.C != nil { + { + size, err := m.C.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintUnrecognized(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *OldC) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2334,51 +2389,58 @@ } func (m *OldC) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OldC) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field1)) - } - if m.Field2 != nil { - dAtA[i] = 0x11 - i++ - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field2)))) - i += 8 + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if m.Field3 != nil { - dAtA[i] = 0x1a - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(len(*m.Field3))) - i += copy(dAtA[i:], *m.Field3) + if len(m.Field7) > 0 { + for iNdEx := len(m.Field7) - 1; iNdEx >= 0; iNdEx-- { + f8 := math.Float32bits(float32(m.Field7[iNdEx])) + i -= 4 + encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f8)) + i-- + dAtA[i] = 0x3d + } } if m.Field6 != nil { - dAtA[i] = 0x30 - i++ i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field6)) + i-- + dAtA[i] = 0x30 } - if len(m.Field7) > 0 { - for _, num := range m.Field7 { - dAtA[i] = 0x3d - i++ - f8 := math.Float32bits(float32(num)) - encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(f8)) - i += 4 - } + if m.Field3 != nil { + i -= len(*m.Field3) + copy(dAtA[i:], *m.Field3) + i = encodeVarintUnrecognized(dAtA, i, uint64(len(*m.Field3))) + i-- + dAtA[i] = 0x1a } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field2 != nil { + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(*m.Field2)))) + i-- + dAtA[i] = 0x11 } - return i, nil + if m.Field1 != nil { + i = encodeVarintUnrecognized(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil } func (m *OldU) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -2386,50 +2448,59 @@ } func (m *OldU) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *OldU) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintUnrecognized(dAtA, i, uint64(len(*m.Field1))) - i += copy(dAtA[i:], *m.Field1) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Field2) > 0 { - for _, num := range m.Field2 { - dAtA[i] = 0x11 - i++ - f9 := math.Float64bits(float64(num)) + for iNdEx := len(m.Field2) - 1; iNdEx >= 0; iNdEx-- { + f9 := math.Float64bits(float64(m.Field2[iNdEx])) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f9)) - i += 8 + i-- + dAtA[i] = 0x11 } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i -= len(*m.Field1) + copy(dAtA[i:], *m.Field1) + i = encodeVarintUnrecognized(dAtA, i, uint64(len(*m.Field1))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintUnrecognized(dAtA []byte, offset int, v uint64) int { + offset -= sovUnrecognized(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedA(r randyUnrecognized, easy bool) *A { this := &A{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(5) this.B = make([]*B, v1) for i := 0; i < v1; i++ { this.B[i] = NewPopulatedB(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := int64(r.Int63()) if r.Intn(2) == 0 { v2 *= -1 @@ -2443,13 +2514,13 @@ func NewPopulatedB(r randyUnrecognized, easy bool) *B { this := &B{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.C = NewPopulatedC(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.D = NewPopulatedD(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.F = NewPopulatedOldC(r, easy) } if !easy && r.Intn(10) != 0 { @@ -2460,7 +2531,7 @@ func NewPopulatedD(r randyUnrecognized, easy bool) *D { this := &D{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := int64(r.Int63()) if r.Intn(2) == 0 { v3 *= -1 @@ -2475,25 +2546,25 @@ func NewPopulatedC(r randyUnrecognized, easy bool) *C { this := &C{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := float64(r.Float64()) if r.Intn(2) == 0 { v4 *= -1 } this.Field2 = &v4 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := string(randStringUnrecognized(r)) this.Field3 = &v5 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := float64(r.Float64()) if r.Intn(2) == 0 { v6 *= -1 } this.Field4 = &v6 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(10) this.Field5 = make([][]byte, v7) for i := 0; i < v7; i++ { @@ -2504,14 +2575,14 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := int64(r.Int63()) if r.Intn(2) == 0 { v9 *= -1 } this.Field6 = &v9 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.Field7 = make([]float32, v10) for i := 0; i < v10; i++ { @@ -2529,7 +2600,7 @@ func NewPopulatedU(r randyUnrecognized, easy bool) *U { this := &U{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := r.Intn(10) this.Field2 = make([]float64, v11) for i := 0; i < v11; i++ { @@ -2539,7 +2610,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := uint32(r.Uint32()) this.Field3 = &v12 } @@ -2550,7 +2621,7 @@ func NewPopulatedUnoM(r randyUnrecognized, easy bool) *UnoM { this := &UnoM{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v13 := r.Intn(10) this.Field2 = make([]float64, v13) for i := 0; i < v13; i++ { @@ -2560,7 +2631,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := uint32(r.Uint32()) this.Field3 = &v14 } @@ -2571,14 +2642,14 @@ func NewPopulatedOldA(r randyUnrecognized, easy bool) *OldA { this := &OldA{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := r.Intn(5) this.B = make([]*OldB, v15) for i := 0; i < v15; i++ { this.B[i] = NewPopulatedOldB(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := int64(r.Int63()) if r.Intn(2) == 0 { v16 *= -1 @@ -2592,10 +2663,10 @@ func NewPopulatedOldB(r randyUnrecognized, easy bool) *OldB { this := &OldB{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.C = NewPopulatedOldC(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.F = NewPopulatedOldC(r, easy) } if !easy && r.Intn(10) != 0 { @@ -2606,32 +2677,32 @@ func NewPopulatedOldC(r randyUnrecognized, easy bool) *OldC { this := &OldC{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := int64(r.Int63()) if r.Intn(2) == 0 { v17 *= -1 } this.Field1 = &v17 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := float64(r.Float64()) if r.Intn(2) == 0 { v18 *= -1 } this.Field2 = &v18 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := string(randStringUnrecognized(r)) this.Field3 = &v19 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := int64(r.Int63()) if r.Intn(2) == 0 { v20 *= -1 } this.Field6 = &v20 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v21 := r.Intn(10) this.Field7 = make([]float32, v21) for i := 0; i < v21; i++ { @@ -2649,11 +2720,11 @@ func NewPopulatedOldU(r randyUnrecognized, easy bool) *OldU { this := &OldU{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := string(randStringUnrecognized(r)) this.Field1 = &v22 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v23 := r.Intn(10) this.Field2 = make([]float64, v23) for i := 0; i < v23; i++ { @@ -2671,11 +2742,11 @@ func NewPopulatedOldUnoM(r randyUnrecognized, easy bool) *OldUnoM { this := &OldUnoM{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := string(randStringUnrecognized(r)) this.Field1 = &v24 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := r.Intn(10) this.Field2 = make([]float64, v25) for i := 0; i < v25; i++ { @@ -4370,6 +4441,7 @@ func skipUnrecognized(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -4401,10 +4473,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -4425,55 +4495,30 @@ return 0, ErrInvalidLengthUnrecognized } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthUnrecognized - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowUnrecognized - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipUnrecognized(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthUnrecognized - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupUnrecognized + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthUnrecognized + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthUnrecognized = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowUnrecognized = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthUnrecognized = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowUnrecognized = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupUnrecognized = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/unrecognizedgroup/unrecognizedgroup.pb.go golang-gogoprotobuf-1.3.1/test/unrecognizedgroup/unrecognizedgroup.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/unrecognizedgroup/unrecognizedgroup.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/unrecognizedgroup/unrecognizedgroup.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -29,7 +29,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type NewNoGroup struct { Field1 *int64 `protobuf:"varint,1,opt,name=Field1" json:"Field1,omitempty"` @@ -53,7 +53,7 @@ return xxx_messageInfo_NewNoGroup.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -92,7 +92,7 @@ return xxx_messageInfo_A.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1096,7 +1096,7 @@ func (m *NewNoGroup) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1104,44 +1104,52 @@ } func (m *NewNoGroup) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NewNoGroup) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Field1 != nil { - dAtA[i] = 0x8 - i++ - i = encodeVarintUnrecognizedgroup(dAtA, i, uint64(*m.Field1)) - } - if len(m.Field3) > 0 { - for _, num := range m.Field3 { - dAtA[i] = 0x19 - i++ - f1 := math.Float64bits(float64(num)) - encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f1)) - i += 8 - } + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.A != nil { + { + size, err := m.A.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintUnrecognizedgroup(dAtA, i, uint64(size)) + } + i-- dAtA[i] = 0x2a - i++ - i = encodeVarintUnrecognizedgroup(dAtA, i, uint64(m.A.Size())) - n2, err2 := m.A.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + } + if len(m.Field3) > 0 { + for iNdEx := len(m.Field3) - 1; iNdEx >= 0; iNdEx-- { + f2 := math.Float64bits(float64(m.Field3[iNdEx])) + i -= 8 + encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(f2)) + i-- + dAtA[i] = 0x19 } - i += n2 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Field1 != nil { + i = encodeVarintUnrecognizedgroup(dAtA, i, uint64(*m.Field1)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *A) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1149,40 +1157,48 @@ } func (m *A) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *A) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.AField != nil { - dAtA[i] = 0x8 - i++ i = encodeVarintUnrecognizedgroup(dAtA, i, uint64(*m.AField)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintUnrecognizedgroup(dAtA []byte, offset int, v uint64) int { + offset -= sovUnrecognizedgroup(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedNewNoGroup(r randyUnrecognizedgroup, easy bool) *NewNoGroup { this := &NewNoGroup{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := int64(r.Int63()) if r.Intn(2) == 0 { v1 *= -1 } this.Field1 = &v1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(10) this.Field3 = make([]float64, v2) for i := 0; i < v2; i++ { @@ -1192,7 +1208,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.A = NewPopulatedA(r, easy) } if !easy && r.Intn(10) != 0 { @@ -1203,7 +1219,7 @@ func NewPopulatedA(r randyUnrecognizedgroup, easy bool) *A { this := &A{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := int64(r.Int63()) if r.Intn(2) == 0 { v3 *= -1 @@ -1218,17 +1234,17 @@ func NewPopulatedOldWithGroup(r randyUnrecognizedgroup, easy bool) *OldWithGroup { this := &OldWithGroup{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := int64(r.Int63()) if r.Intn(2) == 0 { v4 *= -1 } this.Field1 = &v4 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Group1 = NewPopulatedOldWithGroup_Group1(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(10) this.Field3 = make([]float64, v5) for i := 0; i < v5; i++ { @@ -1238,7 +1254,7 @@ } } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Group2 = NewPopulatedOldWithGroup_Group2(r, easy) } if !easy && r.Intn(10) != 0 { @@ -1249,21 +1265,21 @@ func NewPopulatedOldWithGroup_Group1(r randyUnrecognizedgroup, easy bool) *OldWithGroup_Group1 { this := &OldWithGroup_Group1{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := int64(r.Int63()) if r.Intn(2) == 0 { v6 *= -1 } this.Field1 = &v6 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := int32(r.Int31()) if r.Intn(2) == 0 { v7 *= -1 } this.Field2 = &v7 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v8 := r.Intn(10) this.Field3 = make([]float64, v8) for i := 0; i < v8; i++ { @@ -1281,14 +1297,14 @@ func NewPopulatedOldWithGroup_Group2(r randyUnrecognizedgroup, easy bool) *OldWithGroup_Group2 { this := &OldWithGroup_Group2{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := int64(r.Int63()) if r.Intn(2) == 0 { v9 *= -1 } this.Field1 = &v9 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v10 := r.Intn(10) this.Field2 = make([]float64, v10) for i := 0; i < v10; i++ { @@ -1731,6 +1747,7 @@ func skipUnrecognizedgroup(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1762,10 +1779,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1786,55 +1801,30 @@ return 0, ErrInvalidLengthUnrecognizedgroup } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthUnrecognizedgroup - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowUnrecognizedgroup - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipUnrecognizedgroup(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthUnrecognizedgroup - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupUnrecognizedgroup + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthUnrecognizedgroup + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthUnrecognizedgroup = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowUnrecognizedgroup = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthUnrecognizedgroup = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowUnrecognizedgroup = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupUnrecognizedgroup = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/xxxfields/xxxfields.pb.go golang-gogoprotobuf-1.3.1/test/xxxfields/xxxfields.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/test/xxxfields/xxxfields.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/test/xxxfields/xxxfields.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type NativeWithSizeCache struct { Field1 *float64 `protobuf:"fixed64,1,opt,name=Field1" json:"Field1,omitempty"` @@ -735,28 +735,28 @@ } func NewPopulatedNativeWithSizeCache(r randyXxxfields, easy bool) *NativeWithSizeCache { this := &NativeWithSizeCache{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := float64(r.Float64()) if r.Intn(2) == 0 { v1 *= -1 } this.Field1 = &v1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := float32(r.Float32()) if r.Intn(2) == 0 { v2 *= -1 } this.Field2 = &v2 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := int32(r.Int31()) if r.Intn(2) == 0 { v3 *= -1 } this.Field3 = &v3 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := int64(r.Int63()) if r.Intn(2) == 0 { v4 *= -1 @@ -764,15 +764,15 @@ this.Field4 = &v4 } this.Field11 = uint64(uint64(r.Uint32())) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v5 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := string(randStringXxxfields(r)) this.Field14 = &v6 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(100) this.Field15 = make([]byte, v7) for i := 0; i < v7; i++ { @@ -796,7 +796,7 @@ } v8 := NewPopulatedNativeWithSizeCache(r, easy) this.Field3 = *v8 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v9 := uint64(uint64(r.Uint32())) this.Field6 = &v9 } @@ -806,14 +806,14 @@ } v10 := NewPopulatedNativeWithoutSizeCache(r, easy) this.Field8 = *v10 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v11 := r.Intn(10) this.Field13 = make([]bool, v11) for i := 0; i < v11; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v12 := string(randStringXxxfields(r)) this.Field14 = &v12 } @@ -829,28 +829,28 @@ func NewPopulatedNativeWithoutSizeCache(r randyXxxfields, easy bool) *NativeWithoutSizeCache { this := &NativeWithoutSizeCache{} - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v14 := float64(r.Float64()) if r.Intn(2) == 0 { v14 *= -1 } this.Field1 = &v14 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v15 := float32(r.Float32()) if r.Intn(2) == 0 { v15 *= -1 } this.Field2 = &v15 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v16 := int32(r.Int31()) if r.Intn(2) == 0 { v16 *= -1 } this.Field3 = &v16 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v17 := int64(r.Int63()) if r.Intn(2) == 0 { v17 *= -1 @@ -858,15 +858,15 @@ this.Field4 = &v17 } this.Field11 = uint64(uint64(r.Uint32())) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v18 := bool(bool(r.Intn(2) == 0)) this.Field13 = &v18 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v19 := string(randStringXxxfields(r)) this.Field14 = &v19 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v20 := r.Intn(100) this.Field15 = make([]byte, v20) for i := 0; i < v20; i++ { @@ -890,7 +890,7 @@ } v21 := NewPopulatedNativeWithSizeCache(r, easy) this.Field3 = *v21 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v22 := uint64(uint64(r.Uint32())) this.Field6 = &v22 } @@ -900,14 +900,14 @@ } v23 := NewPopulatedNativeWithoutSizeCache(r, easy) this.Field8 = *v23 - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v24 := r.Intn(10) this.Field13 = make([]bool, v24) for i := 0; i < v24; i++ { this.Field13[i] = bool(bool(r.Intn(2) == 0)) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v25 := string(randStringXxxfields(r)) this.Field14 = &v25 } diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/.travis.yml golang-gogoprotobuf-1.3.1/.travis.yml --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/.travis.yml 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/.travis.yml 2020-05-17 12:22:58.000000000 +0000 @@ -4,16 +4,16 @@ env: - PROTOBUF_VERSION=2.6.1 - PROTOBUF_VERSION=3.0.2 - - PROTOBUF_VERSION=3.7.1 + - PROTOBUF_VERSION=3.9.1 before_install: - - ./install-protobuf.sh + - HOME=/home/travis ./install-protobuf.sh - PATH=/home/travis/bin:$PATH protoc --version script: - PATH=/home/travis/bin:$PATH make buildserverall - echo $TRAVIS_GO_VERSION - - if [[ "$PROTOBUF_VERSION" == "3.7.1" ]] && [[ "$TRAVIS_GO_VERSION" == "1.12.x" ]]; then ! git status --porcelain | read || (git status; git diff; exit 1); fi + - if [[ "$PROTOBUF_VERSION" == "3.9.1" ]] && [[ "$TRAVIS_GO_VERSION" == "1.12.x" ]]; then ! git status --porcelain | read || (git status; git diff; exit 1); fi language: go diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/any.pb.go golang-gogoprotobuf-1.3.1/types/any.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/any.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/types/any.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // `Any` contains an arbitrary serialized protocol buffer message along with a // URL that describes the type of the serialized message. @@ -156,7 +156,7 @@ return xxx_messageInfo_Any.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -310,7 +310,7 @@ func (m *Any) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -318,36 +318,46 @@ } func (m *Any) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Any) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.TypeUrl) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintAny(dAtA, i, uint64(len(m.TypeUrl))) - i += copy(dAtA[i:], m.TypeUrl) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Value) > 0 { - dAtA[i] = 0x12 - i++ + i -= len(m.Value) + copy(dAtA[i:], m.Value) i = encodeVarintAny(dAtA, i, uint64(len(m.Value))) - i += copy(dAtA[i:], m.Value) + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.TypeUrl) > 0 { + i -= len(m.TypeUrl) + copy(dAtA[i:], m.TypeUrl) + i = encodeVarintAny(dAtA, i, uint64(len(m.TypeUrl))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintAny(dAtA []byte, offset int, v uint64) int { + offset -= sovAny(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedAny(r randyAny, easy bool) *Any { this := &Any{} @@ -604,6 +614,7 @@ func skipAny(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -635,10 +646,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -659,55 +668,30 @@ return 0, ErrInvalidLengthAny } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthAny - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowAny - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipAny(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthAny - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupAny + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthAny + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthAny = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowAny = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthAny = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowAny = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupAny = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/api.pb.go golang-gogoprotobuf-1.3.1/types/api.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/api.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/types/api.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Api is a light-weight descriptor for an API Interface. // @@ -89,7 +89,7 @@ return xxx_messageInfo_Api.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -195,7 +195,7 @@ return xxx_messageInfo_Method.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -369,7 +369,7 @@ return xxx_messageInfo_Mixin.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -863,7 +863,7 @@ func (m *Api) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -871,83 +871,99 @@ } func (m *Api) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Api) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintApi(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Methods) > 0 { - for _, msg := range m.Methods { - dAtA[i] = 0x12 - i++ - i = encodeVarintApi(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if m.Syntax != 0 { + i = encodeVarintApi(dAtA, i, uint64(m.Syntax)) + i-- + dAtA[i] = 0x38 + } + if len(m.Mixins) > 0 { + for iNdEx := len(m.Mixins) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Mixins[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x32 } } - if len(m.Options) > 0 { - for _, msg := range m.Options { - dAtA[i] = 0x1a - i++ - i = encodeVarintApi(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) + if m.SourceContext != nil { + { + size, err := m.SourceContext.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } - i += n + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x2a } if len(m.Version) > 0 { - dAtA[i] = 0x22 - i++ + i -= len(m.Version) + copy(dAtA[i:], m.Version) i = encodeVarintApi(dAtA, i, uint64(len(m.Version))) - i += copy(dAtA[i:], m.Version) + i-- + dAtA[i] = 0x22 } - if m.SourceContext != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintApi(dAtA, i, uint64(m.SourceContext.Size())) - n1, err1 := m.SourceContext.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + if len(m.Options) > 0 { + for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a } - i += n1 } - if len(m.Mixins) > 0 { - for _, msg := range m.Mixins { - dAtA[i] = 0x32 - i++ - i = encodeVarintApi(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + if len(m.Methods) > 0 { + for iNdEx := len(m.Methods) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Methods[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x12 } } - if m.Syntax != 0 { - dAtA[i] = 0x38 - i++ - i = encodeVarintApi(dAtA, i, uint64(m.Syntax)) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintApi(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *Method) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -955,75 +971,86 @@ } func (m *Method) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Method) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintApi(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.RequestTypeUrl) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintApi(dAtA, i, uint64(len(m.RequestTypeUrl))) - i += copy(dAtA[i:], m.RequestTypeUrl) + if m.Syntax != 0 { + i = encodeVarintApi(dAtA, i, uint64(m.Syntax)) + i-- + dAtA[i] = 0x38 } - if m.RequestStreaming { - dAtA[i] = 0x18 - i++ - if m.RequestStreaming { + if len(m.Options) > 0 { + for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintApi(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } + } + if m.ResponseStreaming { + i-- + if m.ResponseStreaming { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x28 } if len(m.ResponseTypeUrl) > 0 { - dAtA[i] = 0x22 - i++ + i -= len(m.ResponseTypeUrl) + copy(dAtA[i:], m.ResponseTypeUrl) i = encodeVarintApi(dAtA, i, uint64(len(m.ResponseTypeUrl))) - i += copy(dAtA[i:], m.ResponseTypeUrl) + i-- + dAtA[i] = 0x22 } - if m.ResponseStreaming { - dAtA[i] = 0x28 - i++ - if m.ResponseStreaming { + if m.RequestStreaming { + i-- + if m.RequestStreaming { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - } - if len(m.Options) > 0 { - for _, msg := range m.Options { - dAtA[i] = 0x32 - i++ - i = encodeVarintApi(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + i-- + dAtA[i] = 0x18 } - if m.Syntax != 0 { - dAtA[i] = 0x38 - i++ - i = encodeVarintApi(dAtA, i, uint64(m.Syntax)) + if len(m.RequestTypeUrl) > 0 { + i -= len(m.RequestTypeUrl) + copy(dAtA[i:], m.RequestTypeUrl) + i = encodeVarintApi(dAtA, i, uint64(len(m.RequestTypeUrl))) + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintApi(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *Mixin) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1031,48 +1058,58 @@ } func (m *Mixin) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Mixin) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintApi(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Root) > 0 { - dAtA[i] = 0x12 - i++ + i -= len(m.Root) + copy(dAtA[i:], m.Root) i = encodeVarintApi(dAtA, i, uint64(len(m.Root))) - i += copy(dAtA[i:], m.Root) + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintApi(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintApi(dAtA []byte, offset int, v uint64) int { + offset -= sovApi(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedApi(r randyApi, easy bool) *Api { this := &Api{} this.Name = string(randStringApi(r)) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(5) this.Methods = make([]*Method, v1) for i := 0; i < v1; i++ { this.Methods[i] = NewPopulatedMethod(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v2 := r.Intn(5) this.Options = make([]*Option, v2) for i := 0; i < v2; i++ { @@ -1080,10 +1117,10 @@ } } this.Version = string(randStringApi(r)) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.SourceContext = NewPopulatedSourceContext(r, easy) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(5) this.Mixins = make([]*Mixin, v3) for i := 0; i < v3; i++ { @@ -1104,7 +1141,7 @@ this.RequestStreaming = bool(bool(r.Intn(2) == 0)) this.ResponseTypeUrl = string(randStringApi(r)) this.ResponseStreaming = bool(bool(r.Intn(2) == 0)) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(5) this.Options = make([]*Option, v4) for i := 0; i < v4; i++ { @@ -2023,6 +2060,7 @@ func skipApi(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -2054,10 +2092,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -2078,55 +2114,30 @@ return 0, ErrInvalidLengthApi } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthApi - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowApi - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipApi(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthApi - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupApi + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthApi + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowApi = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthApi = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowApi = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupApi = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/duration.pb.go golang-gogoprotobuf-1.3.1/types/duration.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/duration.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/types/duration.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // A Duration represents a signed, fixed-length span of time represented // as a count of seconds and fractions of seconds at nanosecond @@ -116,7 +116,7 @@ return xxx_messageInfo_Duration.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -273,7 +273,7 @@ func (m *Duration) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -281,34 +281,42 @@ } func (m *Duration) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Duration) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Seconds != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintDuration(dAtA, i, uint64(m.Seconds)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Nanos != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintDuration(dAtA, i, uint64(m.Nanos)) + i-- + dAtA[i] = 0x10 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Seconds != 0 { + i = encodeVarintDuration(dAtA, i, uint64(m.Seconds)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintDuration(dAtA []byte, offset int, v uint64) int { + offset -= sovDuration(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *Duration) Size() (n int) { if m == nil { @@ -429,6 +437,7 @@ func skipDuration(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -460,10 +469,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -484,55 +491,30 @@ return 0, ErrInvalidLengthDuration } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthDuration - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowDuration - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipDuration(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthDuration - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupDuration + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthDuration + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthDuration = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowDuration = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthDuration = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowDuration = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupDuration = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/empty.pb.go golang-gogoprotobuf-1.3.1/types/empty.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/empty.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/types/empty.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // A generic empty message that you can re-use to avoid defining duplicated // empty messages in your APIs. A typical example is to use it as the request @@ -54,7 +54,7 @@ return xxx_messageInfo_Empty.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -174,7 +174,7 @@ func (m *Empty) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -182,24 +182,32 @@ } func (m *Empty) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Empty) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - return i, nil + return len(dAtA) - i, nil } func encodeVarintEmpty(dAtA []byte, offset int, v uint64) int { + offset -= sovEmpty(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedEmpty(r randyEmpty, easy bool) *Empty { this := &Empty{} @@ -374,6 +382,7 @@ func skipEmpty(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -405,10 +414,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -429,55 +436,30 @@ return 0, ErrInvalidLengthEmpty } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthEmpty - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowEmpty - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipEmpty(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthEmpty - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupEmpty + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthEmpty + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthEmpty = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowEmpty = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthEmpty = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowEmpty = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupEmpty = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/field_mask.pb.go golang-gogoprotobuf-1.3.1/types/field_mask.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/field_mask.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/types/field_mask.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // `FieldMask` represents a set of symbolic field paths, for example: // @@ -245,7 +245,7 @@ return xxx_messageInfo_FieldMask.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -397,7 +397,7 @@ func (m *FieldMask) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -405,39 +405,41 @@ } func (m *FieldMask) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FieldMask) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Paths) > 0 { - for _, s := range m.Paths { + for iNdEx := len(m.Paths) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Paths[iNdEx]) + copy(dAtA[i:], m.Paths[iNdEx]) + i = encodeVarintFieldMask(dAtA, i, uint64(len(m.Paths[iNdEx]))) + i-- dAtA[i] = 0xa - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintFieldMask(dAtA []byte, offset int, v uint64) int { + offset -= sovFieldMask(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedFieldMask(r randyFieldMask, easy bool) *FieldMask { this := &FieldMask{} @@ -656,6 +658,7 @@ func skipFieldMask(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -687,10 +690,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -711,55 +712,30 @@ return 0, ErrInvalidLengthFieldMask } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthFieldMask - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowFieldMask - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipFieldMask(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthFieldMask - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupFieldMask + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthFieldMask + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthFieldMask = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowFieldMask = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthFieldMask = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowFieldMask = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupFieldMask = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/source_context.pb.go golang-gogoprotobuf-1.3.1/types/source_context.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/source_context.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/types/source_context.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // `SourceContext` represents information about the source of a // protobuf element, like the file in which it is defined. @@ -49,7 +49,7 @@ return xxx_messageInfo_SourceContext.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -191,7 +191,7 @@ func (m *SourceContext) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -199,30 +199,39 @@ } func (m *SourceContext) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SourceContext) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.FileName) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.FileName) + copy(dAtA[i:], m.FileName) i = encodeVarintSourceContext(dAtA, i, uint64(len(m.FileName))) - i += copy(dAtA[i:], m.FileName) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintSourceContext(dAtA []byte, offset int, v uint64) int { + offset -= sovSourceContext(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedSourceContext(r randySourceContext, easy bool) *SourceContext { this := &SourceContext{} @@ -435,6 +444,7 @@ func skipSourceContext(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -466,10 +476,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -490,55 +498,30 @@ return 0, ErrInvalidLengthSourceContext } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthSourceContext - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowSourceContext - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipSourceContext(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthSourceContext - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupSourceContext + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthSourceContext + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthSourceContext = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowSourceContext = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthSourceContext = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowSourceContext = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupSourceContext = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/struct.pb.go golang-gogoprotobuf-1.3.1/types/struct.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/struct.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/types/struct.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -26,7 +26,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // `NullValue` is a singleton enumeration to represent the null value for the // `Value` type union. @@ -83,7 +83,7 @@ return xxx_messageInfo_Struct.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -149,7 +149,7 @@ return xxx_messageInfo_Value.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -173,25 +173,26 @@ Equal(interface{}) bool MarshalTo([]byte) (int, error) Size() int + Compare(interface{}) int } type Value_NullValue struct { - NullValue NullValue `protobuf:"varint,1,opt,name=null_value,json=nullValue,proto3,enum=google.protobuf.NullValue,oneof"` + NullValue NullValue `protobuf:"varint,1,opt,name=null_value,json=nullValue,proto3,enum=google.protobuf.NullValue,oneof" json:"null_value,omitempty"` } type Value_NumberValue struct { - NumberValue float64 `protobuf:"fixed64,2,opt,name=number_value,json=numberValue,proto3,oneof"` + NumberValue float64 `protobuf:"fixed64,2,opt,name=number_value,json=numberValue,proto3,oneof" json:"number_value,omitempty"` } type Value_StringValue struct { - StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue,proto3,oneof"` + StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue,proto3,oneof" json:"string_value,omitempty"` } type Value_BoolValue struct { - BoolValue bool `protobuf:"varint,4,opt,name=bool_value,json=boolValue,proto3,oneof"` + BoolValue bool `protobuf:"varint,4,opt,name=bool_value,json=boolValue,proto3,oneof" json:"bool_value,omitempty"` } type Value_StructValue struct { - StructValue *Struct `protobuf:"bytes,5,opt,name=struct_value,json=structValue,proto3,oneof"` + StructValue *Struct `protobuf:"bytes,5,opt,name=struct_value,json=structValue,proto3,oneof" json:"struct_value,omitempty"` } type Value_ListValue struct { - ListValue *ListValue `protobuf:"bytes,6,opt,name=list_value,json=listValue,proto3,oneof"` + ListValue *ListValue `protobuf:"bytes,6,opt,name=list_value,json=listValue,proto3,oneof" json:"list_value,omitempty"` } func (*Value_NullValue) isValue_Kind() {} @@ -250,9 +251,9 @@ return nil } -// XXX_OneofFuncs is for the internal use of the proto package. -func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) { - return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{ +// XXX_OneofWrappers is for the internal use of the proto package. +func (*Value) XXX_OneofWrappers() []interface{} { + return []interface{}{ (*Value_NullValue)(nil), (*Value_NumberValue)(nil), (*Value_StringValue)(nil), @@ -262,129 +263,6 @@ } } -func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error { - m := msg.(*Value) - // kind - switch x := m.Kind.(type) { - case *Value_NullValue: - _ = b.EncodeVarint(1<<3 | proto.WireVarint) - _ = b.EncodeVarint(uint64(x.NullValue)) - case *Value_NumberValue: - _ = b.EncodeVarint(2<<3 | proto.WireFixed64) - _ = b.EncodeFixed64(math.Float64bits(x.NumberValue)) - case *Value_StringValue: - _ = b.EncodeVarint(3<<3 | proto.WireBytes) - _ = b.EncodeStringBytes(x.StringValue) - case *Value_BoolValue: - t := uint64(0) - if x.BoolValue { - t = 1 - } - _ = b.EncodeVarint(4<<3 | proto.WireVarint) - _ = b.EncodeVarint(t) - case *Value_StructValue: - _ = b.EncodeVarint(5<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.StructValue); err != nil { - return err - } - case *Value_ListValue: - _ = b.EncodeVarint(6<<3 | proto.WireBytes) - if err := b.EncodeMessage(x.ListValue); err != nil { - return err - } - case nil: - default: - return fmt.Errorf("Value.Kind has unexpected type %T", x) - } - return nil -} - -func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) { - m := msg.(*Value) - switch tag { - case 1: // kind.null_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Kind = &Value_NullValue{NullValue(x)} - return true, err - case 2: // kind.number_value - if wire != proto.WireFixed64 { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeFixed64() - m.Kind = &Value_NumberValue{math.Float64frombits(x)} - return true, err - case 3: // kind.string_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeStringBytes() - m.Kind = &Value_StringValue{x} - return true, err - case 4: // kind.bool_value - if wire != proto.WireVarint { - return true, proto.ErrInternalBadWireType - } - x, err := b.DecodeVarint() - m.Kind = &Value_BoolValue{x != 0} - return true, err - case 5: // kind.struct_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(Struct) - err := b.DecodeMessage(msg) - m.Kind = &Value_StructValue{msg} - return true, err - case 6: // kind.list_value - if wire != proto.WireBytes { - return true, proto.ErrInternalBadWireType - } - msg := new(ListValue) - err := b.DecodeMessage(msg) - m.Kind = &Value_ListValue{msg} - return true, err - default: - return false, nil - } -} - -func _Value_OneofSizer(msg proto.Message) (n int) { - m := msg.(*Value) - // kind - switch x := m.Kind.(type) { - case *Value_NullValue: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(x.NullValue)) - case *Value_NumberValue: - n += 1 // tag and wire - n += 8 - case *Value_StringValue: - n += 1 // tag and wire - n += proto.SizeVarint(uint64(len(x.StringValue))) - n += len(x.StringValue) - case *Value_BoolValue: - n += 1 // tag and wire - n += 1 - case *Value_StructValue: - s := proto.Size(x.StructValue) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case *Value_ListValue: - s := proto.Size(x.ListValue) - n += 1 // tag and wire - n += proto.SizeVarint(uint64(s)) - n += s - case nil: - default: - panic(fmt.Sprintf("proto: unexpected type %T in oneof", x)) - } - return n -} - func (*Value) XXX_MessageName() string { return "google.protobuf.Value" } @@ -414,7 +292,7 @@ return xxx_messageInfo_ListValue.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -454,37 +332,392 @@ func init() { proto.RegisterFile("google/protobuf/struct.proto", fileDescriptor_df322afd6c9fb402) } var fileDescriptor_df322afd6c9fb402 = []byte{ - // 439 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x6b, 0xd4, 0x40, - 0x14, 0xc6, 0xf3, 0xb2, 0xdd, 0xe0, 0xbe, 0x48, 0x2d, 0x23, 0xe8, 0x52, 0x65, 0x5c, 0xb6, 0x97, - 0x45, 0x24, 0x85, 0xf5, 0x22, 0xae, 0x17, 0x17, 0x6a, 0x0b, 0x86, 0x12, 0xa3, 0xad, 0xe0, 0x65, - 0x31, 0x69, 0xba, 0x84, 0x4e, 0x67, 0x4a, 0x32, 0xa3, 0xec, 0x4d, 0xff, 0x0b, 0xcf, 0x9e, 0xc4, - 0xa3, 0x7f, 0x85, 0x47, 0x8f, 0x1e, 0xdd, 0x78, 0xf1, 0xd8, 0x63, 0x8f, 0x32, 0x33, 0x49, 0x94, - 0x2e, 0xbd, 0xe5, 0x7d, 0xf3, 0x7b, 0xdf, 0x7b, 0xdf, 0x0b, 0xde, 0x9d, 0x0b, 0x31, 0x67, 0xd9, - 0xf6, 0x59, 0x21, 0xa4, 0x48, 0xd4, 0xf1, 0x76, 0x29, 0x0b, 0x95, 0xca, 0xc0, 0xd4, 0xe4, 0x86, - 0x7d, 0x0d, 0x9a, 0xd7, 0xe1, 0x27, 0x40, 0xef, 0xa5, 0x21, 0xc8, 0x04, 0xbd, 0xe3, 0x3c, 0x63, - 0x47, 0x65, 0x1f, 0x06, 0x9d, 0x91, 0x3f, 0xde, 0x0a, 0x2e, 0xc1, 0x81, 0x05, 0x83, 0x67, 0x86, - 0xda, 0xe1, 0xb2, 0x58, 0xc4, 0x75, 0xcb, 0xe6, 0x0b, 0xf4, 0xff, 0x93, 0xc9, 0x06, 0x76, 0x4e, - 0xb2, 0x45, 0x1f, 0x06, 0x30, 0xea, 0xc5, 0xfa, 0x93, 0x3c, 0xc0, 0xee, 0xbb, 0xb7, 0x4c, 0x65, - 0x7d, 0x77, 0x00, 0x23, 0x7f, 0x7c, 0x6b, 0xc5, 0xfc, 0x50, 0xbf, 0xc6, 0x16, 0x7a, 0xec, 0x3e, - 0x82, 0xe1, 0x37, 0x17, 0xbb, 0x46, 0x24, 0x13, 0x44, 0xae, 0x18, 0x9b, 0x59, 0x03, 0x6d, 0xba, - 0x3e, 0xde, 0x5c, 0x31, 0xd8, 0x57, 0x8c, 0x19, 0x7e, 0xcf, 0x89, 0x7b, 0xbc, 0x29, 0xc8, 0x16, - 0x5e, 0xe7, 0xea, 0x34, 0xc9, 0x8a, 0xd9, 0xbf, 0xf9, 0xb0, 0xe7, 0xc4, 0xbe, 0x55, 0x5b, 0xa8, - 0x94, 0x45, 0xce, 0xe7, 0x35, 0xd4, 0xd1, 0x8b, 0x6b, 0xc8, 0xaa, 0x16, 0xba, 0x87, 0x98, 0x08, - 0xd1, 0xac, 0xb1, 0x36, 0x80, 0xd1, 0x35, 0x3d, 0x4a, 0x6b, 0x16, 0x78, 0x62, 0x5c, 0x54, 0x2a, - 0x6b, 0xa4, 0x6b, 0xa2, 0xde, 0xbe, 0xe2, 0x8e, 0xb5, 0xbd, 0x4a, 0x65, 0x9b, 0x92, 0xe5, 0x65, - 0xd3, 0xeb, 0x99, 0xde, 0xd5, 0x94, 0x61, 0x5e, 0xca, 0x36, 0x25, 0x6b, 0x8a, 0xa9, 0x87, 0x6b, - 0x27, 0x39, 0x3f, 0x1a, 0x4e, 0xb0, 0xd7, 0x12, 0x24, 0x40, 0xcf, 0x98, 0x35, 0x7f, 0xf4, 0xaa, - 0xa3, 0xd7, 0xd4, 0xfd, 0x3b, 0xd8, 0x6b, 0x8f, 0x48, 0xd6, 0x11, 0xf7, 0x0f, 0xc2, 0x70, 0x76, - 0xf8, 0x34, 0x3c, 0xd8, 0xd9, 0x70, 0xa6, 0x1f, 0xe1, 0xe7, 0x92, 0x3a, 0xe7, 0x4b, 0x0a, 0x17, - 0x4b, 0x0a, 0x1f, 0x2a, 0x0a, 0x5f, 0x2a, 0x0a, 0xdf, 0x2b, 0x0a, 0x3f, 0x2a, 0x0a, 0xbf, 0x2a, - 0x0a, 0x7f, 0x2a, 0xea, 0x9c, 0x6b, 0xed, 0x37, 0x05, 0xbc, 0x99, 0x8a, 0xd3, 0xcb, 0xe3, 0xa6, - 0xbe, 0x4d, 0x1e, 0xe9, 0x3a, 0x82, 0x37, 0x5d, 0xb9, 0x38, 0xcb, 0xca, 0x0b, 0x80, 0xcf, 0x6e, - 0x67, 0x37, 0x9a, 0x7e, 0x75, 0xe9, 0xae, 0x6d, 0x88, 0x9a, 0xfd, 0x5e, 0x67, 0x8c, 0x3d, 0xe7, - 0xe2, 0x3d, 0x7f, 0xa5, 0xc9, 0xc4, 0x33, 0x4e, 0x0f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xad, - 0x84, 0x08, 0xae, 0xe5, 0x02, 0x00, 0x00, + // 443 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xb1, 0x6f, 0xd3, 0x40, + 0x14, 0xc6, 0xfd, 0x9c, 0xc6, 0x22, 0xcf, 0xa8, 0x54, 0x87, 0x04, 0x51, 0x41, 0x47, 0x94, 0x2e, + 0x11, 0x42, 0xae, 0x14, 0x16, 0x44, 0x58, 0x88, 0x54, 0x5a, 0x89, 0xa8, 0x32, 0x86, 0x16, 0x89, + 0x25, 0xc2, 0xae, 0x1b, 0x59, 0xbd, 0xde, 0x55, 0xf6, 0x1d, 0x28, 0x1b, 0x0b, 0xff, 0x03, 0x33, + 0x13, 0x62, 0xe4, 0xaf, 0xe8, 0xc8, 0xc8, 0x48, 0xdc, 0x85, 0xb1, 0x63, 0x47, 0x74, 0x77, 0xb6, + 0x41, 0x8d, 0xb2, 0xf9, 0x7d, 0xf7, 0x7b, 0xdf, 0x7b, 0xdf, 0x33, 0xde, 0x9f, 0x09, 0x31, 0x63, + 0xe9, 0xf6, 0x59, 0x2e, 0xa4, 0x88, 0xd5, 0xf1, 0x76, 0x21, 0x73, 0x95, 0xc8, 0xc0, 0xd4, 0xe4, + 0x96, 0x7d, 0x0d, 0xea, 0xd7, 0xfe, 0x17, 0x40, 0xef, 0xb5, 0x21, 0xc8, 0x08, 0xbd, 0xe3, 0x2c, + 0x65, 0x47, 0x45, 0x17, 0x7a, 0xad, 0x81, 0x3f, 0xdc, 0x0a, 0xae, 0xc1, 0x81, 0x05, 0x83, 0x17, + 0x86, 0xda, 0xe1, 0x32, 0x9f, 0x47, 0x55, 0xcb, 0xe6, 0x2b, 0xf4, 0xff, 0x93, 0xc9, 0x06, 0xb6, + 0x4e, 0xd2, 0x79, 0x17, 0x7a, 0x30, 0xe8, 0x44, 0xfa, 0x93, 0x3c, 0xc2, 0xf6, 0x87, 0xf7, 0x4c, + 0xa5, 0x5d, 0xb7, 0x07, 0x03, 0x7f, 0x78, 0x67, 0xc9, 0xfc, 0x50, 0xbf, 0x46, 0x16, 0x7a, 0xea, + 0x3e, 0x81, 0xfe, 0x0f, 0x17, 0xdb, 0x46, 0x24, 0x23, 0x44, 0xae, 0x18, 0x9b, 0x5a, 0x03, 0x6d, + 0xba, 0x3e, 0xdc, 0x5c, 0x32, 0xd8, 0x57, 0x8c, 0x19, 0x7e, 0xcf, 0x89, 0x3a, 0xbc, 0x2e, 0xc8, + 0x16, 0xde, 0xe4, 0xea, 0x34, 0x4e, 0xf3, 0xe9, 0xbf, 0xf9, 0xb0, 0xe7, 0x44, 0xbe, 0x55, 0x1b, + 0xa8, 0x90, 0x79, 0xc6, 0x67, 0x15, 0xd4, 0xd2, 0x8b, 0x6b, 0xc8, 0xaa, 0x16, 0x7a, 0x80, 0x18, + 0x0b, 0x51, 0xaf, 0xb1, 0xd6, 0x83, 0xc1, 0x0d, 0x3d, 0x4a, 0x6b, 0x16, 0x78, 0x66, 0x5c, 0x54, + 0x22, 0x2b, 0xa4, 0x6d, 0xa2, 0xde, 0x5d, 0x71, 0xc7, 0xca, 0x5e, 0x25, 0xb2, 0x49, 0xc9, 0xb2, + 0xa2, 0xee, 0xf5, 0x4c, 0xef, 0x72, 0xca, 0x49, 0x56, 0xc8, 0x26, 0x25, 0xab, 0x8b, 0xb1, 0x87, + 0x6b, 0x27, 0x19, 0x3f, 0xea, 0x8f, 0xb0, 0xd3, 0x10, 0x24, 0x40, 0xcf, 0x98, 0xd5, 0x7f, 0x74, + 0xd5, 0xd1, 0x2b, 0xea, 0xe1, 0x3d, 0xec, 0x34, 0x47, 0x24, 0xeb, 0x88, 0xfb, 0x07, 0x93, 0xc9, + 0xf4, 0xf0, 0xf9, 0xe4, 0x60, 0x67, 0xc3, 0x19, 0x7f, 0x86, 0x5f, 0x0b, 0xea, 0x5c, 0x2e, 0x28, + 0x5c, 0x2d, 0x28, 0x7c, 0x2a, 0x29, 0x7c, 0x2b, 0x29, 0x9c, 0x97, 0x14, 0x7e, 0x96, 0x14, 0x7e, + 0x97, 0x14, 0xfe, 0x94, 0xd4, 0xb9, 0xd4, 0xfa, 0x05, 0x85, 0xf3, 0x0b, 0x0a, 0x78, 0x3b, 0x11, + 0xa7, 0xd7, 0x47, 0x8e, 0x7d, 0x9b, 0x3e, 0xd4, 0x75, 0x08, 0xef, 0xda, 0x72, 0x7e, 0x96, 0x16, + 0x57, 0x00, 0x5f, 0xdd, 0xd6, 0x6e, 0x38, 0xfe, 0xee, 0xd2, 0x5d, 0xdb, 0x10, 0xd6, 0x3b, 0xbe, + 0x4d, 0x19, 0x7b, 0xc9, 0xc5, 0x47, 0xfe, 0x46, 0x93, 0xb1, 0x67, 0x9c, 0x1e, 0xff, 0x0d, 0x00, + 0x00, 0xff, 0xff, 0x26, 0x30, 0xdb, 0xbe, 0xe9, 0x02, 0x00, 0x00, +} + +func (this *Struct) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Struct) + if !ok { + that2, ok := that.(Struct) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if len(this.Fields) != len(that1.Fields) { + if len(this.Fields) < len(that1.Fields) { + return -1 + } + return 1 + } + for i := range this.Fields { + if c := this.Fields[i].Compare(that1.Fields[i]); c != 0 { + return c + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *Value) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Value) + if !ok { + that2, ok := that.(Value) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if that1.Kind == nil { + if this.Kind != nil { + return 1 + } + } else if this.Kind == nil { + return -1 + } else { + thisType := -1 + switch this.Kind.(type) { + case *Value_NullValue: + thisType = 0 + case *Value_NumberValue: + thisType = 1 + case *Value_StringValue: + thisType = 2 + case *Value_BoolValue: + thisType = 3 + case *Value_StructValue: + thisType = 4 + case *Value_ListValue: + thisType = 5 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", this.Kind)) + } + that1Type := -1 + switch that1.Kind.(type) { + case *Value_NullValue: + that1Type = 0 + case *Value_NumberValue: + that1Type = 1 + case *Value_StringValue: + that1Type = 2 + case *Value_BoolValue: + that1Type = 3 + case *Value_StructValue: + that1Type = 4 + case *Value_ListValue: + that1Type = 5 + default: + panic(fmt.Sprintf("compare: unexpected type %T in oneof", that1.Kind)) + } + if thisType == that1Type { + if c := this.Kind.Compare(that1.Kind); c != 0 { + return c + } + } else if thisType < that1Type { + return -1 + } else if thisType > that1Type { + return 1 + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} +func (this *Value_NullValue) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Value_NullValue) + if !ok { + that2, ok := that.(Value_NullValue) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.NullValue != that1.NullValue { + if this.NullValue < that1.NullValue { + return -1 + } + return 1 + } + return 0 +} +func (this *Value_NumberValue) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Value_NumberValue) + if !ok { + that2, ok := that.(Value_NumberValue) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.NumberValue != that1.NumberValue { + if this.NumberValue < that1.NumberValue { + return -1 + } + return 1 + } + return 0 +} +func (this *Value_StringValue) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Value_StringValue) + if !ok { + that2, ok := that.(Value_StringValue) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.StringValue != that1.StringValue { + if this.StringValue < that1.StringValue { + return -1 + } + return 1 + } + return 0 +} +func (this *Value_BoolValue) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Value_BoolValue) + if !ok { + that2, ok := that.(Value_BoolValue) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if this.BoolValue != that1.BoolValue { + if !this.BoolValue { + return -1 + } + return 1 + } + return 0 +} +func (this *Value_StructValue) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*Value_StructValue) + if !ok { + that2, ok := that.(Value_StructValue) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.StructValue.Compare(that1.StructValue); c != 0 { + return c + } + return 0 } +func (this *Value_ListValue) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + that1, ok := that.(*Value_ListValue) + if !ok { + that2, ok := that.(Value_ListValue) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if c := this.ListValue.Compare(that1.ListValue); c != 0 { + return c + } + return 0 +} +func (this *ListValue) Compare(that interface{}) int { + if that == nil { + if this == nil { + return 0 + } + return 1 + } + + that1, ok := that.(*ListValue) + if !ok { + that2, ok := that.(ListValue) + if ok { + that1 = &that2 + } else { + return 1 + } + } + if that1 == nil { + if this == nil { + return 0 + } + return 1 + } else if this == nil { + return -1 + } + if len(this.Values) != len(that1.Values) { + if len(this.Values) < len(that1.Values) { + return -1 + } + return 1 + } + for i := range this.Values { + if c := this.Values[i].Compare(that1.Values[i]); c != 0 { + return c + } + } + if c := bytes.Compare(this.XXX_unrecognized, that1.XXX_unrecognized); c != 0 { + return c + } + return 0 +} func (x NullValue) String() string { s, ok := NullValue_name[int32(x)] if ok { @@ -847,7 +1080,7 @@ func (m *Struct) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -855,48 +1088,52 @@ } func (m *Struct) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Struct) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Fields) > 0 { for k := range m.Fields { - dAtA[i] = 0xa - i++ v := m.Fields[k] - msgSize := 0 + baseI := i if v != nil { - msgSize = v.Size() - msgSize += 1 + sovStruct(uint64(msgSize)) - } - mapSize := 1 + len(k) + sovStruct(uint64(len(k))) + msgSize - i = encodeVarintStruct(dAtA, i, uint64(mapSize)) - dAtA[i] = 0xa - i++ - i = encodeVarintStruct(dAtA, i, uint64(len(k))) - i += copy(dAtA[i:], k) - if v != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintStruct(dAtA, i, uint64(v.Size())) - n1, err1 := v.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintStruct(dAtA, i, uint64(size)) } - i += n1 + i-- + dAtA[i] = 0x12 } + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintStruct(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintStruct(dAtA, i, uint64(baseI-i)) + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *Value) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -904,90 +1141,133 @@ } func (m *Value) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Kind != nil { - nn2, err2 := m.Kind.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + { + size := m.Kind.Size() + i -= size + if _, err := m.Kind.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } } - i += nn2 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *Value_NullValue) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x8 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Value_NullValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) i = encodeVarintStruct(dAtA, i, uint64(m.NullValue)) - return i, nil + i-- + dAtA[i] = 0x8 + return len(dAtA) - i, nil } func (m *Value_NumberValue) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x11 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Value_NumberValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.NumberValue)))) - i += 8 - return i, nil + i-- + dAtA[i] = 0x11 + return len(dAtA) - i, nil } func (m *Value_StringValue) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x1a - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Value_StringValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i -= len(m.StringValue) + copy(dAtA[i:], m.StringValue) i = encodeVarintStruct(dAtA, i, uint64(len(m.StringValue))) - i += copy(dAtA[i:], m.StringValue) - return i, nil + i-- + dAtA[i] = 0x1a + return len(dAtA) - i, nil } func (m *Value_BoolValue) MarshalTo(dAtA []byte) (int, error) { - i := 0 - dAtA[i] = 0x20 - i++ + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Value_BoolValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + i-- if m.BoolValue { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - return i, nil + i-- + dAtA[i] = 0x20 + return len(dAtA) - i, nil } func (m *Value_StructValue) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Value_StructValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.StructValue != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintStruct(dAtA, i, uint64(m.StructValue.Size())) - n3, err3 := m.StructValue.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + { + size, err := m.StructValue.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintStruct(dAtA, i, uint64(size)) } - i += n3 + i-- + dAtA[i] = 0x2a } - return i, nil + return len(dAtA) - i, nil } func (m *Value_ListValue) MarshalTo(dAtA []byte) (int, error) { - i := 0 + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Value_ListValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) if m.ListValue != nil { - dAtA[i] = 0x32 - i++ - i = encodeVarintStruct(dAtA, i, uint64(m.ListValue.Size())) - n4, err4 := m.ListValue.MarshalTo(dAtA[i:]) - if err4 != nil { - return 0, err4 + { + size, err := m.ListValue.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintStruct(dAtA, i, uint64(size)) } - i += n4 + i-- + dAtA[i] = 0x32 } - return i, nil + return len(dAtA) - i, nil } func (m *ListValue) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -995,40 +1275,50 @@ } func (m *ListValue) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ListValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Values) > 0 { - for _, msg := range m.Values { - dAtA[i] = 0xa - i++ - i = encodeVarintStruct(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Values) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Values[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintStruct(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0xa } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func encodeVarintStruct(dAtA []byte, offset int, v uint64) int { + offset -= sovStruct(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedStruct(r randyStruct, easy bool) *Struct { this := &Struct{} - if r.Intn(10) == 0 { + if r.Intn(5) == 0 { v1 := r.Intn(10) this.Fields = make(map[string]*Value) for i := 0; i < v1; i++ { @@ -1099,7 +1389,7 @@ } func NewPopulatedListValue(r randyStruct, easy bool) *ListValue { this := &ListValue{} - if r.Intn(10) == 0 { + if r.Intn(5) == 0 { v2 := r.Intn(5) this.Values = make([]*Value, v2) for i := 0; i < v2; i++ { @@ -1907,6 +2197,7 @@ func skipStruct(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -1938,10 +2229,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -1962,55 +2251,30 @@ return 0, ErrInvalidLengthStruct } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthStruct - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowStruct - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipStruct(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthStruct - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupStruct + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthStruct + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthStruct = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowStruct = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthStruct = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowStruct = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupStruct = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/timestamp.pb.go golang-gogoprotobuf-1.3.1/types/timestamp.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/timestamp.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/types/timestamp.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // A Timestamp represents a point in time independent of any time zone or local // calendar, encoded as a count of seconds and fractions of seconds at @@ -98,11 +98,13 @@ // 01:30 UTC on January 15, 2017. // // In JavaScript, one can convert a Date object to this format using the -// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) +// standard +// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) // method. In Python, a standard `datetime.datetime` object can be converted -// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) -// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one -// can use the Joda Time's [`ISODateTimeFormat.dateTime()`]( +// to this format using +// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with +// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use +// the Joda Time's [`ISODateTimeFormat.dateTime()`]( // http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D // ) to obtain a formatter capable of generating timestamps in this format. // @@ -136,7 +138,7 @@ return xxx_messageInfo_Timestamp.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -293,7 +295,7 @@ func (m *Timestamp) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -301,34 +303,42 @@ } func (m *Timestamp) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Timestamp) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Seconds != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintTimestamp(dAtA, i, uint64(m.Seconds)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Nanos != 0 { - dAtA[i] = 0x10 - i++ i = encodeVarintTimestamp(dAtA, i, uint64(m.Nanos)) + i-- + dAtA[i] = 0x10 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Seconds != 0 { + i = encodeVarintTimestamp(dAtA, i, uint64(m.Seconds)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func encodeVarintTimestamp(dAtA []byte, offset int, v uint64) int { + offset -= sovTimestamp(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *Timestamp) Size() (n int) { if m == nil { @@ -449,6 +459,7 @@ func skipTimestamp(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -480,10 +491,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -504,55 +513,30 @@ return 0, ErrInvalidLengthTimestamp } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthTimestamp - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowTimestamp - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipTimestamp(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthTimestamp - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupTimestamp + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthTimestamp + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthTimestamp = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowTimestamp = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthTimestamp = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTimestamp = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupTimestamp = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/type.pb.go golang-gogoprotobuf-1.3.1/types/type.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/type.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/types/type.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -24,7 +24,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // The syntax in which a protocol buffer element is defined. type Syntax int32 @@ -206,7 +206,7 @@ return xxx_messageInfo_Type.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -313,7 +313,7 @@ return xxx_messageInfo_Field.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -436,7 +436,7 @@ return xxx_messageInfo_Enum.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -520,7 +520,7 @@ return xxx_messageInfo_EnumValue.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -595,7 +595,7 @@ return xxx_messageInfo_Option.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1405,7 +1405,7 @@ func (m *Type) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1413,80 +1413,87 @@ } func (m *Type) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Type) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintType(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Fields) > 0 { - for _, msg := range m.Fields { - dAtA[i] = 0x12 - i++ - i = encodeVarintType(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) + if m.Syntax != 0 { + i = encodeVarintType(dAtA, i, uint64(m.Syntax)) + i-- + dAtA[i] = 0x30 + } + if m.SourceContext != nil { + { + size, err := m.SourceContext.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } - i += n - } - } - if len(m.Oneofs) > 0 { - for _, s := range m.Oneofs { - dAtA[i] = 0x1a - i++ - l = len(s) - for l >= 1<<7 { - dAtA[i] = uint8(uint64(l)&0x7f | 0x80) - l >>= 7 - i++ - } - dAtA[i] = uint8(l) - i++ - i += copy(dAtA[i:], s) + i -= size + i = encodeVarintType(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x2a } if len(m.Options) > 0 { - for _, msg := range m.Options { - dAtA[i] = 0x22 - i++ - i = encodeVarintType(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintType(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x22 } } - if m.SourceContext != nil { - dAtA[i] = 0x2a - i++ - i = encodeVarintType(dAtA, i, uint64(m.SourceContext.Size())) - n1, err1 := m.SourceContext.MarshalTo(dAtA[i:]) - if err1 != nil { - return 0, err1 + if len(m.Oneofs) > 0 { + for iNdEx := len(m.Oneofs) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Oneofs[iNdEx]) + copy(dAtA[i:], m.Oneofs[iNdEx]) + i = encodeVarintType(dAtA, i, uint64(len(m.Oneofs[iNdEx]))) + i-- + dAtA[i] = 0x1a } - i += n1 } - if m.Syntax != 0 { - dAtA[i] = 0x30 - i++ - i = encodeVarintType(dAtA, i, uint64(m.Syntax)) + if len(m.Fields) > 0 { + for iNdEx := len(m.Fields) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Fields[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintType(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintType(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *Field) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1494,86 +1501,98 @@ } func (m *Field) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Field) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Kind != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintType(dAtA, i, uint64(m.Kind)) - } - if m.Cardinality != 0 { - dAtA[i] = 0x10 - i++ - i = encodeVarintType(dAtA, i, uint64(m.Cardinality)) - } - if m.Number != 0 { - dAtA[i] = 0x18 - i++ - i = encodeVarintType(dAtA, i, uint64(m.Number)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Name) > 0 { - dAtA[i] = 0x22 - i++ - i = encodeVarintType(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) + if len(m.DefaultValue) > 0 { + i -= len(m.DefaultValue) + copy(dAtA[i:], m.DefaultValue) + i = encodeVarintType(dAtA, i, uint64(len(m.DefaultValue))) + i-- + dAtA[i] = 0x5a } - if len(m.TypeUrl) > 0 { - dAtA[i] = 0x32 - i++ - i = encodeVarintType(dAtA, i, uint64(len(m.TypeUrl))) - i += copy(dAtA[i:], m.TypeUrl) + if len(m.JsonName) > 0 { + i -= len(m.JsonName) + copy(dAtA[i:], m.JsonName) + i = encodeVarintType(dAtA, i, uint64(len(m.JsonName))) + i-- + dAtA[i] = 0x52 } - if m.OneofIndex != 0 { - dAtA[i] = 0x38 - i++ - i = encodeVarintType(dAtA, i, uint64(m.OneofIndex)) + if len(m.Options) > 0 { + for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintType(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x4a + } } if m.Packed { - dAtA[i] = 0x40 - i++ + i-- if m.Packed { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ + i-- + dAtA[i] = 0x40 } - if len(m.Options) > 0 { - for _, msg := range m.Options { - dAtA[i] = 0x4a - i++ - i = encodeVarintType(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } + if m.OneofIndex != 0 { + i = encodeVarintType(dAtA, i, uint64(m.OneofIndex)) + i-- + dAtA[i] = 0x38 } - if len(m.JsonName) > 0 { - dAtA[i] = 0x52 - i++ - i = encodeVarintType(dAtA, i, uint64(len(m.JsonName))) - i += copy(dAtA[i:], m.JsonName) + if len(m.TypeUrl) > 0 { + i -= len(m.TypeUrl) + copy(dAtA[i:], m.TypeUrl) + i = encodeVarintType(dAtA, i, uint64(len(m.TypeUrl))) + i-- + dAtA[i] = 0x32 } - if len(m.DefaultValue) > 0 { - dAtA[i] = 0x5a - i++ - i = encodeVarintType(dAtA, i, uint64(len(m.DefaultValue))) - i += copy(dAtA[i:], m.DefaultValue) + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintType(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0x22 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Number != 0 { + i = encodeVarintType(dAtA, i, uint64(m.Number)) + i-- + dAtA[i] = 0x18 + } + if m.Cardinality != 0 { + i = encodeVarintType(dAtA, i, uint64(m.Cardinality)) + i-- + dAtA[i] = 0x10 + } + if m.Kind != 0 { + i = encodeVarintType(dAtA, i, uint64(m.Kind)) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *Enum) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1581,65 +1600,78 @@ } func (m *Enum) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Enum) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintType(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.Enumvalue) > 0 { - for _, msg := range m.Enumvalue { - dAtA[i] = 0x12 - i++ - i = encodeVarintType(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) + if m.Syntax != 0 { + i = encodeVarintType(dAtA, i, uint64(m.Syntax)) + i-- + dAtA[i] = 0x28 + } + if m.SourceContext != nil { + { + size, err := m.SourceContext.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } - i += n + i -= size + i = encodeVarintType(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x22 } if len(m.Options) > 0 { - for _, msg := range m.Options { - dAtA[i] = 0x1a - i++ - i = encodeVarintType(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintType(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1a } } - if m.SourceContext != nil { - dAtA[i] = 0x22 - i++ - i = encodeVarintType(dAtA, i, uint64(m.SourceContext.Size())) - n2, err2 := m.SourceContext.MarshalTo(dAtA[i:]) - if err2 != nil { - return 0, err2 + if len(m.Enumvalue) > 0 { + for iNdEx := len(m.Enumvalue) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Enumvalue[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintType(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 } - i += n2 } - if m.Syntax != 0 { - dAtA[i] = 0x28 - i++ - i = encodeVarintType(dAtA, i, uint64(m.Syntax)) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintType(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *EnumValue) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1647,43 +1679,52 @@ } func (m *EnumValue) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EnumValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintType(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } - if m.Number != 0 { - dAtA[i] = 0x10 - i++ - i = encodeVarintType(dAtA, i, uint64(m.Number)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if len(m.Options) > 0 { - for _, msg := range m.Options { - dAtA[i] = 0x1a - i++ - i = encodeVarintType(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err + for iNdEx := len(m.Options) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Options[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintType(dAtA, i, uint64(size)) } - i += n + i-- + dAtA[i] = 0x1a } } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Number != 0 { + i = encodeVarintType(dAtA, i, uint64(m.Number)) + i-- + dAtA[i] = 0x10 } - return i, nil + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintType(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } func (m *Option) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1691,45 +1732,56 @@ } func (m *Option) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Option) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if len(m.Name) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintType(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Value != nil { - dAtA[i] = 0x12 - i++ - i = encodeVarintType(dAtA, i, uint64(m.Value.Size())) - n3, err3 := m.Value.MarshalTo(dAtA[i:]) - if err3 != nil { - return 0, err3 + { + size, err := m.Value.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintType(dAtA, i, uint64(size)) } - i += n3 + i-- + dAtA[i] = 0x12 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if len(m.Name) > 0 { + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintType(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintType(dAtA []byte, offset int, v uint64) int { + offset -= sovType(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedType(r randyType, easy bool) *Type { this := &Type{} this.Name = string(randStringType(r)) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v1 := r.Intn(5) this.Fields = make([]*Field, v1) for i := 0; i < v1; i++ { @@ -1741,14 +1793,14 @@ for i := 0; i < v2; i++ { this.Oneofs[i] = string(randStringType(r)) } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v3 := r.Intn(5) this.Options = make([]*Option, v3) for i := 0; i < v3; i++ { this.Options[i] = NewPopulatedOption(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.SourceContext = NewPopulatedSourceContext(r, easy) } this.Syntax = Syntax([]int32{0, 1}[r.Intn(2)]) @@ -1773,7 +1825,7 @@ this.OneofIndex *= -1 } this.Packed = bool(bool(r.Intn(2) == 0)) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v4 := r.Intn(5) this.Options = make([]*Option, v4) for i := 0; i < v4; i++ { @@ -1791,21 +1843,21 @@ func NewPopulatedEnum(r randyType, easy bool) *Enum { this := &Enum{} this.Name = string(randStringType(r)) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v5 := r.Intn(5) this.Enumvalue = make([]*EnumValue, v5) for i := 0; i < v5; i++ { this.Enumvalue[i] = NewPopulatedEnumValue(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v6 := r.Intn(5) this.Options = make([]*Option, v6) for i := 0; i < v6; i++ { this.Options[i] = NewPopulatedOption(r, easy) } } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.SourceContext = NewPopulatedSourceContext(r, easy) } this.Syntax = Syntax([]int32{0, 1}[r.Intn(2)]) @@ -1822,7 +1874,7 @@ if r.Intn(2) == 0 { this.Number *= -1 } - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { v7 := r.Intn(5) this.Options = make([]*Option, v7) for i := 0; i < v7; i++ { @@ -1838,7 +1890,7 @@ func NewPopulatedOption(r randyType, easy bool) *Option { this := &Option{} this.Name = string(randStringType(r)) - if r.Intn(10) != 0 { + if r.Intn(5) != 0 { this.Value = NewPopulatedAny(r, easy) } if !easy && r.Intn(10) != 0 { @@ -3235,6 +3287,7 @@ func skipType(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -3266,10 +3319,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -3290,55 +3341,30 @@ return 0, ErrInvalidLengthType } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthType - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowType - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipType(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthType - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupType + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthType + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthType = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowType = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthType = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowType = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupType = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/wrappers.pb.go golang-gogoprotobuf-1.3.1/types/wrappers.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/types/wrappers.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/types/wrappers.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -24,7 +24,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Wrapper message for `double`. // @@ -51,7 +51,7 @@ return xxx_messageInfo_DoubleValue.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -106,7 +106,7 @@ return xxx_messageInfo_FloatValue.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -161,7 +161,7 @@ return xxx_messageInfo_Int64Value.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -216,7 +216,7 @@ return xxx_messageInfo_UInt64Value.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -271,7 +271,7 @@ return xxx_messageInfo_Int32Value.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -326,7 +326,7 @@ return xxx_messageInfo_UInt32Value.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -381,7 +381,7 @@ return xxx_messageInfo_BoolValue.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -436,7 +436,7 @@ return xxx_messageInfo_StringValue.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -491,7 +491,7 @@ return xxx_messageInfo_BytesValue.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -1248,7 +1248,7 @@ func (m *DoubleValue) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1256,26 +1256,32 @@ } func (m *DoubleValue) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DoubleValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Value != 0 { - dAtA[i] = 0x9 - i++ + i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Value)))) - i += 8 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x9 } - return i, nil + return len(dAtA) - i, nil } func (m *FloatValue) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1283,26 +1289,32 @@ } func (m *FloatValue) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *FloatValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Value != 0 { - dAtA[i] = 0xd - i++ + i -= 4 encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Value)))) - i += 4 - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xd } - return i, nil + return len(dAtA) - i, nil } func (m *Int64Value) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1310,25 +1322,31 @@ } func (m *Int64Value) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Int64Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Value != 0 { - dAtA[i] = 0x8 - i++ i = encodeVarintWrappers(dAtA, i, uint64(m.Value)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *UInt64Value) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1336,25 +1354,31 @@ } func (m *UInt64Value) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UInt64Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Value != 0 { - dAtA[i] = 0x8 - i++ i = encodeVarintWrappers(dAtA, i, uint64(m.Value)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *Int32Value) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1362,25 +1386,31 @@ } func (m *Int32Value) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Int32Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Value != 0 { - dAtA[i] = 0x8 - i++ i = encodeVarintWrappers(dAtA, i, uint64(m.Value)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *UInt32Value) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1388,25 +1418,31 @@ } func (m *UInt32Value) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *UInt32Value) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Value != 0 { - dAtA[i] = 0x8 - i++ i = encodeVarintWrappers(dAtA, i, uint64(m.Value)) + i-- + dAtA[i] = 0x8 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) - } - return i, nil + return len(dAtA) - i, nil } func (m *BoolValue) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1414,30 +1450,36 @@ } func (m *BoolValue) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *BoolValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if m.Value { - dAtA[i] = 0x8 - i++ + i-- if m.Value { dAtA[i] = 1 } else { dAtA[i] = 0 } - i++ - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0x8 } - return i, nil + return len(dAtA) - i, nil } func (m *StringValue) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1445,26 +1487,33 @@ } func (m *StringValue) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *StringValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Value) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.Value) + copy(dAtA[i:], m.Value) i = encodeVarintWrappers(dAtA, i, uint64(len(m.Value))) - i += copy(dAtA[i:], m.Value) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func (m *BytesValue) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -1472,30 +1521,39 @@ } func (m *BytesValue) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *BytesValue) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.Value) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.Value) + copy(dAtA[i:], m.Value) i = encodeVarintWrappers(dAtA, i, uint64(len(m.Value))) - i += copy(dAtA[i:], m.Value) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintWrappers(dAtA []byte, offset int, v uint64) int { + offset -= sovWrappers(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func NewPopulatedDoubleValue(r randyWrappers, easy bool) *DoubleValue { this := &DoubleValue{} @@ -2589,6 +2647,7 @@ func skipWrappers(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -2620,10 +2679,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -2644,55 +2701,30 @@ return 0, ErrInvalidLengthWrappers } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthWrappers - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowWrappers - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipWrappers(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthWrappers - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupWrappers + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthWrappers + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthWrappers = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowWrappers = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthWrappers = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowWrappers = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupWrappers = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/fast/gogovanity.pb.go golang-gogoprotobuf-1.3.1/vanity/test/fast/gogovanity.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/fast/gogovanity.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/vanity/test/fast/gogovanity.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type B struct { String_ *string `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"` @@ -46,7 +46,7 @@ return xxx_messageInfo_B.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -111,7 +111,7 @@ func (m *B) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -119,40 +119,49 @@ } func (m *B) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *B) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.String_ != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintGogovanity(dAtA, i, uint64(len(*m.String_))) - i += copy(dAtA[i:], *m.String_) - } - if m.Int64 != nil { - dAtA[i] = 0x10 - i++ - i = encodeVarintGogovanity(dAtA, i, uint64(*m.Int64)) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Int32 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintGogovanity(dAtA, i, uint64(*m.Int32)) + i-- + dAtA[i] = 0x18 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Int64 != nil { + i = encodeVarintGogovanity(dAtA, i, uint64(*m.Int64)) + i-- + dAtA[i] = 0x10 + } + if m.String_ != nil { + i -= len(*m.String_) + copy(dAtA[i:], *m.String_) + i = encodeVarintGogovanity(dAtA, i, uint64(len(*m.String_))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintGogovanity(dAtA []byte, offset int, v uint64) int { + offset -= sovGogovanity(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *B) Size() (n int) { if m == nil { @@ -312,6 +321,7 @@ func skipGogovanity(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -343,10 +353,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -367,55 +375,30 @@ return 0, ErrInvalidLengthGogovanity } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthGogovanity - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGogovanity - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipGogovanity(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthGogovanity - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupGogovanity + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthGogovanity + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthGogovanity = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowGogovanity = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthGogovanity = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowGogovanity = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupGogovanity = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/fast/proto3.pb.go golang-gogoprotobuf-1.3.1/vanity/test/fast/proto3.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/fast/proto3.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/vanity/test/fast/proto3.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Aproto3 struct { B string `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"` @@ -43,7 +43,7 @@ return xxx_messageInfo_Aproto3.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -88,7 +88,7 @@ func (m *Aproto3) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -96,30 +96,39 @@ } func (m *Aproto3) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Aproto3) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } if len(m.B) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.B) + copy(dAtA[i:], m.B) i = encodeVarintProto3(dAtA, i, uint64(len(m.B))) - i += copy(dAtA[i:], m.B) - } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintProto3(dAtA []byte, offset int, v uint64) int { + offset -= sovProto3(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *Aproto3) Size() (n int) { if m == nil { @@ -232,6 +241,7 @@ func skipProto3(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -263,10 +273,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -287,55 +295,30 @@ return 0, ErrInvalidLengthProto3 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthProto3 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowProto3 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipProto3(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthProto3 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupProto3 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthProto3 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthProto3 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowProto3 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthProto3 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowProto3 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupProto3 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/fast/vanity.pb.go golang-gogoprotobuf-1.3.1/vanity/test/fast/vanity.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/fast/vanity.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/vanity/test/fast/vanity.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type A struct { Strings *string `protobuf:"bytes,1,opt,name=Strings" json:"Strings,omitempty"` @@ -45,7 +45,7 @@ return xxx_messageInfo_A.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -98,7 +98,7 @@ func (m *A) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -106,37 +106,46 @@ } func (m *A) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *A) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.Strings != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintVanity(dAtA, i, uint64(len(*m.Strings))) - i += copy(dAtA[i:], *m.Strings) + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) } if m.Int == nil { return 0, github_com_gogo_protobuf_proto.NewRequiredNotSetError("Int") } else { - dAtA[i] = 0x10 - i++ i = encodeVarintVanity(dAtA, i, uint64(*m.Int)) + i-- + dAtA[i] = 0x10 } - if m.XXX_unrecognized != nil { - i += copy(dAtA[i:], m.XXX_unrecognized) + if m.Strings != nil { + i -= len(*m.Strings) + copy(dAtA[i:], *m.Strings) + i = encodeVarintVanity(dAtA, i, uint64(len(*m.Strings))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintVanity(dAtA []byte, offset int, v uint64) int { + offset -= sovVanity(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *A) Size() (n int) { if m == nil { @@ -278,6 +287,7 @@ func skipVanity(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -309,10 +319,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -333,55 +341,30 @@ return 0, ErrInvalidLengthVanity } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthVanity - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowVanity - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipVanity(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthVanity - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupVanity + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthVanity + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthVanity = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowVanity = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthVanity = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowVanity = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupVanity = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/faster/gogovanity.pb.go golang-gogoprotobuf-1.3.1/vanity/test/faster/gogovanity.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/faster/gogovanity.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/vanity/test/faster/gogovanity.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type B struct { String_ *string `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"` @@ -43,7 +43,7 @@ return xxx_messageInfo_B.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -109,7 +109,7 @@ func (m *B) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -117,35 +117,43 @@ } func (m *B) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *B) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.String_ != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintGogovanity(dAtA, i, uint64(len(*m.String_))) - i += copy(dAtA[i:], *m.String_) - } - dAtA[i] = 0x10 - i++ - i = encodeVarintGogovanity(dAtA, i, uint64(m.Int64)) if m.Int32 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintGogovanity(dAtA, i, uint64(*m.Int32)) + i-- + dAtA[i] = 0x18 + } + i = encodeVarintGogovanity(dAtA, i, uint64(m.Int64)) + i-- + dAtA[i] = 0x10 + if m.String_ != nil { + i -= len(*m.String_) + copy(dAtA[i:], *m.String_) + i = encodeVarintGogovanity(dAtA, i, uint64(len(*m.String_))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintGogovanity(dAtA []byte, offset int, v uint64) int { + offset -= sovGogovanity(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *B) Size() (n int) { if m == nil { @@ -298,6 +306,7 @@ func skipGogovanity(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -329,10 +338,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -353,55 +360,30 @@ return 0, ErrInvalidLengthGogovanity } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthGogovanity - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGogovanity - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipGogovanity(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthGogovanity - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupGogovanity + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthGogovanity + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthGogovanity = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowGogovanity = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthGogovanity = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowGogovanity = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupGogovanity = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/faster/proto3.pb.go golang-gogoprotobuf-1.3.1/vanity/test/faster/proto3.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/faster/proto3.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/vanity/test/faster/proto3.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -20,7 +20,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Aproto3 struct { B string `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"` @@ -40,7 +40,7 @@ return xxx_messageInfo_Aproto3.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -85,7 +85,7 @@ func (m *Aproto3) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -93,27 +93,35 @@ } func (m *Aproto3) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Aproto3) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if len(m.B) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.B) + copy(dAtA[i:], m.B) i = encodeVarintProto3(dAtA, i, uint64(len(m.B))) - i += copy(dAtA[i:], m.B) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintProto3(dAtA []byte, offset int, v uint64) int { + offset -= sovProto3(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *Aproto3) Size() (n int) { if m == nil { @@ -222,6 +230,7 @@ func skipProto3(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -253,10 +262,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -277,55 +284,30 @@ return 0, ErrInvalidLengthProto3 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthProto3 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowProto3 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipProto3(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthProto3 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupProto3 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthProto3 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthProto3 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowProto3 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthProto3 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowProto3 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupProto3 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/faster/vanity.pb.go golang-gogoprotobuf-1.3.1/vanity/test/faster/vanity.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/faster/vanity.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/vanity/test/faster/vanity.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -21,7 +21,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type A struct { Strings string `protobuf:"bytes,1,opt,name=Strings" json:"Strings"` @@ -42,7 +42,7 @@ return xxx_messageInfo_A.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -96,7 +96,7 @@ func (m *A) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -104,28 +104,36 @@ } func (m *A) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *A) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintVanity(dAtA, i, uint64(len(m.Strings))) - i += copy(dAtA[i:], m.Strings) - dAtA[i] = 0x10 - i++ i = encodeVarintVanity(dAtA, i, uint64(m.Int)) - return i, nil + i-- + dAtA[i] = 0x10 + i -= len(m.Strings) + copy(dAtA[i:], m.Strings) + i = encodeVarintVanity(dAtA, i, uint64(len(m.Strings))) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func encodeVarintVanity(dAtA []byte, offset int, v uint64) int { + offset -= sovVanity(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *A) Size() (n int) { if m == nil { @@ -257,6 +265,7 @@ func skipVanity(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -288,10 +297,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -312,55 +319,30 @@ return 0, ErrInvalidLengthVanity } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthVanity - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowVanity - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipVanity(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthVanity - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupVanity + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthVanity + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthVanity = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowVanity = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthVanity = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowVanity = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupVanity = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/slick/gogovanity.pb.go golang-gogoprotobuf-1.3.1/vanity/test/slick/gogovanity.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/slick/gogovanity.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/vanity/test/slick/gogovanity.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type B struct { String_ *string `protobuf:"bytes,1,opt,name=String" json:"String,omitempty"` @@ -44,7 +44,7 @@ return xxx_messageInfo_B.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -178,7 +178,7 @@ func (m *B) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -186,35 +186,43 @@ } func (m *B) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *B) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - if m.String_ != nil { - dAtA[i] = 0xa - i++ - i = encodeVarintGogovanity(dAtA, i, uint64(len(*m.String_))) - i += copy(dAtA[i:], *m.String_) - } - dAtA[i] = 0x10 - i++ - i = encodeVarintGogovanity(dAtA, i, uint64(m.Int64)) if m.Int32 != nil { - dAtA[i] = 0x18 - i++ i = encodeVarintGogovanity(dAtA, i, uint64(*m.Int32)) + i-- + dAtA[i] = 0x18 + } + i = encodeVarintGogovanity(dAtA, i, uint64(m.Int64)) + i-- + dAtA[i] = 0x10 + if m.String_ != nil { + i -= len(*m.String_) + copy(dAtA[i:], *m.String_) + i = encodeVarintGogovanity(dAtA, i, uint64(len(*m.String_))) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintGogovanity(dAtA []byte, offset int, v uint64) int { + offset -= sovGogovanity(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *B) Size() (n int) { if m == nil { @@ -387,6 +395,7 @@ func skipGogovanity(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -418,10 +427,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -442,55 +449,30 @@ return 0, ErrInvalidLengthGogovanity } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthGogovanity - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGogovanity - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipGogovanity(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthGogovanity - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupGogovanity + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthGogovanity + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthGogovanity = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowGogovanity = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthGogovanity = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowGogovanity = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupGogovanity = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/slick/proto3.pb.go golang-gogoprotobuf-1.3.1/vanity/test/slick/proto3.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/slick/proto3.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/vanity/test/slick/proto3.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -22,7 +22,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Aproto3 struct { B string `protobuf:"bytes,1,opt,name=B,proto3" json:"B,omitempty"` @@ -41,7 +41,7 @@ return xxx_messageInfo_Aproto3.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -130,7 +130,7 @@ func (m *Aproto3) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -138,27 +138,35 @@ } func (m *Aproto3) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Aproto3) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l if len(m.B) > 0 { - dAtA[i] = 0xa - i++ + i -= len(m.B) + copy(dAtA[i:], m.B) i = encodeVarintProto3(dAtA, i, uint64(len(m.B))) - i += copy(dAtA[i:], m.B) + i-- + dAtA[i] = 0xa } - return i, nil + return len(dAtA) - i, nil } func encodeVarintProto3(dAtA []byte, offset int, v uint64) int { + offset -= sovProto3(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *Aproto3) Size() (n int) { if m == nil { @@ -285,6 +293,7 @@ func skipProto3(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -316,10 +325,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -340,55 +347,30 @@ return 0, ErrInvalidLengthProto3 } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthProto3 - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowProto3 - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipProto3(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthProto3 - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupProto3 + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthProto3 + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthProto3 = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowProto3 = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthProto3 = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowProto3 = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupProto3 = fmt.Errorf("proto: unexpected end of group") ) diff -Nru golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/slick/vanity.pb.go golang-gogoprotobuf-1.3.1/vanity/test/slick/vanity.pb.go --- golang-gogoprotobuf-1.2.1+git20190611.dadb6258/vanity/test/slick/vanity.pb.go 2019-07-01 18:22:04.000000000 +0000 +++ golang-gogoprotobuf-1.3.1/vanity/test/slick/vanity.pb.go 2020-05-17 12:22:58.000000000 +0000 @@ -23,7 +23,7 @@ // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type A struct { Strings string `protobuf:"bytes,1,opt,name=Strings" json:"Strings"` @@ -43,7 +43,7 @@ return xxx_messageInfo_A.Marshal(b, m, deterministic) } else { b = b[:cap(b)] - n, err := m.MarshalTo(b) + n, err := m.MarshalToSizedBuffer(b) if err != nil { return nil, err } @@ -145,7 +145,7 @@ func (m *A) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } @@ -153,28 +153,36 @@ } func (m *A) MarshalTo(dAtA []byte) (int, error) { - var i int + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *A) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) _ = i var l int _ = l - dAtA[i] = 0xa - i++ - i = encodeVarintVanity(dAtA, i, uint64(len(m.Strings))) - i += copy(dAtA[i:], m.Strings) - dAtA[i] = 0x10 - i++ i = encodeVarintVanity(dAtA, i, uint64(m.Int)) - return i, nil + i-- + dAtA[i] = 0x10 + i -= len(m.Strings) + copy(dAtA[i:], m.Strings) + i = encodeVarintVanity(dAtA, i, uint64(len(m.Strings))) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func encodeVarintVanity(dAtA []byte, offset int, v uint64) int { + offset -= sovVanity(v) + base := offset for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 offset++ } dAtA[offset] = uint8(v) - return offset + 1 + return base } func (m *A) Size() (n int) { if m == nil { @@ -325,6 +333,7 @@ func skipVanity(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -356,10 +365,8 @@ break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -380,55 +387,30 @@ return 0, ErrInvalidLengthVanity } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthVanity - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowVanity - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipVanity(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthVanity - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupVanity + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthVanity + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthVanity = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowVanity = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthVanity = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowVanity = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupVanity = fmt.Errorf("proto: unexpected end of group") )