cmd/protoc-gen-go: special cases for MessageSet extensions
Add special-case handling for extension fields named
"message_set_extension" that extend a message_set_wire_format message.
Support special cases for a proto1 feature that was superseded by proto2
extensions.
Change-Id: Icbdb711111c66be547bf8d6f37ab3079c320e2a1
Reviewed-on: https://go-review.googlesource.com/136536
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
diff --git a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
index b592bd0..6e5cf27 100644
--- a/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/enum.pb.go
@@ -322,34 +322,34 @@
var xxx_messageInfo_EnumContainerMessage1_EnumContainerMessage2 proto.InternalMessageInfo
func init() {
- proto.RegisterType((*EnumContainerMessage1)(nil), "goproto.protoc.proto2.EnumContainerMessage1")
- proto.RegisterType((*EnumContainerMessage1_EnumContainerMessage2)(nil), "goproto.protoc.proto2.EnumContainerMessage1.EnumContainerMessage2")
proto.RegisterEnum("goproto.protoc.proto2.EnumType1", EnumType1_name, EnumType1_value)
proto.RegisterEnum("goproto.protoc.proto2.EnumType2", EnumType2_name, EnumType2_value)
proto.RegisterEnum("goproto.protoc.proto2.EnumContainerMessage1_NestedEnumType1A", EnumContainerMessage1_NestedEnumType1A_name, EnumContainerMessage1_NestedEnumType1A_value)
proto.RegisterEnum("goproto.protoc.proto2.EnumContainerMessage1_NestedEnumType1B", EnumContainerMessage1_NestedEnumType1B_name, EnumContainerMessage1_NestedEnumType1B_value)
proto.RegisterEnum("goproto.protoc.proto2.EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A", EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A_name, EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2A_value)
proto.RegisterEnum("goproto.protoc.proto2.EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B", EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B_name, EnumContainerMessage1_EnumContainerMessage2_NestedEnumType2B_value)
+ proto.RegisterType((*EnumContainerMessage1)(nil), "goproto.protoc.proto2.EnumContainerMessage1")
+ proto.RegisterType((*EnumContainerMessage1_EnumContainerMessage2)(nil), "goproto.protoc.proto2.EnumContainerMessage1.EnumContainerMessage2")
}
func init() { proto.RegisterFile("proto2/enum.proto", fileDescriptor_de9f68860d540858) }
var fileDescriptor_de9f68860d540858 = []byte{
- // 242 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xb1, 0x4b, 0xc4, 0x30,
- 0x14, 0xc6, 0xcd, 0x39, 0x88, 0x19, 0x34, 0x56, 0x6e, 0x39, 0x70, 0xb9, 0x45, 0x38, 0xb8, 0x86,
- 0x64, 0x13, 0xa7, 0x56, 0xb3, 0x69, 0x6f, 0xb0, 0x2a, 0xb8, 0x1c, 0xa1, 0x7d, 0x3c, 0x0a, 0x6d,
- 0x5e, 0x69, 0xd3, 0xc1, 0xff, 0xd3, 0x3f, 0x48, 0xae, 0x81, 0xb3, 0x42, 0x75, 0xca, 0xf7, 0xe5,
- 0xfb, 0xf1, 0x1b, 0x1e, 0xbf, 0x6a, 0x3b, 0xf2, 0xa4, 0x25, 0xb8, 0xa1, 0x89, 0xc7, 0x1c, 0x2d,
- 0x91, 0xc6, 0x10, 0x6a, 0x11, 0x1e, 0xbd, 0xfe, 0x62, 0x7c, 0x69, 0xdc, 0xd0, 0x3c, 0x90, 0xf3,
- 0xb6, 0x72, 0xd0, 0x3d, 0x43, 0xdf, 0x5b, 0x04, 0xb5, 0xaa, 0xe6, 0x07, 0xbd, 0xbe, 0xe5, 0x22,
- 0x83, 0xde, 0x43, 0x79, 0x98, 0xf3, 0xcf, 0x16, 0x74, 0x12, 0x5d, 0xf3, 0xcb, 0xcc, 0xbc, 0xe4,
- 0xe6, 0x71, 0xaf, 0x93, 0xfd, 0x5b, 0xf2, 0xf4, 0x6a, 0xc4, 0xc9, 0x0c, 0x98, 0x4e, 0xc1, 0xf4,
- 0x6f, 0x50, 0x4d, 0x8d, 0xea, 0x1f, 0xa3, 0x9a, 0x1a, 0xd5, 0xd1, 0xb8, 0xb9, 0xe1, 0xe7, 0x47,
- 0x24, 0x3a, 0xe3, 0xa7, 0xbb, 0xcc, 0x08, 0x76, 0x08, 0xf9, 0xfb, 0x4e, 0x2c, 0x36, 0xf2, 0x67,
- 0xd6, 0xd1, 0x05, 0xe7, 0xe5, 0xd0, 0xd6, 0x55, 0x61, 0x3d, 0x28, 0xc1, 0x7e, 0x75, 0x2d, 0xd8,
- 0x6a, 0x21, 0x58, 0x7a, 0xff, 0x71, 0x87, 0x44, 0x58, 0x43, 0x8c, 0x54, 0x5b, 0x87, 0x31, 0x75,
- 0x28, 0xc7, 0x13, 0xca, 0xa2, 0x29, 0x43, 0x2a, 0xb6, 0x08, 0x6e, 0x8b, 0x24, 0x3d, 0xf4, 0xbe,
- 0xb4, 0xde, 0x86, 0x6f, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x53, 0xf7, 0xde, 0x8e, 0x01,
- 0x00, 0x00,
+ // 248 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4b, 0xc3, 0x30,
+ 0x18, 0x86, 0xcd, 0x3c, 0x88, 0x39, 0x68, 0xac, 0xec, 0x32, 0xf0, 0xb2, 0x8b, 0x30, 0xd8, 0x42,
+ 0xbe, 0x3f, 0x20, 0xad, 0xe6, 0xa6, 0xdd, 0xc1, 0xaa, 0xe0, 0x65, 0x64, 0xe9, 0x67, 0x2c, 0xac,
+ 0x49, 0x59, 0xbf, 0x08, 0xfe, 0x4f, 0x7f, 0x90, 0xac, 0x85, 0x59, 0x61, 0x7a, 0xca, 0xfb, 0xe6,
+ 0x7d, 0x78, 0x0e, 0x1f, 0xbf, 0x68, 0xb6, 0x81, 0x02, 0x48, 0xf4, 0xb1, 0x5e, 0x74, 0x39, 0x19,
+ 0xbb, 0xd0, 0x85, 0xbe, 0xda, 0xfe, 0x81, 0xe9, 0x17, 0xe3, 0x63, 0xed, 0x63, 0x7d, 0x1b, 0x3c,
+ 0x99, 0xca, 0xe3, 0xf6, 0x01, 0xdb, 0xd6, 0x38, 0x54, 0x93, 0xea, 0xf0, 0x00, 0xd3, 0x6b, 0x2e,
+ 0x72, 0x6c, 0x09, 0xcb, 0xdd, 0x5c, 0x7c, 0x36, 0x08, 0x69, 0x72, 0xc9, 0xcf, 0x73, 0xfd, 0x58,
+ 0xe8, 0xbb, 0x15, 0xa4, 0xab, 0xe7, 0xf4, 0xfe, 0x49, 0x8b, 0xa3, 0x03, 0x60, 0x36, 0x04, 0xb3,
+ 0xbf, 0x41, 0x35, 0x34, 0xaa, 0x7f, 0x8c, 0x6a, 0x68, 0x54, 0x7b, 0xe3, 0xec, 0x8a, 0x9f, 0xee,
+ 0x91, 0xe4, 0x84, 0x1f, 0x2f, 0x73, 0x2d, 0xd8, 0x2e, 0x14, 0x2f, 0x4b, 0x31, 0x9a, 0xc9, 0x9f,
+ 0x19, 0x92, 0x33, 0xce, 0xcb, 0xd8, 0x6c, 0x2a, 0x6b, 0x08, 0x95, 0x60, 0xbf, 0x3a, 0x08, 0x36,
+ 0x19, 0x09, 0x96, 0xa5, 0xaf, 0x37, 0xae, 0xa2, 0xf7, 0xb8, 0x5e, 0xd8, 0x50, 0x4b, 0x17, 0x36,
+ 0xc6, 0x3b, 0xd9, 0x9d, 0x70, 0x1d, 0xdf, 0xe4, 0x07, 0x48, 0x5b, 0x97, 0x7d, 0xb7, 0x73, 0x87,
+ 0x7e, 0xee, 0x82, 0x24, 0x6c, 0xa9, 0x34, 0x64, 0xfa, 0x6f, 0xf8, 0x0e, 0x00, 0x00, 0xff, 0xff,
+ 0x5b, 0x88, 0x8a, 0x80, 0x94, 0x01, 0x00, 0x00,
}
diff --git a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
index bba5924..c922a2b 100644
--- a/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/fields.pb.go
@@ -1585,6 +1585,7 @@
var xxx_messageInfo_FieldTestMessage_Message proto.InternalMessageInfo
func init() {
+ proto.RegisterEnum("goproto.protoc.proto2.FieldTestMessage_Enum", FieldTestMessage_Enum_name, FieldTestMessage_Enum_value)
proto.RegisterType((*FieldTestMessage)(nil), "goproto.protoc.proto2.FieldTestMessage")
proto.RegisterMapType((map[uint64]FieldTestMessage_Enum)(nil), "goproto.protoc.proto2.FieldTestMessage.MapFixed64EnumEntry")
proto.RegisterMapType((map[int32]int64)(nil), "goproto.protoc.proto2.FieldTestMessage.MapInt32Int64Entry")
@@ -1594,126 +1595,125 @@
proto.RegisterType((*FieldTestMessage_RepeatedGroup)(nil), "goproto.protoc.proto2.FieldTestMessage.RepeatedGroup")
proto.RegisterType((*FieldTestMessage_OneofGroup)(nil), "goproto.protoc.proto2.FieldTestMessage.OneofGroup")
proto.RegisterType((*FieldTestMessage_Message)(nil), "goproto.protoc.proto2.FieldTestMessage.Message")
- proto.RegisterEnum("goproto.protoc.proto2.FieldTestMessage_Enum", FieldTestMessage_Enum_name, FieldTestMessage_Enum_value)
}
func init() { proto.RegisterFile("proto2/fields.proto", fileDescriptor_fd8a9d72b841fd68) }
var fileDescriptor_fd8a9d72b841fd68 = []byte{
- // 1825 bytes of a gzipped FileDescriptorProto
+ // 1831 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x98, 0x59, 0x73, 0x13, 0xcb,
0x15, 0xc7, 0x3d, 0x33, 0x92, 0x6d, 0xb5, 0x25, 0x4b, 0x1e, 0x43, 0x55, 0x87, 0xa7, 0x0e, 0x21,
- 0x61, 0x08, 0xd8, 0x8e, 0xc5, 0x30, 0x80, 0xa9, 0x54, 0xa5, 0x5c, 0xb1, 0xe3, 0x3c, 0x04, 0x92,
- 0x09, 0xae, 0x54, 0x41, 0xaa, 0x5c, 0x83, 0x3d, 0x52, 0x14, 0xa4, 0x19, 0x21, 0x8d, 0x00, 0x7f,
- 0x8b, 0xac, 0x1f, 0x23, 0xfb, 0x7a, 0xb9, 0xdc, 0x0f, 0x70, 0xf7, 0x7d, 0x01, 0xee, 0xbe, 0x2f,
- 0xaf, 0xf7, 0xde, 0xe7, 0x5b, 0xa7, 0x4f, 0x77, 0x4f, 0xf7, 0xc8, 0x0f, 0xb6, 0x9f, 0xb0, 0x8e,
- 0xfe, 0x7d, 0xfe, 0xe7, 0x34, 0xfd, 0x3b, 0xea, 0x19, 0x32, 0xdf, 0x1f, 0xa4, 0x59, 0xda, 0x5c,
- 0x6a, 0x75, 0xe2, 0xee, 0xce, 0x70, 0x91, 0x7f, 0x72, 0x8f, 0xb6, 0x53, 0xfe, 0x07, 0x7e, 0xdc,
- 0xc6, 0x7f, 0x9a, 0xc7, 0xef, 0x9d, 0x26, 0x8d, 0x75, 0xd0, 0x5d, 0x8d, 0x87, 0xd9, 0xcf, 0xe2,
- 0xe1, 0x30, 0x6a, 0xc7, 0xee, 0x77, 0x48, 0x2d, 0xed, 0x67, 0x9d, 0x34, 0x89, 0xba, 0x5b, 0x37,
- 0xd2, 0xb4, 0x4b, 0x2d, 0x66, 0x79, 0xd3, 0x61, 0x55, 0x06, 0x57, 0xd3, 0xb4, 0xeb, 0xfe, 0x42,
- 0x13, 0xc5, 0xc9, 0xa8, 0x47, 0x6d, 0x66, 0x79, 0xb3, 0xcd, 0x33, 0x8b, 0x7b, 0x1a, 0x2d, 0x16,
- 0x4d, 0x16, 0xd7, 0x92, 0x51, 0x2f, 0x4f, 0x09, 0x9f, 0xdc, 0xef, 0x92, 0x59, 0x95, 0xb2, 0x93,
- 0x64, 0x67, 0x9b, 0xd4, 0x61, 0x96, 0x57, 0x0e, 0x95, 0xd1, 0x4f, 0x21, 0xe8, 0x9e, 0x24, 0x75,
- 0x25, 0x1b, 0xa2, 0xae, 0xc4, 0x2c, 0x6f, 0x2e, 0x54, 0xab, 0x7f, 0xd9, 0x19, 0x13, 0x8e, 0x50,
- 0x58, 0x66, 0x96, 0x57, 0xcb, 0x85, 0x9b, 0x28, 0x2c, 0x18, 0x07, 0x3e, 0x9d, 0x64, 0x96, 0xe7,
- 0x18, 0xc6, 0x81, 0x3f, 0x66, 0x1c, 0xf8, 0x74, 0x8a, 0x59, 0x9e, 0x6b, 0x1a, 0x17, 0x84, 0x23,
- 0x14, 0x4e, 0x33, 0xcb, 0x2b, 0x99, 0xc6, 0x81, 0xef, 0x9e, 0x26, 0x73, 0x79, 0xc6, 0x56, 0xe7,
- 0x6e, 0xbc, 0x73, 0xb6, 0x49, 0x2b, 0xcc, 0xf2, 0xea, 0x61, 0x43, 0xe5, 0x14, 0x71, 0xf7, 0x14,
- 0x51, 0xb1, 0x2d, 0xa9, 0x25, 0xcc, 0xf2, 0xa6, 0x42, 0xe5, 0xb6, 0x2e, 0xa4, 0x7a, 0x43, 0xad,
- 0x6e, 0x1a, 0x65, 0x74, 0x86, 0x59, 0x9e, 0x9d, 0x37, 0xb4, 0x0e, 0xc1, 0x3d, 0xec, 0x03, 0x9f,
- 0x56, 0x99, 0xe5, 0x35, 0x8a, 0xf6, 0x81, 0x3f, 0x6e, 0x1f, 0xf8, 0xb4, 0xc6, 0x2c, 0x6f, 0xb2,
- 0x60, 0x5f, 0xe8, 0x7f, 0x27, 0x1d, 0xdd, 0xe8, 0xc6, 0x74, 0x96, 0x59, 0x9e, 0x95, 0xf7, 0xff,
- 0x63, 0x1e, 0x35, 0x77, 0x34, 0x1b, 0x74, 0x92, 0x36, 0xad, 0x33, 0xcb, 0xab, 0x68, 0x3b, 0xca,
- 0xa3, 0x46, 0x43, 0x37, 0x76, 0xb3, 0x78, 0x48, 0x1b, 0xcc, 0xf2, 0xaa, 0x79, 0x43, 0xab, 0x10,
- 0x74, 0xaf, 0x69, 0x35, 0x8a, 0x83, 0x46, 0xe7, 0x98, 0xe5, 0xcd, 0x34, 0x97, 0xf6, 0x7b, 0x2e,
- 0xc5, 0xbf, 0x79, 0x53, 0x92, 0x8a, 0xeb, 0xf9, 0x81, 0x6f, 0x0f, 0xd2, 0x51, 0x9f, 0xba, 0xcc,
- 0xf2, 0x48, 0xf3, 0xdc, 0x7e, 0x13, 0x5f, 0x11, 0x8b, 0x7f, 0x02, 0x8b, 0x43, 0x33, 0x17, 0x20,
- 0x37, 0x88, 0x6f, 0x8d, 0x3a, 0x83, 0x78, 0x07, 0x91, 0x8b, 0x99, 0x0d, 0xc8, 0xc9, 0xa0, 0x44,
- 0x4e, 0x89, 0x38, 0x72, 0x2d, 0x66, 0x1f, 0x1c, 0x39, 0x99, 0x42, 0x22, 0xa7, 0x52, 0x22, 0x21,
- 0x6d, 0x66, 0x03, 0x72, 0x32, 0xaa, 0x90, 0x53, 0x32, 0x81, 0xdc, 0x6f, 0x98, 0x0d, 0xc8, 0xc9,
- 0x70, 0x8e, 0x9c, 0x12, 0x0a, 0xe4, 0x3a, 0xcc, 0x06, 0xe4, 0x64, 0x38, 0x47, 0x4e, 0x37, 0x0e,
- 0x7c, 0xfa, 0x5b, 0x66, 0x03, 0x72, 0x9a, 0x31, 0x9e, 0x24, 0xc3, 0x38, 0xf0, 0xe9, 0x4d, 0x66,
- 0x03, 0x72, 0xba, 0x71, 0x41, 0x28, 0x90, 0xeb, 0x32, 0x1b, 0x90, 0xd3, 0x8d, 0x11, 0xb9, 0x3c,
- 0xa3, 0xc4, 0xa8, 0xc7, 0x6c, 0x40, 0x4e, 0xe5, 0xd4, 0x90, 0x53, 0x62, 0xa9, 0x4d, 0x98, 0x0d,
- 0xc8, 0xc9, 0xb8, 0x86, 0x5c, 0x2e, 0xe5, 0xc8, 0xa5, 0xcc, 0x06, 0xe4, 0x94, 0x50, 0x22, 0x57,
- 0xb0, 0x0f, 0x7c, 0xda, 0x67, 0x36, 0x20, 0x67, 0xda, 0x23, 0x72, 0xa6, 0x7d, 0xe0, 0xd3, 0x5b,
- 0xcc, 0x06, 0xe4, 0x0c, 0xfb, 0x42, 0xff, 0x02, 0xb9, 0x01, 0xb3, 0x01, 0x39, 0x19, 0xce, 0x91,
- 0xcb, 0x0b, 0x40, 0xe4, 0x86, 0xcc, 0x06, 0xe4, 0x94, 0xbd, 0x42, 0x2e, 0x3f, 0x92, 0x1c, 0xb9,
- 0x8c, 0xd9, 0x80, 0x9c, 0x3a, 0x93, 0x12, 0x39, 0x25, 0x93, 0xc8, 0x8d, 0x98, 0x7d, 0x28, 0xe4,
- 0x64, 0x22, 0x0d, 0x39, 0x19, 0x42, 0xe4, 0x6e, 0x33, 0xfb, 0x20, 0xc8, 0x85, 0x62, 0xb1, 0x40,
- 0xce, 0xc8, 0xe5, 0x9e, 0x80, 0xe4, 0xfd, 0x38, 0xca, 0x24, 0x72, 0x4f, 0x5a, 0xcc, 0x41, 0xe6,
- 0x30, 0xca, 0x99, 0x0b, 0x35, 0x15, 0x67, 0xee, 0x29, 0x50, 0x1d, 0x02, 0x3a, 0xcc, 0xc1, 0xa1,
- 0xfb, 0x1e, 0xec, 0xac, 0xc8, 0x89, 0x8c, 0x3c, 0x0d, 0x49, 0x39, 0x75, 0x18, 0x46, 0xea, 0x3c,
- 0xf8, 0xaf, 0x12, 0x3a, 0x41, 0xdd, 0x33, 0x20, 0xe4, 0xd8, 0x61, 0x5c, 0x60, 0xa7, 0x2b, 0x05,
- 0x76, 0xcf, 0x82, 0xb2, 0x96, 0x2b, 0x05, 0x77, 0x05, 0xef, 0xc0, 0xa7, 0xcf, 0x81, 0xd0, 0x31,
- 0xbc, 0x03, 0x7f, 0xcc, 0x3b, 0xf0, 0xe9, 0xf3, 0x20, 0x74, 0x4d, 0xef, 0x82, 0x52, 0x90, 0xf7,
- 0x02, 0x28, 0x4b, 0xa6, 0x77, 0xe0, 0xbb, 0x67, 0xe0, 0xec, 0xcb, 0x9c, 0x12, 0xa7, 0x17, 0x41,
- 0xcb, 0xd9, 0x13, 0x59, 0x25, 0x7b, 0xdf, 0x27, 0x2a, 0xa6, 0xd8, 0x7b, 0x09, 0xc4, 0x1c, 0x3e,
- 0xfc, 0x42, 0xc2, 0xa7, 0x77, 0x85, 0xf0, 0xbd, 0x0c, 0x4a, 0x3b, 0xef, 0x0a, 0xe9, 0x1b, 0xaf,
- 0x20, 0xf0, 0xe9, 0x2b, 0x20, 0x6d, 0x14, 0x2b, 0x08, 0xfc, 0xf1, 0x0a, 0x02, 0x9f, 0xbe, 0x0a,
- 0xe2, 0xc9, 0x42, 0x05, 0x85, 0x5d, 0x10, 0xfc, 0xbd, 0x06, 0x52, 0x2b, 0xdf, 0x05, 0x01, 0xa0,
- 0xb1, 0xb3, 0x08, 0xe0, 0xeb, 0xa0, 0xac, 0x68, 0x3b, 0x8b, 0x04, 0xea, 0x5d, 0x21, 0x81, 0x6f,
- 0x80, 0xb0, 0x9a, 0x77, 0x85, 0x08, 0x5e, 0xd7, 0xea, 0x94, 0x08, 0x3e, 0x00, 0xe5, 0xe1, 0x18,
- 0xc4, 0x4c, 0x92, 0xc1, 0x5f, 0xe7, 0x00, 0x20, 0x83, 0x0f, 0x21, 0xf3, 0x81, 0x20, 0xc4, 0xd5,
- 0x0a, 0x42, 0x2d, 0x99, 0xeb, 0x91, 0xea, 0x4e, 0xdc, 0x8a, 0x46, 0xdd, 0x0c, 0x19, 0xfc, 0x0b,
- 0xdc, 0x22, 0xa7, 0x57, 0x4a, 0xd9, 0x60, 0x14, 0x87, 0x33, 0xe2, 0x2b, 0x0e, 0xe2, 0x66, 0xae,
- 0xe4, 0x1c, 0xfe, 0xf5, 0x10, 0xf7, 0xcd, 0x15, 0xe7, 0xca, 0xe5, 0x35, 0x95, 0x96, 0xb3, 0x78,
- 0x92, 0xd4, 0x64, 0x5a, 0xe4, 0xe6, 0x6f, 0x90, 0xb7, 0xbc, 0x62, 0x2d, 0x87, 0xd2, 0x0f, 0x61,
- 0x3c, 0x45, 0x66, 0xa5, 0x50, 0xb0, 0xf8, 0x77, 0x50, 0xce, 0x81, 0x52, 0xa6, 0x10, 0x34, 0x6a,
- 0x52, 0x01, 0xe3, 0x3f, 0x40, 0x5a, 0xd3, 0xa5, 0x9b, 0xf2, 0xf7, 0x52, 0xb7, 0x0f, 0x7c, 0xfa,
- 0x4f, 0x50, 0x3a, 0x05, 0x7b, 0xfe, 0x53, 0x60, 0xd8, 0x07, 0x3e, 0xfd, 0x17, 0x28, 0xdd, 0xa2,
- 0xbd, 0x29, 0x15, 0x3c, 0xfe, 0x1b, 0xa4, 0xa5, 0xa2, 0x7d, 0xe0, 0xbb, 0x0b, 0xa4, 0xa1, 0xb2,
- 0x4a, 0xc6, 0xfe, 0x03, 0xe2, 0x3a, 0x88, 0xeb, 0x32, 0xaf, 0x44, 0xf2, 0x34, 0x91, 0x21, 0x45,
- 0xe4, 0x7f, 0x41, 0x3d, 0x05, 0x6a, 0x69, 0xba, 0xae, 0x7e, 0x3b, 0x55, 0x6b, 0x88, 0xe4, 0xff,
- 0x40, 0x6a, 0xaf, 0x38, 0xcb, 0x8b, 0xe7, 0x54, 0x73, 0x88, 0xe5, 0x58, 0x19, 0x81, 0x4f, 0xff,
- 0x0f, 0xea, 0xc6, 0x78, 0x19, 0xfc, 0x27, 0xdc, 0x2c, 0x23, 0xf0, 0xe9, 0x63, 0xa0, 0x9e, 0x1c,
- 0x2b, 0x83, 0x8b, 0xd5, 0x6e, 0x08, 0x2e, 0xef, 0x81, 0xd6, 0xc2, 0x3a, 0x64, 0x89, 0x82, 0x4d,
- 0x4d, 0x2c, 0xd0, 0x7c, 0x1c, 0xc4, 0x95, 0x15, 0xe7, 0xee, 0x99, 0xdd, 0x7c, 0x9f, 0x11, 0x4f,
- 0xad, 0x41, 0xa4, 0xf3, 0x3e, 0x68, 0xab, 0xa8, 0x95, 0x0d, 0x22, 0xa1, 0xe7, 0xc9, 0x11, 0x63,
- 0x2f, 0xb6, 0x92, 0xb8, 0xdd, 0x49, 0x5a, 0xf4, 0x77, 0x0e, 0xdf, 0x92, 0xd2, 0x42, 0x27, 0x69,
- 0x85, 0xae, 0xbe, 0x27, 0x97, 0xb9, 0xc0, 0x0d, 0x8a, 0x0b, 0xfb, 0xe9, 0x10, 0x16, 0xfe, 0x1e,
- 0x17, 0x3a, 0x63, 0xeb, 0x7e, 0xce, 0xbf, 0x77, 0x7f, 0x40, 0xe6, 0x0a, 0x86, 0x51, 0x42, 0xff,
- 0x20, 0x16, 0x25, 0x51, 0xa2, 0x36, 0x15, 0xcd, 0xa2, 0xc4, 0xbd, 0x48, 0x8e, 0x9a, 0xfb, 0x24,
- 0x6b, 0xfc, 0xa3, 0xc3, 0xb7, 0x0b, 0x6b, 0x9c, 0x37, 0xf6, 0x4b, 0x14, 0x79, 0x61, 0x6c, 0xa9,
- 0xa8, 0xf2, 0x4f, 0xb8, 0xd4, 0x19, 0x5f, 0x29, 0xca, 0x6c, 0x12, 0xb7, 0x68, 0x1a, 0x25, 0xf4,
- 0xcf, 0x62, 0x19, 0xd4, 0xd9, 0x30, 0x0d, 0xa3, 0xc4, 0xdd, 0x26, 0xf5, 0x5e, 0xd4, 0x47, 0x5a,
- 0x05, 0x34, 0x5f, 0x3a, 0x7c, 0xd8, 0xad, 0xec, 0x7b, 0xd8, 0x45, 0x7d, 0x0e, 0x35, 0x47, 0x6b,
- 0x2d, 0xc9, 0x06, 0xbb, 0x61, 0xad, 0xa7, 0xc7, 0xdc, 0x2e, 0x71, 0xc1, 0x04, 0x0f, 0xc1, 0x56,
- 0x4f, 0x0c, 0xd5, 0xaf, 0xd0, 0xe7, 0x87, 0x07, 0xf0, 0xc1, 0xb3, 0x22, 0x02, 0x68, 0xd5, 0xe8,
- 0x15, 0xc2, 0x6e, 0x8b, 0x40, 0x4c, 0x1e, 0x66, 0x9c, 0x6f, 0x5f, 0xa3, 0xd7, 0xa5, 0x03, 0x78,
- 0x89, 0x23, 0x0f, 0x73, 0x0d, 0x9d, 0x66, 0x7b, 0x46, 0xd0, 0x65, 0x84, 0xa4, 0x49, 0x9c, 0xb6,
- 0x70, 0xd6, 0x3e, 0x80, 0xa7, 0xe6, 0xe9, 0x8d, 0x89, 0xb0, 0xc2, 0x83, 0x7c, 0xca, 0x5e, 0x96,
- 0x0a, 0x5e, 0xc3, 0xc3, 0xd2, 0xc1, 0x67, 0xac, 0xca, 0xc7, 0x1d, 0x8f, 0x93, 0x19, 0xcc, 0x87,
- 0x73, 0xf0, 0x11, 0x24, 0x2c, 0x6f, 0x4c, 0x84, 0xe8, 0x82, 0x93, 0xf5, 0x04, 0xa9, 0xa2, 0x46,
- 0xcc, 0xd5, 0x37, 0xf9, 0xd3, 0xfc, 0xc6, 0x44, 0x88, 0x4b, 0xc5, 0x50, 0x55, 0x2a, 0x31, 0x52,
- 0xdf, 0x02, 0x55, 0x4d, 0xa9, 0xc4, 0x3c, 0xd5, 0xfd, 0x02, 0x9f, 0xbe, 0x0d, 0x22, 0x47, 0xf7,
- 0x0b, 0x7c, 0xd3, 0x2f, 0xf0, 0xe9, 0x3b, 0x20, 0x72, 0x0d, 0x3f, 0x5d, 0x25, 0x66, 0xe8, 0xbb,
- 0xa0, 0x2a, 0x19, 0x7e, 0xfc, 0x67, 0x7f, 0x56, 0xe4, 0x92, 0x03, 0xf1, 0x3d, 0xd0, 0xd5, 0x37,
- 0x26, 0xc2, 0x1a, 0x66, 0x6b, 0xa9, 0x2b, 0x0a, 0x06, 0xd4, 0xe4, 0x7c, 0x1f, 0x84, 0x53, 0x1b,
- 0x13, 0x21, 0xfa, 0xc8, 0xb1, 0xa9, 0x3a, 0xc0, 0xa1, 0xf9, 0x01, 0xa8, 0x6c, 0xd5, 0x01, 0xce,
- 0xcb, 0x82, 0x6b, 0xe0, 0xd3, 0x0f, 0x41, 0xd6, 0x28, 0xb8, 0x06, 0x7e, 0xc1, 0x35, 0xf0, 0xe9,
- 0x47, 0x20, 0x9c, 0x34, 0x5d, 0xf5, 0x6e, 0xc5, 0x8c, 0xfc, 0x18, 0x64, 0x96, 0xea, 0x56, 0x8c,
- 0xc7, 0x7c, 0xe7, 0x70, 0x38, 0x7e, 0x02, 0xaa, 0x4a, 0xbe, 0x73, 0x38, 0x17, 0x55, 0x07, 0x38,
- 0x15, 0x3f, 0x05, 0x51, 0x55, 0x75, 0x80, 0x03, 0xf1, 0x57, 0xb2, 0x2e, 0x79, 0x5f, 0xf9, 0xac,
- 0x74, 0xa8, 0xc7, 0x74, 0xd5, 0x88, 0x44, 0x69, 0x53, 0x1c, 0x60, 0xbc, 0xab, 0x7c, 0x5e, 0xe2,
- 0xcf, 0xe8, 0xcd, 0x7d, 0x3f, 0xa3, 0xc3, 0x52, 0x7e, 0x51, 0x51, 0xf5, 0xe2, 0x3d, 0xe5, 0xdb,
- 0xb2, 0xa7, 0xec, 0x4e, 0xba, 0xb5, 0x4c, 0xef, 0x97, 0xf9, 0x39, 0xb6, 0xc4, 0x51, 0xbf, 0x7a,
- 0x27, 0x5d, 0x36, 0x25, 0x4d, 0xfa, 0x44, 0x99, 0x1f, 0x3d, 0x4d, 0xd2, 0x3c, 0x16, 0x90, 0x9a,
- 0xf1, 0x16, 0xc0, 0x78, 0xad, 0x81, 0x15, 0xcf, 0xf3, 0xd7, 0x1f, 0xea, 0xed, 0x00, 0x97, 0xc1,
- 0x3a, 0xe3, 0x51, 0xc6, 0x78, 0x36, 0xc3, 0x75, 0x77, 0xf8, 0x33, 0x9c, 0x7a, 0xc4, 0xc1, 0x75,
- 0xe7, 0x61, 0x9d, 0x76, 0xfb, 0x32, 0x6e, 0x94, 0xb8, 0xee, 0x11, 0x5e, 0x3d, 0xd5, 0xb5, 0x0c,
- 0x17, 0xfe, 0x88, 0xb8, 0xe3, 0x33, 0xd2, 0x6d, 0x10, 0xe7, 0x66, 0xbc, 0xcb, 0xdf, 0x06, 0x96,
- 0x43, 0xf8, 0xd3, 0x3d, 0x42, 0xca, 0xb7, 0xa3, 0xee, 0x28, 0xe6, 0x2f, 0xff, 0x9c, 0x10, 0x3f,
- 0xac, 0xd8, 0x17, 0xac, 0x63, 0x19, 0x39, 0xba, 0xe7, 0xf4, 0xd3, 0x93, 0x54, 0x30, 0xc9, 0x9a,
- 0x9e, 0xe4, 0x10, 0x57, 0x56, 0xcd, 0x35, 0x25, 0xf3, 0x7b, 0xcc, 0x41, 0xdd, 0x73, 0x12, 0x3d,
- 0x57, 0x75, 0xcf, 0x83, 0x3e, 0xcd, 0x69, 0x86, 0x17, 0x09, 0xc9, 0xcf, 0x0c, 0x7f, 0x9f, 0xc6,
- 0x8f, 0x00, 0xdf, 0xdb, 0x2d, 0xfe, 0x02, 0x96, 0x7e, 0xc1, 0x21, 0x09, 0xeb, 0xa9, 0xd2, 0xf1,
- 0xac, 0xc7, 0x2a, 0x64, 0x4a, 0x64, 0x3d, 0xfe, 0x2d, 0x52, 0xe2, 0xd3, 0x72, 0x9a, 0x94, 0xae,
- 0xad, 0x85, 0x57, 0x1a, 0x13, 0xee, 0x14, 0x81, 0xab, 0x6a, 0xc3, 0x5a, 0xad, 0xa9, 0x71, 0x00,
- 0x8b, 0x56, 0x67, 0x48, 0x45, 0x1d, 0xb2, 0xd5, 0x4b, 0xd7, 0x2e, 0xb6, 0xd3, 0xb4, 0xdd, 0x8d,
- 0x17, 0xdb, 0x69, 0x37, 0x4a, 0xda, 0x8b, 0xe9, 0xa0, 0xbd, 0xc4, 0x2b, 0x5f, 0xda, 0xee, 0xed,
- 0xe0, 0x5f, 0xdb, 0x0b, 0xed, 0x38, 0x59, 0x68, 0xa7, 0x4b, 0x59, 0x3c, 0xcc, 0x76, 0xa2, 0x2c,
- 0xc2, 0x70, 0xf3, 0x9b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0x9c, 0x2d, 0xf1, 0x26, 0x16, 0x00,
- 0x00,
+ 0x61, 0x08, 0xd8, 0x8e, 0xc5, 0x30, 0x80, 0x53, 0xa9, 0x24, 0xae, 0xd8, 0x71, 0x1e, 0x02, 0xc9,
+ 0x04, 0x57, 0xaa, 0x20, 0x55, 0xae, 0xb1, 0x3d, 0x12, 0x0a, 0xd2, 0x8c, 0x90, 0x46, 0x80, 0xbf,
+ 0x45, 0xd6, 0x8f, 0x91, 0x7d, 0x27, 0xe4, 0x03, 0x24, 0xb9, 0xfb, 0x0e, 0xdc, 0x7d, 0x5f, 0x5e,
+ 0xef, 0xbd, 0xcf, 0xb7, 0x4e, 0x9f, 0xee, 0x9e, 0xee, 0x91, 0x1f, 0x6c, 0x3f, 0x61, 0x1d, 0xfd,
+ 0xfb, 0xfc, 0xcf, 0x69, 0xfa, 0x77, 0xd4, 0x33, 0x64, 0xbe, 0x3f, 0x48, 0xb3, 0xb4, 0xb9, 0xd4,
+ 0xea, 0xc4, 0xdd, 0xdd, 0xe1, 0x22, 0xff, 0xe4, 0x1e, 0x6f, 0xa7, 0xfc, 0x0f, 0xfc, 0xb8, 0x83,
+ 0xff, 0x34, 0x4f, 0xde, 0x3f, 0x4b, 0x1a, 0xeb, 0xa0, 0xbb, 0x16, 0x0f, 0xb3, 0x1f, 0xc6, 0xc3,
+ 0x61, 0xd4, 0x8e, 0xdd, 0xaf, 0x90, 0x5a, 0xda, 0xcf, 0x3a, 0x69, 0x12, 0x75, 0xb7, 0xb6, 0xd3,
+ 0xb4, 0x4b, 0x2d, 0x66, 0x79, 0xd3, 0x61, 0x55, 0x06, 0x57, 0xd3, 0xb4, 0xeb, 0xfe, 0x58, 0x13,
+ 0xc5, 0xc9, 0xa8, 0x47, 0x6d, 0x66, 0x79, 0xb3, 0xcd, 0x73, 0x8b, 0xfb, 0x1a, 0x2d, 0x16, 0x4d,
+ 0x16, 0xd7, 0x92, 0x51, 0x2f, 0x4f, 0x09, 0x9f, 0xdc, 0xaf, 0x92, 0x59, 0x95, 0xb2, 0x93, 0x64,
+ 0xe7, 0x9b, 0xd4, 0x61, 0x96, 0x57, 0x0e, 0x95, 0xd1, 0x0f, 0x20, 0xe8, 0x9e, 0x26, 0x75, 0x25,
+ 0x1b, 0xa2, 0xae, 0xc4, 0x2c, 0x6f, 0x2e, 0x54, 0xab, 0x7f, 0xd2, 0x19, 0x13, 0x8e, 0x50, 0x58,
+ 0x66, 0x96, 0x57, 0xcb, 0x85, 0x9b, 0x28, 0x2c, 0x18, 0x07, 0x3e, 0x9d, 0x64, 0x96, 0xe7, 0x18,
+ 0xc6, 0x81, 0x3f, 0x66, 0x1c, 0xf8, 0x74, 0x8a, 0x59, 0x9e, 0x6b, 0x1a, 0x17, 0x84, 0x23, 0x14,
+ 0x4e, 0x33, 0xcb, 0x2b, 0x99, 0xc6, 0x81, 0xef, 0x9e, 0x25, 0x73, 0x79, 0xc6, 0x56, 0xe7, 0x5e,
+ 0xbc, 0x7b, 0xbe, 0x49, 0x2b, 0xcc, 0xf2, 0xea, 0x61, 0x43, 0xe5, 0x14, 0x71, 0xf7, 0x0c, 0x51,
+ 0xb1, 0x2d, 0xa9, 0x25, 0xcc, 0xf2, 0xa6, 0x42, 0xe5, 0xb6, 0x2e, 0xa4, 0x7a, 0x43, 0xad, 0x6e,
+ 0x1a, 0x65, 0x74, 0x86, 0x59, 0x9e, 0x9d, 0x37, 0xb4, 0x0e, 0xc1, 0x7d, 0xec, 0x03, 0x9f, 0x56,
+ 0x99, 0xe5, 0x35, 0x8a, 0xf6, 0x81, 0x3f, 0x6e, 0x1f, 0xf8, 0xb4, 0xc6, 0x2c, 0x6f, 0xb2, 0x60,
+ 0x5f, 0xe8, 0x7f, 0x37, 0x1d, 0x6d, 0x77, 0x63, 0x3a, 0xcb, 0x2c, 0xcf, 0xca, 0xfb, 0xff, 0x1e,
+ 0x8f, 0x9a, 0x3b, 0x9a, 0x0d, 0x3a, 0x49, 0x9b, 0xd6, 0x99, 0xe5, 0x55, 0xb4, 0x1d, 0xe5, 0x51,
+ 0xa3, 0xa1, 0xed, 0xbd, 0x2c, 0x1e, 0xd2, 0x06, 0xb3, 0xbc, 0x6a, 0xde, 0xd0, 0x2a, 0x04, 0xdd,
+ 0xeb, 0x5a, 0x8d, 0xe2, 0xa0, 0xd1, 0x39, 0x66, 0x79, 0x33, 0xcd, 0xa5, 0x83, 0x9e, 0x4b, 0xf1,
+ 0x6f, 0xde, 0x94, 0xa4, 0xe2, 0x46, 0x7e, 0xe0, 0xdb, 0x83, 0x74, 0xd4, 0xa7, 0x2e, 0xb3, 0x3c,
+ 0xd2, 0xbc, 0x70, 0xd0, 0xc4, 0x57, 0xc5, 0xe2, 0xef, 0xc3, 0xe2, 0xd0, 0xcc, 0x05, 0xc8, 0x0d,
+ 0xe2, 0xdb, 0xa3, 0xce, 0x20, 0xde, 0x45, 0xe4, 0x62, 0x66, 0x03, 0x72, 0x32, 0x28, 0x91, 0x53,
+ 0x22, 0x8e, 0x5c, 0x8b, 0xd9, 0x87, 0x47, 0x4e, 0xa6, 0x90, 0xc8, 0xa9, 0x94, 0x48, 0x48, 0x9b,
+ 0xd9, 0x80, 0x9c, 0x8c, 0x2a, 0xe4, 0x94, 0x4c, 0x20, 0x77, 0x93, 0xd9, 0x80, 0x9c, 0x0c, 0xe7,
+ 0xc8, 0x29, 0xa1, 0x40, 0xae, 0xc3, 0x6c, 0x40, 0x4e, 0x86, 0x73, 0xe4, 0x74, 0xe3, 0xc0, 0xa7,
+ 0x3f, 0x67, 0x36, 0x20, 0xa7, 0x19, 0xe3, 0x49, 0x32, 0x8c, 0x03, 0x9f, 0xde, 0x62, 0x36, 0x20,
+ 0xa7, 0x1b, 0x17, 0x84, 0x02, 0xb9, 0x2e, 0xb3, 0x01, 0x39, 0xdd, 0x18, 0x91, 0xcb, 0x33, 0x4a,
+ 0x8c, 0x7a, 0xcc, 0x06, 0xe4, 0x54, 0x4e, 0x0d, 0x39, 0x25, 0x96, 0xda, 0x84, 0xd9, 0x80, 0x9c,
+ 0x8c, 0x6b, 0xc8, 0xe5, 0x52, 0x8e, 0x5c, 0xca, 0x6c, 0x40, 0x4e, 0x09, 0x25, 0x72, 0x05, 0xfb,
+ 0xc0, 0xa7, 0x7d, 0x66, 0x03, 0x72, 0xa6, 0x3d, 0x22, 0x67, 0xda, 0x07, 0x3e, 0xbd, 0xcd, 0x6c,
+ 0x40, 0xce, 0xb0, 0x2f, 0xf4, 0x2f, 0x90, 0x1b, 0x30, 0x1b, 0x90, 0x93, 0xe1, 0x1c, 0xb9, 0xbc,
+ 0x00, 0x44, 0x6e, 0xc8, 0x6c, 0x40, 0x4e, 0xd9, 0x2b, 0xe4, 0xf2, 0x23, 0xc9, 0x91, 0xcb, 0x98,
+ 0x0d, 0xc8, 0xa9, 0x33, 0x29, 0x91, 0x53, 0x32, 0x89, 0xdc, 0x88, 0xd9, 0x47, 0x42, 0x4e, 0x26,
+ 0xd2, 0x90, 0x93, 0x21, 0x44, 0xee, 0x0e, 0xb3, 0x0f, 0x83, 0x5c, 0x28, 0x16, 0x0b, 0xe4, 0x8c,
+ 0x5c, 0xee, 0x29, 0x48, 0xde, 0x8f, 0xa3, 0x4c, 0x22, 0xf7, 0x5f, 0x8b, 0x39, 0xc8, 0x1c, 0x46,
+ 0x39, 0x73, 0xa1, 0xa6, 0xe2, 0xcc, 0xfd, 0x0f, 0x54, 0x47, 0x80, 0x0e, 0x73, 0x70, 0xe8, 0xbe,
+ 0x06, 0x3b, 0x2b, 0x72, 0x22, 0x23, 0xff, 0x87, 0xa4, 0x9c, 0x3a, 0x0c, 0x23, 0x75, 0x1e, 0xfc,
+ 0x57, 0x09, 0x9d, 0xa0, 0xee, 0x09, 0x10, 0x72, 0xec, 0x30, 0x2e, 0xb0, 0xd3, 0x95, 0x02, 0xbb,
+ 0x27, 0x41, 0x59, 0xcb, 0x95, 0x82, 0xbb, 0x82, 0x77, 0xe0, 0xd3, 0xa7, 0x40, 0xe8, 0x18, 0xde,
+ 0x81, 0x3f, 0xe6, 0x1d, 0xf8, 0xf4, 0x69, 0x10, 0xba, 0xa6, 0x77, 0x41, 0x29, 0xc8, 0x7b, 0x06,
+ 0x94, 0x25, 0xd3, 0x3b, 0xf0, 0xdd, 0x73, 0x70, 0xf6, 0x65, 0x4e, 0x89, 0xd3, 0xb3, 0xa0, 0xe5,
+ 0xec, 0x89, 0xac, 0x92, 0xbd, 0xaf, 0x13, 0x15, 0x53, 0xec, 0x3d, 0x07, 0x62, 0x0e, 0x1f, 0x7e,
+ 0x21, 0xe1, 0xd3, 0xbb, 0x42, 0xf8, 0x9e, 0x07, 0xa5, 0x9d, 0x77, 0x85, 0xf4, 0x8d, 0x57, 0x10,
+ 0xf8, 0xf4, 0x05, 0x90, 0x36, 0x8a, 0x15, 0x04, 0xfe, 0x78, 0x05, 0x81, 0x4f, 0x5f, 0x04, 0xf1,
+ 0x64, 0xa1, 0x82, 0xc2, 0x2e, 0x08, 0xfe, 0x5e, 0x02, 0xa9, 0x95, 0xef, 0x82, 0x00, 0xd0, 0xd8,
+ 0x59, 0x04, 0xf0, 0x65, 0x50, 0x56, 0xb4, 0x9d, 0x45, 0x02, 0xf5, 0xae, 0x90, 0xc0, 0x57, 0x40,
+ 0x58, 0xcd, 0xbb, 0x42, 0x04, 0x6f, 0x68, 0x75, 0x4a, 0x04, 0x1f, 0x82, 0xf2, 0x68, 0x0c, 0x62,
+ 0x26, 0xc9, 0xe0, 0xcf, 0x72, 0x00, 0x90, 0xc1, 0x47, 0x90, 0xf9, 0x50, 0x10, 0xe2, 0x6a, 0x05,
+ 0xa1, 0x96, 0xcc, 0xf5, 0x48, 0x75, 0x37, 0x6e, 0x45, 0xa3, 0x6e, 0x86, 0x0c, 0xfe, 0x0e, 0x6e,
+ 0x91, 0xd3, 0x2b, 0xa5, 0x6c, 0x30, 0x8a, 0xc3, 0x19, 0xf1, 0x15, 0x07, 0x71, 0x33, 0x57, 0x72,
+ 0x0e, 0x7f, 0x7f, 0x84, 0xfb, 0xe6, 0x8a, 0x73, 0xf5, 0xca, 0x9a, 0x4a, 0xcb, 0x59, 0x3c, 0x4d,
+ 0x6a, 0x32, 0x2d, 0x72, 0xf3, 0x07, 0xc8, 0x5b, 0x5e, 0xb1, 0x96, 0x43, 0xe9, 0x87, 0x30, 0x9e,
+ 0x21, 0xb3, 0x52, 0x28, 0x58, 0xfc, 0x23, 0x28, 0xe7, 0x40, 0x29, 0x53, 0x08, 0x1a, 0x35, 0xa9,
+ 0x80, 0xf1, 0x4f, 0x20, 0xad, 0xe9, 0xd2, 0x4d, 0xf9, 0x7b, 0xa9, 0xdb, 0x07, 0x3e, 0xfd, 0x33,
+ 0x28, 0x9d, 0x82, 0x3d, 0xff, 0x29, 0x30, 0xec, 0x03, 0x9f, 0xfe, 0x05, 0x94, 0x6e, 0xd1, 0xde,
+ 0x94, 0x0a, 0x1e, 0xff, 0x0a, 0xd2, 0x52, 0xd1, 0x3e, 0xf0, 0xdd, 0x05, 0xd2, 0x50, 0x59, 0x25,
+ 0x63, 0x7f, 0x03, 0x71, 0x1d, 0xc4, 0x75, 0x99, 0x57, 0x22, 0x79, 0x96, 0xc8, 0x90, 0x22, 0xf2,
+ 0xef, 0xa0, 0x9e, 0x02, 0xb5, 0x34, 0x5d, 0x57, 0xbf, 0x9d, 0xaa, 0x35, 0x44, 0xf2, 0x1f, 0x20,
+ 0xb5, 0x57, 0x9c, 0xe5, 0xc5, 0x0b, 0xaa, 0x39, 0xc4, 0x72, 0xac, 0x8c, 0xc0, 0xa7, 0xff, 0x04,
+ 0x75, 0x63, 0xbc, 0x0c, 0xfe, 0x13, 0x6e, 0x96, 0x11, 0xf8, 0xf4, 0x5f, 0xa0, 0x9e, 0x1c, 0x2b,
+ 0x83, 0x8b, 0xd5, 0x6e, 0x08, 0x2e, 0xef, 0x83, 0xd6, 0xc2, 0x3a, 0x64, 0x89, 0x82, 0x4d, 0x4d,
+ 0x2c, 0xd0, 0xfc, 0x37, 0x88, 0x2b, 0x2b, 0xce, 0xbd, 0x73, 0x7b, 0xf9, 0x3e, 0x23, 0x9e, 0x5a,
+ 0x83, 0x48, 0xe7, 0x03, 0xd0, 0x56, 0x51, 0x2b, 0x1b, 0x44, 0x42, 0x2f, 0x92, 0x63, 0xc6, 0x5e,
+ 0x6c, 0x25, 0x71, 0xbb, 0x93, 0xb4, 0xe8, 0x2f, 0x1c, 0xbe, 0x25, 0xa5, 0x85, 0x4e, 0xd2, 0x0a,
+ 0x5d, 0x7d, 0x4f, 0xae, 0x70, 0x81, 0x1b, 0x14, 0x17, 0xf6, 0xd3, 0x21, 0x2c, 0xfc, 0x25, 0x2e,
+ 0x74, 0xc6, 0xd6, 0xfd, 0x88, 0x7f, 0xef, 0x7e, 0x83, 0xcc, 0x15, 0x0c, 0xa3, 0x84, 0xfe, 0x4a,
+ 0x2c, 0x4a, 0xa2, 0x44, 0x6d, 0x2a, 0x9a, 0x45, 0x89, 0x7b, 0x99, 0x1c, 0x37, 0xf7, 0x49, 0xd6,
+ 0xf8, 0x6b, 0x87, 0x6f, 0x17, 0xd6, 0x38, 0x6f, 0xec, 0x97, 0x28, 0xf2, 0xd2, 0xd8, 0x52, 0x51,
+ 0xe5, 0x6f, 0x70, 0xa9, 0x33, 0xbe, 0x52, 0x94, 0xd9, 0x24, 0x6e, 0xd1, 0x34, 0x4a, 0xe8, 0x6f,
+ 0xc5, 0x32, 0xa8, 0xb3, 0x61, 0x1a, 0x46, 0x89, 0xbb, 0x43, 0xea, 0xbd, 0xa8, 0x8f, 0xb4, 0x0a,
+ 0x68, 0x3e, 0x75, 0xf8, 0xb0, 0x5b, 0x39, 0xf0, 0xb0, 0x8b, 0xfa, 0x1c, 0x6a, 0x8e, 0xd6, 0x5a,
+ 0x92, 0x0d, 0xf6, 0xc2, 0x5a, 0x4f, 0x8f, 0xb9, 0x5d, 0xe2, 0x82, 0x09, 0x1e, 0x82, 0xad, 0x9e,
+ 0x18, 0xaa, 0x9f, 0xa1, 0xcf, 0xb7, 0x0e, 0xe1, 0x83, 0x67, 0x45, 0x04, 0xd0, 0xaa, 0xd1, 0x2b,
+ 0x84, 0xdd, 0x16, 0x81, 0x98, 0x3c, 0xcc, 0x38, 0xdf, 0x3e, 0x47, 0xaf, 0x6f, 0x1e, 0xc2, 0x4b,
+ 0x1c, 0x79, 0x98, 0x6b, 0xe8, 0x34, 0xdb, 0x33, 0x82, 0x2e, 0x23, 0x24, 0x4d, 0xe2, 0xb4, 0x85,
+ 0xb3, 0xf6, 0x21, 0x3c, 0x35, 0x4f, 0x6f, 0x4c, 0x84, 0x15, 0x1e, 0xe4, 0x53, 0xf6, 0x8a, 0x54,
+ 0xf0, 0x1a, 0x1e, 0x95, 0x0e, 0x3f, 0x63, 0x55, 0x3e, 0xee, 0x78, 0x92, 0xcc, 0x60, 0x3e, 0x9c,
+ 0x83, 0x8f, 0x21, 0x61, 0x79, 0x63, 0x22, 0x44, 0x17, 0x9c, 0xac, 0xa7, 0x48, 0x15, 0x35, 0x62,
+ 0xae, 0xbe, 0xca, 0x9f, 0xe6, 0x37, 0x26, 0x42, 0x5c, 0x2a, 0x86, 0xaa, 0x52, 0x89, 0x91, 0xfa,
+ 0x1a, 0xa8, 0x6a, 0x4a, 0x25, 0xe6, 0xa9, 0xee, 0x17, 0xf8, 0xf4, 0x75, 0x10, 0x39, 0xba, 0x5f,
+ 0xe0, 0x9b, 0x7e, 0x81, 0x4f, 0xdf, 0x00, 0x91, 0x6b, 0xf8, 0xe9, 0x2a, 0x31, 0x43, 0xdf, 0x04,
+ 0x55, 0xc9, 0xf0, 0xe3, 0x3f, 0xfb, 0xb3, 0x22, 0x97, 0x1c, 0x88, 0x6f, 0x81, 0xae, 0xbe, 0x31,
+ 0x11, 0xd6, 0x30, 0x5b, 0x4b, 0x5d, 0x51, 0x30, 0xa0, 0x26, 0xe7, 0xdb, 0x20, 0x9c, 0xda, 0x98,
+ 0x08, 0xd1, 0x47, 0x8e, 0x4d, 0xd5, 0x01, 0x0e, 0xcd, 0x77, 0x40, 0x65, 0xab, 0x0e, 0x70, 0x5e,
+ 0x16, 0x5c, 0x03, 0x9f, 0xbe, 0x0b, 0xb2, 0x46, 0xc1, 0x35, 0xf0, 0x0b, 0xae, 0x81, 0x4f, 0xdf,
+ 0x03, 0xe1, 0xa4, 0xe9, 0xaa, 0x77, 0x2b, 0x66, 0xe4, 0xfb, 0x20, 0xb3, 0x54, 0xb7, 0x62, 0x3c,
+ 0xe6, 0x3b, 0x87, 0xc3, 0xf1, 0x03, 0x50, 0x55, 0xf2, 0x9d, 0xc3, 0xb9, 0xa8, 0x3a, 0xc0, 0xa9,
+ 0xf8, 0x21, 0x88, 0xaa, 0xaa, 0x03, 0x1c, 0x88, 0x3f, 0x95, 0x75, 0xc9, 0xfb, 0xca, 0x47, 0xa5,
+ 0x23, 0x3d, 0xa6, 0xab, 0x46, 0x24, 0x4a, 0x9b, 0xe2, 0x00, 0xe3, 0x5d, 0xe5, 0xe3, 0x12, 0x7f,
+ 0x46, 0x6f, 0x1e, 0xf8, 0x19, 0x1d, 0x96, 0xf2, 0x8b, 0x8a, 0xaa, 0x17, 0xef, 0x29, 0x5f, 0x96,
+ 0x3d, 0x65, 0x77, 0xd3, 0xad, 0x65, 0xfa, 0xa0, 0xcc, 0xcf, 0xb1, 0x25, 0x8e, 0xfa, 0xb5, 0xbb,
+ 0xe9, 0xb2, 0x29, 0x69, 0xd2, 0xff, 0x94, 0xf9, 0xd1, 0xd3, 0x24, 0xcd, 0x13, 0x01, 0xa9, 0x19,
+ 0x6f, 0x01, 0x8c, 0xd7, 0x1a, 0x58, 0xf1, 0x3c, 0x7f, 0xfd, 0xa1, 0xde, 0x0e, 0x70, 0x19, 0xac,
+ 0x33, 0x1e, 0x65, 0x8c, 0x67, 0x33, 0x5c, 0x77, 0x97, 0x3f, 0xc3, 0xa9, 0x47, 0x1c, 0x5c, 0x77,
+ 0x11, 0xd6, 0x69, 0xb7, 0x2f, 0xe3, 0x46, 0x89, 0xeb, 0x1e, 0xe3, 0xd5, 0x53, 0x5d, 0xcb, 0x70,
+ 0xe1, 0x77, 0x88, 0x3b, 0x3e, 0x23, 0xdd, 0x06, 0x71, 0x6e, 0xc5, 0x7b, 0xfc, 0x6d, 0x60, 0x39,
+ 0x84, 0x3f, 0xdd, 0x63, 0xa4, 0x7c, 0x27, 0xea, 0x8e, 0x62, 0xfe, 0xf2, 0xcf, 0x09, 0xf1, 0xc3,
+ 0x8a, 0x7d, 0xc9, 0x3a, 0x91, 0x91, 0xe3, 0xfb, 0x4e, 0x3f, 0x3d, 0x49, 0x05, 0x93, 0xac, 0xe9,
+ 0x49, 0x8e, 0x70, 0x65, 0xd5, 0x5c, 0x53, 0x32, 0xbf, 0xcf, 0x1c, 0xd4, 0x3d, 0x27, 0xd1, 0x73,
+ 0x55, 0xf7, 0x3c, 0xec, 0xd3, 0x9c, 0x66, 0x78, 0x99, 0x90, 0xfc, 0xcc, 0xf0, 0xf7, 0x69, 0xfc,
+ 0x08, 0xf0, 0xbd, 0xdd, 0xe2, 0x2f, 0x60, 0xe9, 0x27, 0x1c, 0x92, 0xb0, 0x9e, 0x2a, 0x1d, 0xcf,
+ 0x7a, 0xa2, 0x42, 0xa6, 0x44, 0xd6, 0x93, 0x5f, 0x22, 0x25, 0x3e, 0x2d, 0xa7, 0x49, 0xe9, 0xfa,
+ 0x5a, 0x78, 0xb5, 0x31, 0xe1, 0x4e, 0x11, 0xb8, 0xaa, 0x36, 0xac, 0xd5, 0x9a, 0x1a, 0x07, 0xb0,
+ 0x68, 0x75, 0x86, 0x54, 0xd4, 0x21, 0x5b, 0xfd, 0xee, 0xf5, 0x6f, 0xb7, 0x3b, 0xd9, 0xcd, 0xd1,
+ 0xf6, 0xe2, 0x4e, 0xda, 0x5b, 0x6a, 0xa7, 0xdd, 0x28, 0x69, 0x2f, 0xf1, 0xca, 0xb7, 0x47, 0xad,
+ 0xa5, 0x3b, 0xcd, 0xa5, 0x9d, 0xde, 0x2e, 0x7e, 0xde, 0x59, 0x68, 0xc7, 0xc9, 0x42, 0x3b, 0x5d,
+ 0xca, 0xe2, 0x61, 0xb6, 0x1b, 0x65, 0x11, 0x86, 0x9b, 0x5f, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc5,
+ 0xb1, 0xdf, 0x80, 0x2c, 0x16, 0x00, 0x00,
}
diff --git a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
index 1daa2eb..0f8b3ee 100644
--- a/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/nested_messages.pb.go
@@ -146,7 +146,7 @@
func init() { proto.RegisterFile("proto2/nested_messages.proto", fileDescriptor_7417ee157699d191) }
var fileDescriptor_7417ee157699d191 = []byte{
- // 184 bytes of a gzipped FileDescriptorProto
+ // 190 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x28, 0xca, 0x2f,
0xc9, 0x37, 0xd2, 0xcf, 0x4b, 0x2d, 0x2e, 0x49, 0x4d, 0x89, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c,
0x4f, 0x2d, 0xd6, 0x03, 0x0b, 0x0b, 0x89, 0xa6, 0xe7, 0x83, 0x19, 0x10, 0x6e, 0x32, 0x84, 0x32,
@@ -154,9 +154,9 @@
0x63, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0xa4, 0xa2, 0x87, 0x55, 0xb9, 0x1e, 0x44, 0x29,
0x84, 0x32, 0x0a, 0x62, 0xca, 0x31, 0x12, 0xb2, 0xe6, 0x62, 0xca, 0x31, 0x96, 0x60, 0x02, 0xeb,
0xd2, 0x26, 0x46, 0x17, 0x84, 0x32, 0x0e, 0x62, 0xca, 0x31, 0x96, 0xf2, 0x87, 0x5a, 0x0e, 0x33,
- 0x86, 0x91, 0x3c, 0x63, 0x38, 0xa0, 0xc6, 0x18, 0x3b, 0x59, 0x47, 0x59, 0xa6, 0xe7, 0xe7, 0xa7,
- 0xe7, 0xa4, 0xea, 0xa5, 0xe7, 0xe7, 0x24, 0xe6, 0xa5, 0xeb, 0xe5, 0x17, 0xa5, 0xeb, 0x83, 0xb5,
- 0xeb, 0x27, 0xe7, 0xa6, 0x40, 0x58, 0xc9, 0xba, 0xe9, 0xa9, 0x79, 0xba, 0xe9, 0xf9, 0xfa, 0x25,
- 0xa9, 0xc5, 0x25, 0x29, 0x89, 0x25, 0x89, 0x10, 0x61, 0x23, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff,
- 0x47, 0x0d, 0xa3, 0x19, 0x41, 0x01, 0x00, 0x00,
+ 0x86, 0x91, 0x3c, 0x63, 0x38, 0xa0, 0xc6, 0x18, 0x3b, 0x39, 0x46, 0xd9, 0xa7, 0x67, 0x96, 0x64,
+ 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xe7, 0x24, 0xe6, 0xa5, 0xeb, 0x83, 0xb5,
+ 0x27, 0x95, 0xa6, 0xe9, 0x97, 0x19, 0xe9, 0x27, 0xe7, 0xa6, 0x40, 0xf8, 0xc9, 0xba, 0xe9, 0xa9,
+ 0x79, 0xba, 0xe9, 0xf9, 0xfa, 0x25, 0xa9, 0xc5, 0x25, 0x29, 0x89, 0x25, 0x89, 0x10, 0x61, 0x23,
+ 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x11, 0x21, 0xb0, 0x06, 0x47, 0x01, 0x00, 0x00,
}
diff --git a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
index a912199..1cb5191 100644
--- a/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
+++ b/cmd/protoc-gen-go/testdata/proto2/proto2.pb.go
@@ -74,15 +74,15 @@
func init() { proto.RegisterFile("proto2/proto2.proto", fileDescriptor_d756bbe8817c03c1) }
var fileDescriptor_d756bbe8817c03c1 = []byte{
- // 146 bytes of a gzipped FileDescriptorProto
+ // 152 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x28, 0xca, 0x2f,
0xc9, 0x37, 0xd2, 0x87, 0x50, 0x7a, 0x60, 0x4a, 0x48, 0x34, 0x3d, 0x1f, 0xcc, 0x80, 0x70, 0x93,
0x21, 0x94, 0x91, 0x92, 0x27, 0x17, 0xbb, 0x6f, 0x6a, 0x71, 0x71, 0x62, 0x7a, 0xaa, 0x90, 0x00,
0x17, 0x73, 0xa6, 0xb1, 0x91, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x6b, 0x10, 0x88, 0x29, 0xa4, 0xc3,
0xc5, 0x98, 0x2b, 0xc1, 0xa4, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa7, 0x87, 0x55, 0xbf, 0x1e, 0x54,
- 0x73, 0x10, 0x63, 0xae, 0x93, 0x75, 0x94, 0x65, 0x7a, 0x7e, 0x7e, 0x7a, 0x4e, 0xaa, 0x5e, 0x7a,
- 0x7e, 0x4e, 0x62, 0x5e, 0xba, 0x5e, 0x7e, 0x51, 0x3a, 0xc4, 0x0d, 0xfa, 0xc9, 0xb9, 0x29, 0x10,
- 0x56, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e, 0x6e, 0x7a, 0xbe, 0x7e, 0x49, 0x6a, 0x71, 0x49, 0x4a, 0x62,
- 0x49, 0x22, 0xd4, 0x91, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x68, 0x66, 0x37, 0xb4, 0x00,
- 0x00, 0x00,
+ 0x73, 0x10, 0x63, 0xae, 0x93, 0x63, 0x94, 0x7d, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72,
+ 0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x4e, 0x62, 0x5e, 0x3a, 0xc4, 0x0d, 0x49, 0xa5, 0x69, 0xfa, 0x65,
+ 0x46, 0xfa, 0xc9, 0xb9, 0x29, 0x10, 0x7e, 0xb2, 0x6e, 0x7a, 0x6a, 0x9e, 0x6e, 0x7a, 0xbe, 0x7e,
+ 0x49, 0x6a, 0x71, 0x49, 0x4a, 0x62, 0x49, 0x22, 0xd4, 0xa9, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff,
+ 0x85, 0x42, 0x0d, 0x5f, 0xba, 0x00, 0x00, 0x00,
}