Index: third_party/protobuf/csharp/src/Google.Protobuf/Reflection/Descriptor.cs |
diff --git a/third_party/protobuf/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/third_party/protobuf/csharp/src/Google.Protobuf/Reflection/Descriptor.cs |
index d29424ada46e2aa9f28a71a0ca3b97e065469fbd..fa138dfe912cac2c4a9a74a6f63690d65d06cf42 100644 |
--- a/third_party/protobuf/csharp/src/Google.Protobuf/Reflection/Descriptor.cs |
+++ b/third_party/protobuf/csharp/src/Google.Protobuf/Reflection/Descriptor.cs |
@@ -80,7 +80,7 @@ namespace Google.Protobuf.Reflection { |
"EhMKC291dHB1dF90eXBlGAMgASgJEi8KB29wdGlvbnMYBCABKAsyHi5nb29n", |
"bGUucHJvdG9idWYuTWV0aG9kT3B0aW9ucxIfChBjbGllbnRfc3RyZWFtaW5n", |
"GAUgASgIOgVmYWxzZRIfChBzZXJ2ZXJfc3RyZWFtaW5nGAYgASgIOgVmYWxz", |
- "ZSKqBQoLRmlsZU9wdGlvbnMSFAoMamF2YV9wYWNrYWdlGAEgASgJEhwKFGph", |
+ "ZSKHBQoLRmlsZU9wdGlvbnMSFAoMamF2YV9wYWNrYWdlGAEgASgJEhwKFGph", |
"dmFfb3V0ZXJfY2xhc3NuYW1lGAggASgJEiIKE2phdmFfbXVsdGlwbGVfZmls", |
"ZXMYCiABKAg6BWZhbHNlEiwKHWphdmFfZ2VuZXJhdGVfZXF1YWxzX2FuZF9o", |
"YXNoGBQgASgIOgVmYWxzZRIlChZqYXZhX3N0cmluZ19jaGVja191dGY4GBsg", |
@@ -91,72 +91,76 @@ namespace Google.Protobuf.Reflection { |
"cHlfZ2VuZXJpY19zZXJ2aWNlcxgSIAEoCDoFZmFsc2USGQoKZGVwcmVjYXRl", |
"ZBgXIAEoCDoFZmFsc2USHwoQY2NfZW5hYmxlX2FyZW5hcxgfIAEoCDoFZmFs", |
"c2USGQoRb2JqY19jbGFzc19wcmVmaXgYJCABKAkSGAoQY3NoYXJwX25hbWVz", |
- "cGFjZRglIAEoCRInCh9qYXZhbmFub191c2VfZGVwcmVjYXRlZF9wYWNrYWdl", |
- "GCYgASgIEkMKFHVuaW50ZXJwcmV0ZWRfb3B0aW9uGOcHIAMoCzIkLmdvb2ds", |
- "ZS5wcm90b2J1Zi5VbmludGVycHJldGVkT3B0aW9uIjoKDE9wdGltaXplTW9k", |
- "ZRIJCgVTUEVFRBABEg0KCUNPREVfU0laRRACEhAKDExJVEVfUlVOVElNRRAD", |
- "KgkI6AcQgICAgAIi5gEKDk1lc3NhZ2VPcHRpb25zEiYKF21lc3NhZ2Vfc2V0", |
- "X3dpcmVfZm9ybWF0GAEgASgIOgVmYWxzZRIuCh9ub19zdGFuZGFyZF9kZXNj", |
- "cmlwdG9yX2FjY2Vzc29yGAIgASgIOgVmYWxzZRIZCgpkZXByZWNhdGVkGAMg", |
- "ASgIOgVmYWxzZRIRCgltYXBfZW50cnkYByABKAgSQwoUdW5pbnRlcnByZXRl", |
- "ZF9vcHRpb24Y5wcgAygLMiQuZ29vZ2xlLnByb3RvYnVmLlVuaW50ZXJwcmV0", |
- "ZWRPcHRpb24qCQjoBxCAgICAAiKYAwoMRmllbGRPcHRpb25zEjoKBWN0eXBl", |
- "GAEgASgOMiMuZ29vZ2xlLnByb3RvYnVmLkZpZWxkT3B0aW9ucy5DVHlwZToG", |
- "U1RSSU5HEg4KBnBhY2tlZBgCIAEoCBI/CgZqc3R5cGUYBiABKA4yJC5nb29n", |
- "bGUucHJvdG9idWYuRmllbGRPcHRpb25zLkpTVHlwZToJSlNfTk9STUFMEhMK", |
- "BGxhenkYBSABKAg6BWZhbHNlEhkKCmRlcHJlY2F0ZWQYAyABKAg6BWZhbHNl", |
- "EhMKBHdlYWsYCiABKAg6BWZhbHNlEkMKFHVuaW50ZXJwcmV0ZWRfb3B0aW9u", |
- "GOcHIAMoCzIkLmdvb2dsZS5wcm90b2J1Zi5VbmludGVycHJldGVkT3B0aW9u", |
- "Ii8KBUNUeXBlEgoKBlNUUklORxAAEggKBENPUkQQARIQCgxTVFJJTkdfUElF", |
- "Q0UQAiI1CgZKU1R5cGUSDQoJSlNfTk9STUFMEAASDQoJSlNfU1RSSU5HEAES", |
- "DQoJSlNfTlVNQkVSEAIqCQjoBxCAgICAAiKNAQoLRW51bU9wdGlvbnMSEwoL", |
- "YWxsb3dfYWxpYXMYAiABKAgSGQoKZGVwcmVjYXRlZBgDIAEoCDoFZmFsc2US", |
- "QwoUdW5pbnRlcnByZXRlZF9vcHRpb24Y5wcgAygLMiQuZ29vZ2xlLnByb3Rv", |
- "YnVmLlVuaW50ZXJwcmV0ZWRPcHRpb24qCQjoBxCAgICAAiJ9ChBFbnVtVmFs", |
- "dWVPcHRpb25zEhkKCmRlcHJlY2F0ZWQYASABKAg6BWZhbHNlEkMKFHVuaW50", |
+ "cGFjZRglIAEoCRJDChR1bmludGVycHJldGVkX29wdGlvbhjnByADKAsyJC5n", |
+ "b29nbGUucHJvdG9idWYuVW5pbnRlcnByZXRlZE9wdGlvbiI6CgxPcHRpbWl6", |
+ "ZU1vZGUSCQoFU1BFRUQQARINCglDT0RFX1NJWkUQAhIQCgxMSVRFX1JVTlRJ", |
+ "TUUQAyoJCOgHEICAgIACSgQIJhAnIuYBCg5NZXNzYWdlT3B0aW9ucxImChdt", |
+ "ZXNzYWdlX3NldF93aXJlX2Zvcm1hdBgBIAEoCDoFZmFsc2USLgofbm9fc3Rh", |
+ "bmRhcmRfZGVzY3JpcHRvcl9hY2Nlc3NvchgCIAEoCDoFZmFsc2USGQoKZGVw", |
+ "cmVjYXRlZBgDIAEoCDoFZmFsc2USEQoJbWFwX2VudHJ5GAcgASgIEkMKFHVu", |
+ "aW50ZXJwcmV0ZWRfb3B0aW9uGOcHIAMoCzIkLmdvb2dsZS5wcm90b2J1Zi5V", |
+ "bmludGVycHJldGVkT3B0aW9uKgkI6AcQgICAgAIimAMKDEZpZWxkT3B0aW9u", |
+ "cxI6CgVjdHlwZRgBIAEoDjIjLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE9wdGlv", |
+ "bnMuQ1R5cGU6BlNUUklORxIOCgZwYWNrZWQYAiABKAgSPwoGanN0eXBlGAYg", |
+ "ASgOMiQuZ29vZ2xlLnByb3RvYnVmLkZpZWxkT3B0aW9ucy5KU1R5cGU6CUpT", |
+ "X05PUk1BTBITCgRsYXp5GAUgASgIOgVmYWxzZRIZCgpkZXByZWNhdGVkGAMg", |
+ "ASgIOgVmYWxzZRITCgR3ZWFrGAogASgIOgVmYWxzZRJDChR1bmludGVycHJl", |
+ "dGVkX29wdGlvbhjnByADKAsyJC5nb29nbGUucHJvdG9idWYuVW5pbnRlcnBy", |
+ "ZXRlZE9wdGlvbiIvCgVDVHlwZRIKCgZTVFJJTkcQABIICgRDT1JEEAESEAoM", |
+ "U1RSSU5HX1BJRUNFEAIiNQoGSlNUeXBlEg0KCUpTX05PUk1BTBAAEg0KCUpT", |
+ "X1NUUklORxABEg0KCUpTX05VTUJFUhACKgkI6AcQgICAgAIijQEKC0VudW1P", |
+ "cHRpb25zEhMKC2FsbG93X2FsaWFzGAIgASgIEhkKCmRlcHJlY2F0ZWQYAyAB", |
+ "KAg6BWZhbHNlEkMKFHVuaW50ZXJwcmV0ZWRfb3B0aW9uGOcHIAMoCzIkLmdv", |
+ "b2dsZS5wcm90b2J1Zi5VbmludGVycHJldGVkT3B0aW9uKgkI6AcQgICAgAIi", |
+ "fQoQRW51bVZhbHVlT3B0aW9ucxIZCgpkZXByZWNhdGVkGAEgASgIOgVmYWxz", |
+ "ZRJDChR1bmludGVycHJldGVkX29wdGlvbhjnByADKAsyJC5nb29nbGUucHJv", |
+ "dG9idWYuVW5pbnRlcnByZXRlZE9wdGlvbioJCOgHEICAgIACInsKDlNlcnZp", |
+ "Y2VPcHRpb25zEhkKCmRlcHJlY2F0ZWQYISABKAg6BWZhbHNlEkMKFHVuaW50", |
"ZXJwcmV0ZWRfb3B0aW9uGOcHIAMoCzIkLmdvb2dsZS5wcm90b2J1Zi5Vbmlu", |
- "dGVycHJldGVkT3B0aW9uKgkI6AcQgICAgAIiewoOU2VydmljZU9wdGlvbnMS", |
- "GQoKZGVwcmVjYXRlZBghIAEoCDoFZmFsc2USQwoUdW5pbnRlcnByZXRlZF9v", |
- "cHRpb24Y5wcgAygLMiQuZ29vZ2xlLnByb3RvYnVmLlVuaW50ZXJwcmV0ZWRP", |
- "cHRpb24qCQjoBxCAgICAAiJ6Cg1NZXRob2RPcHRpb25zEhkKCmRlcHJlY2F0", |
- "ZWQYISABKAg6BWZhbHNlEkMKFHVuaW50ZXJwcmV0ZWRfb3B0aW9uGOcHIAMo", |
- "CzIkLmdvb2dsZS5wcm90b2J1Zi5VbmludGVycHJldGVkT3B0aW9uKgkI6AcQ", |
- "gICAgAIingIKE1VuaW50ZXJwcmV0ZWRPcHRpb24SOwoEbmFtZRgCIAMoCzIt", |
- "Lmdvb2dsZS5wcm90b2J1Zi5VbmludGVycHJldGVkT3B0aW9uLk5hbWVQYXJ0", |
- "EhgKEGlkZW50aWZpZXJfdmFsdWUYAyABKAkSGgoScG9zaXRpdmVfaW50X3Zh", |
- "bHVlGAQgASgEEhoKEm5lZ2F0aXZlX2ludF92YWx1ZRgFIAEoAxIUCgxkb3Vi", |
- "bGVfdmFsdWUYBiABKAESFAoMc3RyaW5nX3ZhbHVlGAcgASgMEhcKD2FnZ3Jl", |
- "Z2F0ZV92YWx1ZRgIIAEoCRozCghOYW1lUGFydBIRCgluYW1lX3BhcnQYASAC", |
- "KAkSFAoMaXNfZXh0ZW5zaW9uGAIgAigIItUBCg5Tb3VyY2VDb2RlSW5mbxI6", |
- "Cghsb2NhdGlvbhgBIAMoCzIoLmdvb2dsZS5wcm90b2J1Zi5Tb3VyY2VDb2Rl", |
- "SW5mby5Mb2NhdGlvbhqGAQoITG9jYXRpb24SEAoEcGF0aBgBIAMoBUICEAES", |
- "EAoEc3BhbhgCIAMoBUICEAESGAoQbGVhZGluZ19jb21tZW50cxgDIAEoCRIZ", |
- "ChF0cmFpbGluZ19jb21tZW50cxgEIAEoCRIhChlsZWFkaW5nX2RldGFjaGVk", |
- "X2NvbW1lbnRzGAYgAygJQlgKE2NvbS5nb29nbGUucHJvdG9idWZCEERlc2Ny", |
+ "dGVycHJldGVkT3B0aW9uKgkI6AcQgICAgAIiegoNTWV0aG9kT3B0aW9ucxIZ", |
+ "CgpkZXByZWNhdGVkGCEgASgIOgVmYWxzZRJDChR1bmludGVycHJldGVkX29w", |
+ "dGlvbhjnByADKAsyJC5nb29nbGUucHJvdG9idWYuVW5pbnRlcnByZXRlZE9w", |
+ "dGlvbioJCOgHEICAgIACIp4CChNVbmludGVycHJldGVkT3B0aW9uEjsKBG5h", |
+ "bWUYAiADKAsyLS5nb29nbGUucHJvdG9idWYuVW5pbnRlcnByZXRlZE9wdGlv", |
+ "bi5OYW1lUGFydBIYChBpZGVudGlmaWVyX3ZhbHVlGAMgASgJEhoKEnBvc2l0", |
+ "aXZlX2ludF92YWx1ZRgEIAEoBBIaChJuZWdhdGl2ZV9pbnRfdmFsdWUYBSAB", |
+ "KAMSFAoMZG91YmxlX3ZhbHVlGAYgASgBEhQKDHN0cmluZ192YWx1ZRgHIAEo", |
+ "DBIXCg9hZ2dyZWdhdGVfdmFsdWUYCCABKAkaMwoITmFtZVBhcnQSEQoJbmFt", |
+ "ZV9wYXJ0GAEgAigJEhQKDGlzX2V4dGVuc2lvbhgCIAIoCCLVAQoOU291cmNl", |
+ "Q29kZUluZm8SOgoIbG9jYXRpb24YASADKAsyKC5nb29nbGUucHJvdG9idWYu", |
+ "U291cmNlQ29kZUluZm8uTG9jYXRpb24ahgEKCExvY2F0aW9uEhAKBHBhdGgY", |
+ "ASADKAVCAhABEhAKBHNwYW4YAiADKAVCAhABEhgKEGxlYWRpbmdfY29tbWVu", |
+ "dHMYAyABKAkSGQoRdHJhaWxpbmdfY29tbWVudHMYBCABKAkSIQoZbGVhZGlu", |
+ "Z19kZXRhY2hlZF9jb21tZW50cxgGIAMoCSKnAQoRR2VuZXJhdGVkQ29kZUlu", |
+ "Zm8SQQoKYW5ub3RhdGlvbhgBIAMoCzItLmdvb2dsZS5wcm90b2J1Zi5HZW5l", |
+ "cmF0ZWRDb2RlSW5mby5Bbm5vdGF0aW9uGk8KCkFubm90YXRpb24SEAoEcGF0", |
+ "aBgBIAMoBUICEAESEwoLc291cmNlX2ZpbGUYAiABKAkSDQoFYmVnaW4YAyAB", |
+ "KAUSCwoDZW5kGAQgASgFQlgKE2NvbS5nb29nbGUucHJvdG9idWZCEERlc2Ny", |
"aXB0b3JQcm90b3NIAVoKZGVzY3JpcHRvcqICA0dQQqoCGkdvb2dsZS5Qcm90", |
"b2J1Zi5SZWZsZWN0aW9u")); |
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, |
new pbr::FileDescriptor[] { }, |
- new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.FileDescriptorSet), global::Google.Protobuf.Reflection.FileDescriptorSet.Parser, new[]{ "File" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.FileDescriptorProto), global::Google.Protobuf.Reflection.FileDescriptorProto.Parser, new[]{ "Name", "Package", "Dependency", "PublicDependency", "WeakDependency", "MessageType", "EnumType", "Service", "Extension", "Options", "SourceCodeInfo", "Syntax" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.DescriptorProto), global::Google.Protobuf.Reflection.DescriptorProto.Parser, new[]{ "Name", "Field", "Extension", "NestedType", "EnumType", "ExtensionRange", "OneofDecl", "Options", "ReservedRange", "ReservedName" }, null, null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange), global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange.Parser, new[]{ "Start", "End" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange), global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange.Parser, new[]{ "Start", "End" }, null, null, null)}), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto), global::Google.Protobuf.Reflection.FieldDescriptorProto.Parser, new[]{ "Name", "Number", "Label", "Type", "TypeName", "Extendee", "DefaultValue", "OneofIndex", "JsonName", "Options" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type), typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label) }, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.OneofDescriptorProto), global::Google.Protobuf.Reflection.OneofDescriptorProto.Parser, new[]{ "Name" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.EnumDescriptorProto), global::Google.Protobuf.Reflection.EnumDescriptorProto.Parser, new[]{ "Name", "Value", "Options" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.EnumValueDescriptorProto), global::Google.Protobuf.Reflection.EnumValueDescriptorProto.Parser, new[]{ "Name", "Number", "Options" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.ServiceDescriptorProto), global::Google.Protobuf.Reflection.ServiceDescriptorProto.Parser, new[]{ "Name", "Method", "Options" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.MethodDescriptorProto), global::Google.Protobuf.Reflection.MethodDescriptorProto.Parser, new[]{ "Name", "InputType", "OutputType", "Options", "ClientStreaming", "ServerStreaming" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.FileOptions), global::Google.Protobuf.Reflection.FileOptions.Parser, new[]{ "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "JavaGenerateEqualsAndHash", "JavaStringCheckUtf8", "OptimizeFor", "GoPackage", "CcGenericServices", "JavaGenericServices", "PyGenericServices", "Deprecated", "CcEnableArenas", "ObjcClassPrefix", "CsharpNamespace", "JavananoUseDeprecatedPackage", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode) }, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.MessageOptions), global::Google.Protobuf.Reflection.MessageOptions.Parser, new[]{ "MessageSetWireFormat", "NoStandardDescriptorAccessor", "Deprecated", "MapEntry", "UninterpretedOption" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.FieldOptions), global::Google.Protobuf.Reflection.FieldOptions.Parser, new[]{ "Ctype", "Packed", "Jstype", "Lazy", "Deprecated", "Weak", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FieldOptions.Types.CType), typeof(global::Google.Protobuf.Reflection.FieldOptions.Types.JSType) }, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.EnumOptions), global::Google.Protobuf.Reflection.EnumOptions.Parser, new[]{ "AllowAlias", "Deprecated", "UninterpretedOption" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.EnumValueOptions), global::Google.Protobuf.Reflection.EnumValueOptions.Parser, new[]{ "Deprecated", "UninterpretedOption" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.ServiceOptions), global::Google.Protobuf.Reflection.ServiceOptions.Parser, new[]{ "Deprecated", "UninterpretedOption" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.MethodOptions), global::Google.Protobuf.Reflection.MethodOptions.Parser, new[]{ "Deprecated", "UninterpretedOption" }, null, null, null), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.UninterpretedOption), global::Google.Protobuf.Reflection.UninterpretedOption.Parser, new[]{ "Name", "IdentifierValue", "PositiveIntValue", "NegativeIntValue", "DoubleValue", "StringValue", "AggregateValue" }, null, null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart), global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart.Parser, new[]{ "NamePart_", "IsExtension" }, null, null, null)}), |
- new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.SourceCodeInfo), global::Google.Protobuf.Reflection.SourceCodeInfo.Parser, new[]{ "Location" }, null, null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location), global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location.Parser, new[]{ "Path", "Span", "LeadingComments", "TrailingComments", "LeadingDetachedComments" }, null, null, null)}) |
+ new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FileDescriptorSet), global::Google.Protobuf.Reflection.FileDescriptorSet.Parser, new[]{ "File" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FileDescriptorProto), global::Google.Protobuf.Reflection.FileDescriptorProto.Parser, new[]{ "Name", "Package", "Dependency", "PublicDependency", "WeakDependency", "MessageType", "EnumType", "Service", "Extension", "Options", "SourceCodeInfo", "Syntax" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.DescriptorProto), global::Google.Protobuf.Reflection.DescriptorProto.Parser, new[]{ "Name", "Field", "Extension", "NestedType", "EnumType", "ExtensionRange", "OneofDecl", "Options", "ReservedRange", "ReservedName" }, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange), global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange.Parser, new[]{ "Start", "End" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange), global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange.Parser, new[]{ "Start", "End" }, null, null, null)}), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto), global::Google.Protobuf.Reflection.FieldDescriptorProto.Parser, new[]{ "Name", "Number", "Label", "Type", "TypeName", "Extendee", "DefaultValue", "OneofIndex", "JsonName", "Options" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type), typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label) }, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.OneofDescriptorProto), global::Google.Protobuf.Reflection.OneofDescriptorProto.Parser, new[]{ "Name" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.EnumDescriptorProto), global::Google.Protobuf.Reflection.EnumDescriptorProto.Parser, new[]{ "Name", "Value", "Options" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.EnumValueDescriptorProto), global::Google.Protobuf.Reflection.EnumValueDescriptorProto.Parser, new[]{ "Name", "Number", "Options" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.ServiceDescriptorProto), global::Google.Protobuf.Reflection.ServiceDescriptorProto.Parser, new[]{ "Name", "Method", "Options" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.MethodDescriptorProto), global::Google.Protobuf.Reflection.MethodDescriptorProto.Parser, new[]{ "Name", "InputType", "OutputType", "Options", "ClientStreaming", "ServerStreaming" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FileOptions), global::Google.Protobuf.Reflection.FileOptions.Parser, new[]{ "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "JavaGenerateEqualsAndHash", "JavaStringCheckUtf8", "OptimizeFor", "GoPackage", "CcGenericServices", "JavaGenericServices", "PyGenericServices", "Deprecated", "CcEnableArenas", "ObjcClassPrefix", "CsharpNamespace", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode) }, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.MessageOptions), global::Google.Protobuf.Reflection.MessageOptions.Parser, new[]{ "MessageSetWireFormat", "NoStandardDescriptorAccessor", "Deprecated", "MapEntry", "UninterpretedOption" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FieldOptions), global::Google.Protobuf.Reflection.FieldOptions.Parser, new[]{ "Ctype", "Packed", "Jstype", "Lazy", "Deprecated", "Weak", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FieldOptions.Types.CType), typeof(global::Google.Protobuf.Reflection.FieldOptions.Types.JSType) }, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.EnumOptions), global::Google.Protobuf.Reflection.EnumOptions.Parser, new[]{ "AllowAlias", "Deprecated", "UninterpretedOption" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.EnumValueOptions), global::Google.Protobuf.Reflection.EnumValueOptions.Parser, new[]{ "Deprecated", "UninterpretedOption" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.ServiceOptions), global::Google.Protobuf.Reflection.ServiceOptions.Parser, new[]{ "Deprecated", "UninterpretedOption" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.MethodOptions), global::Google.Protobuf.Reflection.MethodOptions.Parser, new[]{ "Deprecated", "UninterpretedOption" }, null, null, null), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.UninterpretedOption), global::Google.Protobuf.Reflection.UninterpretedOption.Parser, new[]{ "Name", "IdentifierValue", "PositiveIntValue", "NegativeIntValue", "DoubleValue", "StringValue", "AggregateValue" }, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart), global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart.Parser, new[]{ "NamePart_", "IsExtension" }, null, null, null)}), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.SourceCodeInfo), global::Google.Protobuf.Reflection.SourceCodeInfo.Parser, new[]{ "Location" }, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location), global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location.Parser, new[]{ "Path", "Span", "LeadingComments", "TrailingComments", "LeadingDetachedComments" }, null, null, null)}), |
+ new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.GeneratedCodeInfo), global::Google.Protobuf.Reflection.GeneratedCodeInfo.Parser, new[]{ "Annotation" }, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation), global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation.Parser, new[]{ "Path", "SourceFile", "Begin", "End" }, null, null, null)}) |
})); |
} |
#endregion |
@@ -312,7 +316,7 @@ namespace Google.Protobuf.Reflection { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -325,7 +329,7 @@ namespace Google.Protobuf.Reflection { |
public string Package { |
get { return package_; } |
set { |
- package_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ package_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -441,7 +445,7 @@ namespace Google.Protobuf.Reflection { |
public string Syntax { |
get { return syntax_; } |
set { |
- syntax_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ syntax_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -697,7 +701,7 @@ namespace Google.Protobuf.Reflection { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -1270,7 +1274,7 @@ namespace Google.Protobuf.Reflection { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -1286,7 +1290,7 @@ namespace Google.Protobuf.Reflection { |
/// <summary>Field number for the "label" field.</summary> |
public const int LabelFieldNumber = 4; |
- private global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label label_ = global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label.LABEL_OPTIONAL; |
+ private global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label label_ = 0; |
public global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label Label { |
get { return label_; } |
set { |
@@ -1296,7 +1300,7 @@ namespace Google.Protobuf.Reflection { |
/// <summary>Field number for the "type" field.</summary> |
public const int TypeFieldNumber = 5; |
- private global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type type_ = global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type.TYPE_DOUBLE; |
+ private global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type type_ = 0; |
/// <summary> |
/// If type_name is set, this need not be set. If both this and type_name |
/// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP. |
@@ -1321,7 +1325,7 @@ namespace Google.Protobuf.Reflection { |
public string TypeName { |
get { return typeName_; } |
set { |
- typeName_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ typeName_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -1335,7 +1339,7 @@ namespace Google.Protobuf.Reflection { |
public string Extendee { |
get { return extendee_; } |
set { |
- extendee_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ extendee_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -1352,7 +1356,7 @@ namespace Google.Protobuf.Reflection { |
public string DefaultValue { |
get { return defaultValue_; } |
set { |
- defaultValue_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ defaultValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -1382,7 +1386,7 @@ namespace Google.Protobuf.Reflection { |
public string JsonName { |
get { return jsonName_; } |
set { |
- jsonName_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ jsonName_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -1424,8 +1428,8 @@ namespace Google.Protobuf.Reflection { |
int hash = 1; |
if (Name.Length != 0) hash ^= Name.GetHashCode(); |
if (Number != 0) hash ^= Number.GetHashCode(); |
- if (Label != global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label.LABEL_OPTIONAL) hash ^= Label.GetHashCode(); |
- if (Type != global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type.TYPE_DOUBLE) hash ^= Type.GetHashCode(); |
+ if (Label != 0) hash ^= Label.GetHashCode(); |
+ if (Type != 0) hash ^= Type.GetHashCode(); |
if (TypeName.Length != 0) hash ^= TypeName.GetHashCode(); |
if (Extendee.Length != 0) hash ^= Extendee.GetHashCode(); |
if (DefaultValue.Length != 0) hash ^= DefaultValue.GetHashCode(); |
@@ -1452,11 +1456,11 @@ namespace Google.Protobuf.Reflection { |
output.WriteRawTag(24); |
output.WriteInt32(Number); |
} |
- if (Label != global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label.LABEL_OPTIONAL) { |
+ if (Label != 0) { |
output.WriteRawTag(32); |
output.WriteEnum((int) Label); |
} |
- if (Type != global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type.TYPE_DOUBLE) { |
+ if (Type != 0) { |
output.WriteRawTag(40); |
output.WriteEnum((int) Type); |
} |
@@ -1490,10 +1494,10 @@ namespace Google.Protobuf.Reflection { |
if (Number != 0) { |
size += 1 + pb::CodedOutputStream.ComputeInt32Size(Number); |
} |
- if (Label != global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label.LABEL_OPTIONAL) { |
+ if (Label != 0) { |
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Label); |
} |
- if (Type != global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type.TYPE_DOUBLE) { |
+ if (Type != 0) { |
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type); |
} |
if (TypeName.Length != 0) { |
@@ -1527,10 +1531,10 @@ namespace Google.Protobuf.Reflection { |
if (other.Number != 0) { |
Number = other.Number; |
} |
- if (other.Label != global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label.LABEL_OPTIONAL) { |
+ if (other.Label != 0) { |
Label = other.Label; |
} |
- if (other.Type != global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type.TYPE_DOUBLE) { |
+ if (other.Type != 0) { |
Type = other.Type; |
} |
if (other.TypeName.Length != 0) { |
@@ -1619,59 +1623,59 @@ namespace Google.Protobuf.Reflection { |
/// 0 is reserved for errors. |
/// Order is weird for historical reasons. |
/// </summary> |
- TYPE_DOUBLE = 1, |
- TYPE_FLOAT = 2, |
+ [pbr::OriginalName("TYPE_DOUBLE")] Double = 1, |
+ [pbr::OriginalName("TYPE_FLOAT")] Float = 2, |
/// <summary> |
/// Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if |
/// negative values are likely. |
/// </summary> |
- TYPE_INT64 = 3, |
- TYPE_UINT64 = 4, |
+ [pbr::OriginalName("TYPE_INT64")] Int64 = 3, |
+ [pbr::OriginalName("TYPE_UINT64")] Uint64 = 4, |
/// <summary> |
/// Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if |
/// negative values are likely. |
/// </summary> |
- TYPE_INT32 = 5, |
- TYPE_FIXED64 = 6, |
- TYPE_FIXED32 = 7, |
- TYPE_BOOL = 8, |
- TYPE_STRING = 9, |
+ [pbr::OriginalName("TYPE_INT32")] Int32 = 5, |
+ [pbr::OriginalName("TYPE_FIXED64")] Fixed64 = 6, |
+ [pbr::OriginalName("TYPE_FIXED32")] Fixed32 = 7, |
+ [pbr::OriginalName("TYPE_BOOL")] Bool = 8, |
+ [pbr::OriginalName("TYPE_STRING")] String = 9, |
/// <summary> |
/// Tag-delimited aggregate. |
/// </summary> |
- TYPE_GROUP = 10, |
+ [pbr::OriginalName("TYPE_GROUP")] Group = 10, |
/// <summary> |
/// Length-delimited aggregate. |
/// </summary> |
- TYPE_MESSAGE = 11, |
+ [pbr::OriginalName("TYPE_MESSAGE")] Message = 11, |
/// <summary> |
/// New in version 2. |
/// </summary> |
- TYPE_BYTES = 12, |
- TYPE_UINT32 = 13, |
- TYPE_ENUM = 14, |
- TYPE_SFIXED32 = 15, |
- TYPE_SFIXED64 = 16, |
+ [pbr::OriginalName("TYPE_BYTES")] Bytes = 12, |
+ [pbr::OriginalName("TYPE_UINT32")] Uint32 = 13, |
+ [pbr::OriginalName("TYPE_ENUM")] Enum = 14, |
+ [pbr::OriginalName("TYPE_SFIXED32")] Sfixed32 = 15, |
+ [pbr::OriginalName("TYPE_SFIXED64")] Sfixed64 = 16, |
/// <summary> |
/// Uses ZigZag encoding. |
/// </summary> |
- TYPE_SINT32 = 17, |
+ [pbr::OriginalName("TYPE_SINT32")] Sint32 = 17, |
/// <summary> |
/// Uses ZigZag encoding. |
/// </summary> |
- TYPE_SINT64 = 18, |
+ [pbr::OriginalName("TYPE_SINT64")] Sint64 = 18, |
} |
internal enum Label { |
/// <summary> |
/// 0 is reserved for errors |
/// </summary> |
- LABEL_OPTIONAL = 1, |
- LABEL_REQUIRED = 2, |
+ [pbr::OriginalName("LABEL_OPTIONAL")] Optional = 1, |
+ [pbr::OriginalName("LABEL_REQUIRED")] Required = 2, |
/// <summary> |
/// TODO(sanjay): Should we add LABEL_MAP? |
/// </summary> |
- LABEL_REPEATED = 3, |
+ [pbr::OriginalName("LABEL_REPEATED")] Repeated = 3, |
} |
} |
@@ -1715,7 +1719,7 @@ namespace Google.Protobuf.Reflection { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -1823,7 +1827,7 @@ namespace Google.Protobuf.Reflection { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -1981,7 +1985,7 @@ namespace Google.Protobuf.Reflection { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -2147,7 +2151,7 @@ namespace Google.Protobuf.Reflection { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -2308,7 +2312,7 @@ namespace Google.Protobuf.Reflection { |
public string Name { |
get { return name_; } |
set { |
- name_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ name_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -2322,7 +2326,7 @@ namespace Google.Protobuf.Reflection { |
public string InputType { |
get { return inputType_; } |
set { |
- inputType_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ inputType_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -2332,7 +2336,7 @@ namespace Google.Protobuf.Reflection { |
public string OutputType { |
get { return outputType_; } |
set { |
- outputType_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ outputType_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -2558,7 +2562,6 @@ namespace Google.Protobuf.Reflection { |
ccEnableArenas_ = other.ccEnableArenas_; |
objcClassPrefix_ = other.objcClassPrefix_; |
csharpNamespace_ = other.csharpNamespace_; |
- javananoUseDeprecatedPackage_ = other.javananoUseDeprecatedPackage_; |
uninterpretedOption_ = other.uninterpretedOption_.Clone(); |
} |
@@ -2578,7 +2581,7 @@ namespace Google.Protobuf.Reflection { |
public string JavaPackage { |
get { return javaPackage_; } |
set { |
- javaPackage_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ javaPackage_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -2595,7 +2598,7 @@ namespace Google.Protobuf.Reflection { |
public string JavaOuterClassname { |
get { return javaOuterClassname_; } |
set { |
- javaOuterClassname_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ javaOuterClassname_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -2661,7 +2664,7 @@ namespace Google.Protobuf.Reflection { |
/// <summary>Field number for the "optimize_for" field.</summary> |
public const int OptimizeForFieldNumber = 9; |
- private global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode optimizeFor_ = global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode.SPEED; |
+ private global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode optimizeFor_ = 0; |
public global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode OptimizeFor { |
get { return optimizeFor_; } |
set { |
@@ -2682,7 +2685,7 @@ namespace Google.Protobuf.Reflection { |
public string GoPackage { |
get { return goPackage_; } |
set { |
- goPackage_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ goPackage_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -2768,7 +2771,7 @@ namespace Google.Protobuf.Reflection { |
public string ObjcClassPrefix { |
get { return objcClassPrefix_; } |
set { |
- objcClassPrefix_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ objcClassPrefix_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -2781,21 +2784,7 @@ namespace Google.Protobuf.Reflection { |
public string CsharpNamespace { |
get { return csharpNamespace_; } |
set { |
- csharpNamespace_ = pb::Preconditions.CheckNotNull(value, "value"); |
- } |
- } |
- |
- /// <summary>Field number for the "javanano_use_deprecated_package" field.</summary> |
- public const int JavananoUseDeprecatedPackageFieldNumber = 38; |
- private bool javananoUseDeprecatedPackage_; |
- /// <summary> |
- /// Whether the nano proto compiler should generate in the deprecated non-nano |
- /// suffixed package. |
- /// </summary> |
- public bool JavananoUseDeprecatedPackage { |
- get { return javananoUseDeprecatedPackage_; } |
- set { |
- javananoUseDeprecatedPackage_ = value; |
+ csharpNamespace_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -2836,7 +2825,6 @@ namespace Google.Protobuf.Reflection { |
if (CcEnableArenas != other.CcEnableArenas) return false; |
if (ObjcClassPrefix != other.ObjcClassPrefix) return false; |
if (CsharpNamespace != other.CsharpNamespace) return false; |
- if (JavananoUseDeprecatedPackage != other.JavananoUseDeprecatedPackage) return false; |
if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false; |
return true; |
} |
@@ -2848,7 +2836,7 @@ namespace Google.Protobuf.Reflection { |
if (JavaMultipleFiles != false) hash ^= JavaMultipleFiles.GetHashCode(); |
if (JavaGenerateEqualsAndHash != false) hash ^= JavaGenerateEqualsAndHash.GetHashCode(); |
if (JavaStringCheckUtf8 != false) hash ^= JavaStringCheckUtf8.GetHashCode(); |
- if (OptimizeFor != global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode.SPEED) hash ^= OptimizeFor.GetHashCode(); |
+ if (OptimizeFor != 0) hash ^= OptimizeFor.GetHashCode(); |
if (GoPackage.Length != 0) hash ^= GoPackage.GetHashCode(); |
if (CcGenericServices != false) hash ^= CcGenericServices.GetHashCode(); |
if (JavaGenericServices != false) hash ^= JavaGenericServices.GetHashCode(); |
@@ -2857,7 +2845,6 @@ namespace Google.Protobuf.Reflection { |
if (CcEnableArenas != false) hash ^= CcEnableArenas.GetHashCode(); |
if (ObjcClassPrefix.Length != 0) hash ^= ObjcClassPrefix.GetHashCode(); |
if (CsharpNamespace.Length != 0) hash ^= CsharpNamespace.GetHashCode(); |
- if (JavananoUseDeprecatedPackage != false) hash ^= JavananoUseDeprecatedPackage.GetHashCode(); |
hash ^= uninterpretedOption_.GetHashCode(); |
return hash; |
} |
@@ -2875,7 +2862,7 @@ namespace Google.Protobuf.Reflection { |
output.WriteRawTag(66); |
output.WriteString(JavaOuterClassname); |
} |
- if (OptimizeFor != global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode.SPEED) { |
+ if (OptimizeFor != 0) { |
output.WriteRawTag(72); |
output.WriteEnum((int) OptimizeFor); |
} |
@@ -2923,10 +2910,6 @@ namespace Google.Protobuf.Reflection { |
output.WriteRawTag(170, 2); |
output.WriteString(CsharpNamespace); |
} |
- if (JavananoUseDeprecatedPackage != false) { |
- output.WriteRawTag(176, 2); |
- output.WriteBool(JavananoUseDeprecatedPackage); |
- } |
uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec); |
} |
@@ -2947,7 +2930,7 @@ namespace Google.Protobuf.Reflection { |
if (JavaStringCheckUtf8 != false) { |
size += 2 + 1; |
} |
- if (OptimizeFor != global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode.SPEED) { |
+ if (OptimizeFor != 0) { |
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) OptimizeFor); |
} |
if (GoPackage.Length != 0) { |
@@ -2974,9 +2957,6 @@ namespace Google.Protobuf.Reflection { |
if (CsharpNamespace.Length != 0) { |
size += 2 + pb::CodedOutputStream.ComputeStringSize(CsharpNamespace); |
} |
- if (JavananoUseDeprecatedPackage != false) { |
- size += 2 + 1; |
- } |
size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec); |
return size; |
} |
@@ -3000,7 +2980,7 @@ namespace Google.Protobuf.Reflection { |
if (other.JavaStringCheckUtf8 != false) { |
JavaStringCheckUtf8 = other.JavaStringCheckUtf8; |
} |
- if (other.OptimizeFor != global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode.SPEED) { |
+ if (other.OptimizeFor != 0) { |
OptimizeFor = other.OptimizeFor; |
} |
if (other.GoPackage.Length != 0) { |
@@ -3027,9 +3007,6 @@ namespace Google.Protobuf.Reflection { |
if (other.CsharpNamespace.Length != 0) { |
CsharpNamespace = other.CsharpNamespace; |
} |
- if (other.JavananoUseDeprecatedPackage != false) { |
- JavananoUseDeprecatedPackage = other.JavananoUseDeprecatedPackage; |
- } |
uninterpretedOption_.Add(other.uninterpretedOption_); |
} |
@@ -3096,10 +3073,6 @@ namespace Google.Protobuf.Reflection { |
CsharpNamespace = input.ReadString(); |
break; |
} |
- case 304: { |
- JavananoUseDeprecatedPackage = input.ReadBool(); |
- break; |
- } |
case 7994: { |
uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec); |
break; |
@@ -3119,15 +3092,15 @@ namespace Google.Protobuf.Reflection { |
/// <summary> |
/// Generate complete code for parsing, serialization, |
/// </summary> |
- SPEED = 1, |
+ [pbr::OriginalName("SPEED")] Speed = 1, |
/// <summary> |
/// etc. |
/// </summary> |
- CODE_SIZE = 2, |
+ [pbr::OriginalName("CODE_SIZE")] CodeSize = 2, |
/// <summary> |
/// Generate code using MessageLite and the lite runtime. |
/// </summary> |
- LITE_RUNTIME = 3, |
+ [pbr::OriginalName("LITE_RUNTIME")] LiteRuntime = 3, |
} |
} |
@@ -3430,7 +3403,7 @@ namespace Google.Protobuf.Reflection { |
/// <summary>Field number for the "ctype" field.</summary> |
public const int CtypeFieldNumber = 1; |
- private global::Google.Protobuf.Reflection.FieldOptions.Types.CType ctype_ = global::Google.Protobuf.Reflection.FieldOptions.Types.CType.STRING; |
+ private global::Google.Protobuf.Reflection.FieldOptions.Types.CType ctype_ = 0; |
/// <summary> |
/// The ctype option instructs the C++ code generator to use a different |
/// representation of the field than it normally would. See the specific |
@@ -3463,7 +3436,7 @@ namespace Google.Protobuf.Reflection { |
/// <summary>Field number for the "jstype" field.</summary> |
public const int JstypeFieldNumber = 6; |
- private global::Google.Protobuf.Reflection.FieldOptions.Types.JSType jstype_ = global::Google.Protobuf.Reflection.FieldOptions.Types.JSType.JS_NORMAL; |
+ private global::Google.Protobuf.Reflection.FieldOptions.Types.JSType jstype_ = 0; |
/// <summary> |
/// The jstype option determines the JavaScript type used for values of the |
/// field. The option is permitted only for 64 bit integral and fixed types |
@@ -3585,9 +3558,9 @@ namespace Google.Protobuf.Reflection { |
public override int GetHashCode() { |
int hash = 1; |
- if (Ctype != global::Google.Protobuf.Reflection.FieldOptions.Types.CType.STRING) hash ^= Ctype.GetHashCode(); |
+ if (Ctype != 0) hash ^= Ctype.GetHashCode(); |
if (Packed != false) hash ^= Packed.GetHashCode(); |
- if (Jstype != global::Google.Protobuf.Reflection.FieldOptions.Types.JSType.JS_NORMAL) hash ^= Jstype.GetHashCode(); |
+ if (Jstype != 0) hash ^= Jstype.GetHashCode(); |
if (Lazy != false) hash ^= Lazy.GetHashCode(); |
if (Deprecated != false) hash ^= Deprecated.GetHashCode(); |
if (Weak != false) hash ^= Weak.GetHashCode(); |
@@ -3600,7 +3573,7 @@ namespace Google.Protobuf.Reflection { |
} |
public void WriteTo(pb::CodedOutputStream output) { |
- if (Ctype != global::Google.Protobuf.Reflection.FieldOptions.Types.CType.STRING) { |
+ if (Ctype != 0) { |
output.WriteRawTag(8); |
output.WriteEnum((int) Ctype); |
} |
@@ -3616,7 +3589,7 @@ namespace Google.Protobuf.Reflection { |
output.WriteRawTag(40); |
output.WriteBool(Lazy); |
} |
- if (Jstype != global::Google.Protobuf.Reflection.FieldOptions.Types.JSType.JS_NORMAL) { |
+ if (Jstype != 0) { |
output.WriteRawTag(48); |
output.WriteEnum((int) Jstype); |
} |
@@ -3629,13 +3602,13 @@ namespace Google.Protobuf.Reflection { |
public int CalculateSize() { |
int size = 0; |
- if (Ctype != global::Google.Protobuf.Reflection.FieldOptions.Types.CType.STRING) { |
+ if (Ctype != 0) { |
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Ctype); |
} |
if (Packed != false) { |
size += 1 + 1; |
} |
- if (Jstype != global::Google.Protobuf.Reflection.FieldOptions.Types.JSType.JS_NORMAL) { |
+ if (Jstype != 0) { |
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Jstype); |
} |
if (Lazy != false) { |
@@ -3655,13 +3628,13 @@ namespace Google.Protobuf.Reflection { |
if (other == null) { |
return; |
} |
- if (other.Ctype != global::Google.Protobuf.Reflection.FieldOptions.Types.CType.STRING) { |
+ if (other.Ctype != 0) { |
Ctype = other.Ctype; |
} |
if (other.Packed != false) { |
Packed = other.Packed; |
} |
- if (other.Jstype != global::Google.Protobuf.Reflection.FieldOptions.Types.JSType.JS_NORMAL) { |
+ if (other.Jstype != 0) { |
Jstype = other.Jstype; |
} |
if (other.Lazy != false) { |
@@ -3723,24 +3696,24 @@ namespace Google.Protobuf.Reflection { |
/// <summary> |
/// Default mode. |
/// </summary> |
- STRING = 0, |
- CORD = 1, |
- STRING_PIECE = 2, |
+ [pbr::OriginalName("STRING")] String = 0, |
+ [pbr::OriginalName("CORD")] Cord = 1, |
+ [pbr::OriginalName("STRING_PIECE")] StringPiece = 2, |
} |
internal enum JSType { |
/// <summary> |
/// Use the default type. |
/// </summary> |
- JS_NORMAL = 0, |
+ [pbr::OriginalName("JS_NORMAL")] JsNormal = 0, |
/// <summary> |
/// Use JavaScript strings. |
/// </summary> |
- JS_STRING = 1, |
+ [pbr::OriginalName("JS_STRING")] JsString = 1, |
/// <summary> |
/// Use JavaScript numbers. |
/// </summary> |
- JS_NUMBER = 2, |
+ [pbr::OriginalName("JS_NUMBER")] JsNumber = 2, |
} |
} |
@@ -4363,7 +4336,7 @@ namespace Google.Protobuf.Reflection { |
public string IdentifierValue { |
get { return identifierValue_; } |
set { |
- identifierValue_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ identifierValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -4403,7 +4376,7 @@ namespace Google.Protobuf.Reflection { |
public pb::ByteString StringValue { |
get { return stringValue_; } |
set { |
- stringValue_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ stringValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -4413,7 +4386,7 @@ namespace Google.Protobuf.Reflection { |
public string AggregateValue { |
get { return aggregateValue_; } |
set { |
- aggregateValue_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ aggregateValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -4615,7 +4588,7 @@ namespace Google.Protobuf.Reflection { |
public string NamePart_ { |
get { return namePart_; } |
set { |
- namePart_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ namePart_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -4998,7 +4971,7 @@ namespace Google.Protobuf.Reflection { |
public string LeadingComments { |
get { return leadingComments_; } |
set { |
- leadingComments_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ leadingComments_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -5008,7 +4981,7 @@ namespace Google.Protobuf.Reflection { |
public string TrailingComments { |
get { return trailingComments_; } |
set { |
- trailingComments_ = pb::Preconditions.CheckNotNull(value, "value"); |
+ trailingComments_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
} |
} |
@@ -5137,6 +5110,310 @@ namespace Google.Protobuf.Reflection { |
} |
+ /// <summary> |
+ /// Describes the relationship between generated code and its original source |
+ /// file. A GeneratedCodeInfo message is associated with only one generated |
+ /// source file, but may contain references to different source .proto files. |
+ /// </summary> |
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |
+ internal sealed partial class GeneratedCodeInfo : pb::IMessage<GeneratedCodeInfo> { |
+ private static readonly pb::MessageParser<GeneratedCodeInfo> _parser = new pb::MessageParser<GeneratedCodeInfo>(() => new GeneratedCodeInfo()); |
+ public static pb::MessageParser<GeneratedCodeInfo> Parser { get { return _parser; } } |
+ |
+ public static pbr::MessageDescriptor Descriptor { |
+ get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[18]; } |
+ } |
+ |
+ pbr::MessageDescriptor pb::IMessage.Descriptor { |
+ get { return Descriptor; } |
+ } |
+ |
+ public GeneratedCodeInfo() { |
+ OnConstruction(); |
+ } |
+ |
+ partial void OnConstruction(); |
+ |
+ public GeneratedCodeInfo(GeneratedCodeInfo other) : this() { |
+ annotation_ = other.annotation_.Clone(); |
+ } |
+ |
+ public GeneratedCodeInfo Clone() { |
+ return new GeneratedCodeInfo(this); |
+ } |
+ |
+ /// <summary>Field number for the "annotation" field.</summary> |
+ public const int AnnotationFieldNumber = 1; |
+ private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation> _repeated_annotation_codec |
+ = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation.Parser); |
+ private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation> annotation_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation>(); |
+ /// <summary> |
+ /// An Annotation connects some span of text in generated code to an element |
+ /// of its generating .proto file. |
+ /// </summary> |
+ public pbc::RepeatedField<global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation> Annotation { |
+ get { return annotation_; } |
+ } |
+ |
+ public override bool Equals(object other) { |
+ return Equals(other as GeneratedCodeInfo); |
+ } |
+ |
+ public bool Equals(GeneratedCodeInfo other) { |
+ if (ReferenceEquals(other, null)) { |
+ return false; |
+ } |
+ if (ReferenceEquals(other, this)) { |
+ return true; |
+ } |
+ if(!annotation_.Equals(other.annotation_)) return false; |
+ return true; |
+ } |
+ |
+ public override int GetHashCode() { |
+ int hash = 1; |
+ hash ^= annotation_.GetHashCode(); |
+ return hash; |
+ } |
+ |
+ public override string ToString() { |
+ return pb::JsonFormatter.ToDiagnosticString(this); |
+ } |
+ |
+ public void WriteTo(pb::CodedOutputStream output) { |
+ annotation_.WriteTo(output, _repeated_annotation_codec); |
+ } |
+ |
+ public int CalculateSize() { |
+ int size = 0; |
+ size += annotation_.CalculateSize(_repeated_annotation_codec); |
+ return size; |
+ } |
+ |
+ public void MergeFrom(GeneratedCodeInfo other) { |
+ if (other == null) { |
+ return; |
+ } |
+ annotation_.Add(other.annotation_); |
+ } |
+ |
+ public void MergeFrom(pb::CodedInputStream input) { |
+ uint tag; |
+ while ((tag = input.ReadTag()) != 0) { |
+ switch(tag) { |
+ default: |
+ input.SkipLastField(); |
+ break; |
+ case 10: { |
+ annotation_.AddEntriesFrom(input, _repeated_annotation_codec); |
+ break; |
+ } |
+ } |
+ } |
+ } |
+ |
+ #region Nested types |
+ /// <summary>Container for nested types declared in the GeneratedCodeInfo message type.</summary> |
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |
+ public static partial class Types { |
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] |
+ internal sealed partial class Annotation : pb::IMessage<Annotation> { |
+ private static readonly pb::MessageParser<Annotation> _parser = new pb::MessageParser<Annotation>(() => new Annotation()); |
+ public static pb::MessageParser<Annotation> Parser { get { return _parser; } } |
+ |
+ public static pbr::MessageDescriptor Descriptor { |
+ get { return global::Google.Protobuf.Reflection.GeneratedCodeInfo.Descriptor.NestedTypes[0]; } |
+ } |
+ |
+ pbr::MessageDescriptor pb::IMessage.Descriptor { |
+ get { return Descriptor; } |
+ } |
+ |
+ public Annotation() { |
+ OnConstruction(); |
+ } |
+ |
+ partial void OnConstruction(); |
+ |
+ public Annotation(Annotation other) : this() { |
+ path_ = other.path_.Clone(); |
+ sourceFile_ = other.sourceFile_; |
+ begin_ = other.begin_; |
+ end_ = other.end_; |
+ } |
+ |
+ public Annotation Clone() { |
+ return new Annotation(this); |
+ } |
+ |
+ /// <summary>Field number for the "path" field.</summary> |
+ public const int PathFieldNumber = 1; |
+ private static readonly pb::FieldCodec<int> _repeated_path_codec |
+ = pb::FieldCodec.ForInt32(10); |
+ private readonly pbc::RepeatedField<int> path_ = new pbc::RepeatedField<int>(); |
+ /// <summary> |
+ /// Identifies the element in the original source .proto file. This field |
+ /// is formatted the same as SourceCodeInfo.Location.path. |
+ /// </summary> |
+ public pbc::RepeatedField<int> Path { |
+ get { return path_; } |
+ } |
+ |
+ /// <summary>Field number for the "source_file" field.</summary> |
+ public const int SourceFileFieldNumber = 2; |
+ private string sourceFile_ = ""; |
+ /// <summary> |
+ /// Identifies the filesystem path to the original source .proto. |
+ /// </summary> |
+ public string SourceFile { |
+ get { return sourceFile_; } |
+ set { |
+ sourceFile_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); |
+ } |
+ } |
+ |
+ /// <summary>Field number for the "begin" field.</summary> |
+ public const int BeginFieldNumber = 3; |
+ private int begin_; |
+ /// <summary> |
+ /// Identifies the starting offset in bytes in the generated code |
+ /// that relates to the identified object. |
+ /// </summary> |
+ public int Begin { |
+ get { return begin_; } |
+ set { |
+ begin_ = value; |
+ } |
+ } |
+ |
+ /// <summary>Field number for the "end" field.</summary> |
+ public const int EndFieldNumber = 4; |
+ private int end_; |
+ /// <summary> |
+ /// Identifies the ending offset in bytes in the generated code that |
+ /// relates to the identified offset. The end offset should be one past |
+ /// the last relevant byte (so the length of the text = end - begin). |
+ /// </summary> |
+ public int End { |
+ get { return end_; } |
+ set { |
+ end_ = value; |
+ } |
+ } |
+ |
+ public override bool Equals(object other) { |
+ return Equals(other as Annotation); |
+ } |
+ |
+ public bool Equals(Annotation other) { |
+ if (ReferenceEquals(other, null)) { |
+ return false; |
+ } |
+ if (ReferenceEquals(other, this)) { |
+ return true; |
+ } |
+ if(!path_.Equals(other.path_)) return false; |
+ if (SourceFile != other.SourceFile) return false; |
+ if (Begin != other.Begin) return false; |
+ if (End != other.End) return false; |
+ return true; |
+ } |
+ |
+ public override int GetHashCode() { |
+ int hash = 1; |
+ hash ^= path_.GetHashCode(); |
+ if (SourceFile.Length != 0) hash ^= SourceFile.GetHashCode(); |
+ if (Begin != 0) hash ^= Begin.GetHashCode(); |
+ if (End != 0) hash ^= End.GetHashCode(); |
+ return hash; |
+ } |
+ |
+ public override string ToString() { |
+ return pb::JsonFormatter.ToDiagnosticString(this); |
+ } |
+ |
+ public void WriteTo(pb::CodedOutputStream output) { |
+ path_.WriteTo(output, _repeated_path_codec); |
+ if (SourceFile.Length != 0) { |
+ output.WriteRawTag(18); |
+ output.WriteString(SourceFile); |
+ } |
+ if (Begin != 0) { |
+ output.WriteRawTag(24); |
+ output.WriteInt32(Begin); |
+ } |
+ if (End != 0) { |
+ output.WriteRawTag(32); |
+ output.WriteInt32(End); |
+ } |
+ } |
+ |
+ public int CalculateSize() { |
+ int size = 0; |
+ size += path_.CalculateSize(_repeated_path_codec); |
+ if (SourceFile.Length != 0) { |
+ size += 1 + pb::CodedOutputStream.ComputeStringSize(SourceFile); |
+ } |
+ if (Begin != 0) { |
+ size += 1 + pb::CodedOutputStream.ComputeInt32Size(Begin); |
+ } |
+ if (End != 0) { |
+ size += 1 + pb::CodedOutputStream.ComputeInt32Size(End); |
+ } |
+ return size; |
+ } |
+ |
+ public void MergeFrom(Annotation other) { |
+ if (other == null) { |
+ return; |
+ } |
+ path_.Add(other.path_); |
+ if (other.SourceFile.Length != 0) { |
+ SourceFile = other.SourceFile; |
+ } |
+ if (other.Begin != 0) { |
+ Begin = other.Begin; |
+ } |
+ if (other.End != 0) { |
+ End = other.End; |
+ } |
+ } |
+ |
+ public void MergeFrom(pb::CodedInputStream input) { |
+ uint tag; |
+ while ((tag = input.ReadTag()) != 0) { |
+ switch(tag) { |
+ default: |
+ input.SkipLastField(); |
+ break; |
+ case 10: |
+ case 8: { |
+ path_.AddEntriesFrom(input, _repeated_path_codec); |
+ break; |
+ } |
+ case 18: { |
+ SourceFile = input.ReadString(); |
+ break; |
+ } |
+ case 24: { |
+ Begin = input.ReadInt32(); |
+ break; |
+ } |
+ case 32: { |
+ End = input.ReadInt32(); |
+ break; |
+ } |
+ } |
+ } |
+ } |
+ |
+ } |
+ |
+ } |
+ #endregion |
+ |
+ } |
+ |
#endregion |
} |