Skip to content

P
protobuf
Commit 9489817d authored by Jon Skeet's avatar Jon Skeet
Browse files
Options

Regenerated code. Most changes are whitespace, removing trailing spaces. 

Other changes are due to the well-known types changing without us regenerating.
parent ccd76802
Show whitespace changes
Inline Side-by-side
Showing with 346 additions and 54 deletions
csharp/src/Google.Protobuf/Reflection/DescriptorProtoFile.cs
View file @ 9489817d
...@@ -129,9 +129,9 @@ namespace Google.Protobuf.Reflection { ...@@ -129,9 +129,9 @@ namespace Google.Protobuf.Reflection {
"Z29vZ2xlLnByb3RvYnVmLlNvdXJjZUNvZGVJbmZvLkxvY2F0aW9uGoYBCghM", "Z29vZ2xlLnByb3RvYnVmLlNvdXJjZUNvZGVJbmZvLkxvY2F0aW9uGoYBCghM",
"b2NhdGlvbhIQCgRwYXRoGAEgAygFQgIQARIQCgRzcGFuGAIgAygFQgIQARIY", "b2NhdGlvbhIQCgRwYXRoGAEgAygFQgIQARIQCgRzcGFuGAIgAygFQgIQARIY",
"ChBsZWFkaW5nX2NvbW1lbnRzGAMgASgJEhkKEXRyYWlsaW5nX2NvbW1lbnRz", "ChBsZWFkaW5nX2NvbW1lbnRzGAMgASgJEhkKEXRyYWlsaW5nX2NvbW1lbnRz",
"GAQgASgJEiEKGWxlYWRpbmdfZGV0YWNoZWRfY29tbWVudHMYBiADKAlCWwoT", "GAQgASgJEiEKGWxlYWRpbmdfZGV0YWNoZWRfY29tbWVudHMYBiADKAlCWAoT",
"Y29tLmdvb2dsZS5wcm90b2J1ZkIQRGVzY3JpcHRvclByb3Rvc0gBWgpkZXNj", "Y29tLmdvb2dsZS5wcm90b2J1ZkIQRGVzY3JpcHRvclByb3Rvc0gBWgpkZXNj",
"cmlwdG9yogIDR1BCqgIaR29vZ2xlLlByb3RvYnVmLlJlZmxlY3Rpb26wAgE=")); "cmlwdG9yogIDR1BCqgIaR29vZ2xlLlByb3RvYnVmLlJlZmxlY3Rpb24="));
descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] {
......
csharp/src/Google.Protobuf/WellKnownTypes/Api.cs
View file @ 9489817d
...@@ -25,22 +25,26 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -25,22 +25,26 @@ namespace Google.Protobuf.WellKnownTypes {
string.Concat( string.Concat(
"Chlnb29nbGUvcHJvdG9idWYvYXBpLnByb3RvEg9nb29nbGUucHJvdG9idWYa", "Chlnb29nbGUvcHJvdG9idWYvYXBpLnByb3RvEg9nb29nbGUucHJvdG9idWYa",
"JGdvb2dsZS9wcm90b2J1Zi9zb3VyY2VfY29udGV4dC5wcm90bxoaZ29vZ2xl", "JGdvb2dsZS9wcm90b2J1Zi9zb3VyY2VfY29udGV4dC5wcm90bxoaZ29vZ2xl",
"L3Byb3RvYnVmL3R5cGUucHJvdG8isAEKA0FwaRIMCgRuYW1lGAEgASgJEigK", "L3Byb3RvYnVmL3R5cGUucHJvdG8igQIKA0FwaRIMCgRuYW1lGAEgASgJEigK",
"B21ldGhvZHMYAiADKAsyFy5nb29nbGUucHJvdG9idWYuTWV0aG9kEigKB29w", "B21ldGhvZHMYAiADKAsyFy5nb29nbGUucHJvdG9idWYuTWV0aG9kEigKB29w",
"dGlvbnMYAyADKAsyFy5nb29nbGUucHJvdG9idWYuT3B0aW9uEg8KB3ZlcnNp", "dGlvbnMYAyADKAsyFy5nb29nbGUucHJvdG9idWYuT3B0aW9uEg8KB3ZlcnNp",
"b24YBCABKAkSNgoOc291cmNlX2NvbnRleHQYBSABKAsyHi5nb29nbGUucHJv", "b24YBCABKAkSNgoOc291cmNlX2NvbnRleHQYBSABKAsyHi5nb29nbGUucHJv",
"dG9idWYuU291cmNlQ29udGV4dCKsAQoGTWV0aG9kEgwKBG5hbWUYASABKAkS", "dG9idWYuU291cmNlQ29udGV4dBImCgZtaXhpbnMYBiADKAsyFi5nb29nbGUu",
"GAoQcmVxdWVzdF90eXBlX3VybBgCIAEoCRIZChFyZXF1ZXN0X3N0cmVhbWlu", "cHJvdG9idWYuTWl4aW4SJwoGc3ludGF4GAcgASgOMhcuZ29vZ2xlLnByb3Rv",
"ZxgDIAEoCBIZChFyZXNwb25zZV90eXBlX3VybBgEIAEoCRIaChJyZXNwb25z", "YnVmLlN5bnRheCLVAQoGTWV0aG9kEgwKBG5hbWUYASABKAkSGAoQcmVxdWVz",
"ZV9zdHJlYW1pbmcYBSABKAgSKAoHb3B0aW9ucxgGIAMoCzIXLmdvb2dsZS5w", "dF90eXBlX3VybBgCIAEoCRIZChFyZXF1ZXN0X3N0cmVhbWluZxgDIAEoCBIZ",
"cm90b2J1Zi5PcHRpb25CSAoTY29tLmdvb2dsZS5wcm90b2J1ZkIIQXBpUHJv", "ChFyZXNwb25zZV90eXBlX3VybBgEIAEoCRIaChJyZXNwb25zZV9zdHJlYW1p",
"dG9QAaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IG", "bmcYBSABKAgSKAoHb3B0aW9ucxgGIAMoCzIXLmdvb2dsZS5wcm90b2J1Zi5P",
"cHJvdG8z")); "cHRpb24SJwoGc3ludGF4GAcgASgOMhcuZ29vZ2xlLnByb3RvYnVmLlN5bnRh",
"eCIjCgVNaXhpbhIMCgRuYW1lGAEgASgJEgwKBHJvb3QYAiABKAlCSwoTY29t",
"Lmdvb2dsZS5wcm90b2J1ZkIIQXBpUHJvdG9QAaABAaICA0dQQqoCHkdvb2ds",
"ZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IGcHJvdG8z"));
descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor, }, new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.Type.Descriptor, },
new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] {
new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Api), new[]{ "Name", "Methods", "Options", "Version", "SourceContext" }, null, null, null), new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Api), new[]{ "Name", "Methods", "Options", "Version", "SourceContext", "Mixins", "Syntax" }, null, null, null),
new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Method), new[]{ "Name", "RequestTypeUrl", "RequestStreaming", "ResponseTypeUrl", "ResponseStreaming", "Options" }, null, null, null) new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Method), new[]{ "Name", "RequestTypeUrl", "RequestStreaming", "ResponseTypeUrl", "ResponseStreaming", "Options", "Syntax" }, null, null, null),
new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Mixin), new[]{ "Name", "Root" }, null, null, null)
})); }));
} }
#endregion #endregion
...@@ -73,6 +77,8 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -73,6 +77,8 @@ namespace Google.Protobuf.WellKnownTypes {
options_ = other.options_.Clone(); options_ = other.options_.Clone();
version_ = other.version_; version_ = other.version_;
SourceContext = other.sourceContext_ != null ? other.SourceContext.Clone() : null; SourceContext = other.sourceContext_ != null ? other.SourceContext.Clone() : null;
mixins_ = other.mixins_.Clone();
syntax_ = other.syntax_;
} }
public Api Clone() { public Api Clone() {
...@@ -122,6 +128,23 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -122,6 +128,23 @@ namespace Google.Protobuf.WellKnownTypes {
} }
} }
public const int MixinsFieldNumber = 6;
private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Mixin> _repeated_mixins_codec
= pb::FieldCodec.ForMessage(50, global::Google.Protobuf.WellKnownTypes.Mixin.Parser);
private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Mixin> mixins_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Mixin>();
public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Mixin> Mixins {
get { return mixins_; }
}
public const int SyntaxFieldNumber = 7;
private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2;
public global::Google.Protobuf.WellKnownTypes.Syntax Syntax {
get { return syntax_; }
set {
syntax_ = value;
}
}
public override bool Equals(object other) { public override bool Equals(object other) {
return Equals(other as Api); return Equals(other as Api);
} }
...@@ -138,6 +161,8 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -138,6 +161,8 @@ namespace Google.Protobuf.WellKnownTypes {
if(!options_.Equals(other.options_)) return false; if(!options_.Equals(other.options_)) return false;
if (Version != other.Version) return false; if (Version != other.Version) return false;
if (!object.Equals(SourceContext, other.SourceContext)) return false; if (!object.Equals(SourceContext, other.SourceContext)) return false;
if(!mixins_.Equals(other.mixins_)) return false;
if (Syntax != other.Syntax) return false;
return true; return true;
} }
...@@ -148,6 +173,8 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -148,6 +173,8 @@ namespace Google.Protobuf.WellKnownTypes {
hash ^= options_.GetHashCode(); hash ^= options_.GetHashCode();
if (Version.Length != 0) hash ^= Version.GetHashCode(); if (Version.Length != 0) hash ^= Version.GetHashCode();
if (sourceContext_ != null) hash ^= SourceContext.GetHashCode(); if (sourceContext_ != null) hash ^= SourceContext.GetHashCode();
hash ^= mixins_.GetHashCode();
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) hash ^= Syntax.GetHashCode();
return hash; return hash;
} }
...@@ -170,6 +197,11 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -170,6 +197,11 @@ namespace Google.Protobuf.WellKnownTypes {
output.WriteRawTag(42); output.WriteRawTag(42);
output.WriteMessage(SourceContext); output.WriteMessage(SourceContext);
} }
mixins_.WriteTo(output, _repeated_mixins_codec);
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
output.WriteRawTag(56);
output.WriteEnum((int) Syntax);
}
} }
public int CalculateSize() { public int CalculateSize() {
...@@ -185,6 +217,10 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -185,6 +217,10 @@ namespace Google.Protobuf.WellKnownTypes {
if (sourceContext_ != null) { if (sourceContext_ != null) {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext); size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext);
} }
size += mixins_.CalculateSize(_repeated_mixins_codec);
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax);
}
return size; return size;
} }
...@@ -206,6 +242,10 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -206,6 +242,10 @@ namespace Google.Protobuf.WellKnownTypes {
} }
SourceContext.MergeFrom(other.SourceContext); SourceContext.MergeFrom(other.SourceContext);
} }
mixins_.Add(other.mixins_);
if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
Syntax = other.Syntax;
}
} }
public void MergeFrom(pb::CodedInputStream input) { public void MergeFrom(pb::CodedInputStream input) {
...@@ -238,6 +278,14 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -238,6 +278,14 @@ namespace Google.Protobuf.WellKnownTypes {
input.ReadMessage(sourceContext_); input.ReadMessage(sourceContext_);
break; break;
} }
case 50: {
mixins_.AddEntriesFrom(input, _repeated_mixins_codec);
break;
}
case 56: {
syntax_ = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
break;
}
} }
} }
} }
...@@ -270,6 +318,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -270,6 +318,7 @@ namespace Google.Protobuf.WellKnownTypes {
responseTypeUrl_ = other.responseTypeUrl_; responseTypeUrl_ = other.responseTypeUrl_;
responseStreaming_ = other.responseStreaming_; responseStreaming_ = other.responseStreaming_;
options_ = other.options_.Clone(); options_ = other.options_.Clone();
syntax_ = other.syntax_;
} }
public Method Clone() { public Method Clone() {
...@@ -329,6 +378,15 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -329,6 +378,15 @@ namespace Google.Protobuf.WellKnownTypes {
get { return options_; } get { return options_; }
} }
public const int SyntaxFieldNumber = 7;
private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2;
public global::Google.Protobuf.WellKnownTypes.Syntax Syntax {
get { return syntax_; }
set {
syntax_ = value;
}
}
public override bool Equals(object other) { public override bool Equals(object other) {
return Equals(other as Method); return Equals(other as Method);
} }
...@@ -346,6 +404,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -346,6 +404,7 @@ namespace Google.Protobuf.WellKnownTypes {
if (ResponseTypeUrl != other.ResponseTypeUrl) return false; if (ResponseTypeUrl != other.ResponseTypeUrl) return false;
if (ResponseStreaming != other.ResponseStreaming) return false; if (ResponseStreaming != other.ResponseStreaming) return false;
if(!options_.Equals(other.options_)) return false; if(!options_.Equals(other.options_)) return false;
if (Syntax != other.Syntax) return false;
return true; return true;
} }
...@@ -357,6 +416,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -357,6 +416,7 @@ namespace Google.Protobuf.WellKnownTypes {
if (ResponseTypeUrl.Length != 0) hash ^= ResponseTypeUrl.GetHashCode(); if (ResponseTypeUrl.Length != 0) hash ^= ResponseTypeUrl.GetHashCode();
if (ResponseStreaming != false) hash ^= ResponseStreaming.GetHashCode(); if (ResponseStreaming != false) hash ^= ResponseStreaming.GetHashCode();
hash ^= options_.GetHashCode(); hash ^= options_.GetHashCode();
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) hash ^= Syntax.GetHashCode();
return hash; return hash;
} }
...@@ -386,6 +446,10 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -386,6 +446,10 @@ namespace Google.Protobuf.WellKnownTypes {
output.WriteBool(ResponseStreaming); output.WriteBool(ResponseStreaming);
} }
options_.WriteTo(output, _repeated_options_codec); options_.WriteTo(output, _repeated_options_codec);
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
output.WriteRawTag(56);
output.WriteEnum((int) Syntax);
}
} }
public int CalculateSize() { public int CalculateSize() {
...@@ -406,6 +470,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -406,6 +470,9 @@ namespace Google.Protobuf.WellKnownTypes {
size += 1 + 1; size += 1 + 1;
} }
size += options_.CalculateSize(_repeated_options_codec); size += options_.CalculateSize(_repeated_options_codec);
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax);
}
return size; return size;
} }
...@@ -429,6 +496,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -429,6 +496,9 @@ namespace Google.Protobuf.WellKnownTypes {
ResponseStreaming = other.ResponseStreaming; ResponseStreaming = other.ResponseStreaming;
} }
options_.Add(other.options_); options_.Add(other.options_);
if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
Syntax = other.Syntax;
}
} }
public void MergeFrom(pb::CodedInputStream input) { public void MergeFrom(pb::CodedInputStream input) {
...@@ -462,6 +532,138 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -462,6 +532,138 @@ namespace Google.Protobuf.WellKnownTypes {
options_.AddEntriesFrom(input, _repeated_options_codec); options_.AddEntriesFrom(input, _repeated_options_codec);
break; break;
} }
case 56: {
syntax_ = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
break;
}
}
}
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public sealed partial class Mixin : pb::IMessage<Mixin> {
private static readonly pb::MessageParser<Mixin> _parser = new pb::MessageParser<Mixin>(() => new Mixin());
public static pb::MessageParser<Mixin> Parser { get { return _parser; } }
public static pbr::MessageDescriptor Descriptor {
get { return global::Google.Protobuf.WellKnownTypes.Proto.Api.Descriptor.MessageTypes[2]; }
}
pbr::MessageDescriptor pb::IMessage.Descriptor {
get { return Descriptor; }
}
public Mixin() {
OnConstruction();
}
partial void OnConstruction();
public Mixin(Mixin other) : this() {
name_ = other.name_;
root_ = other.root_;
}
public Mixin Clone() {
return new Mixin(this);
}
public const int NameFieldNumber = 1;
private string name_ = "";
public string Name {
get { return name_; }
set {
name_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
public const int RootFieldNumber = 2;
private string root_ = "";
public string Root {
get { return root_; }
set {
root_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
public override bool Equals(object other) {
return Equals(other as Mixin);
}
public bool Equals(Mixin other) {
if (ReferenceEquals(other, null)) {
return false;
}
if (ReferenceEquals(other, this)) {
return true;
}
if (Name != other.Name) return false;
if (Root != other.Root) return false;
return true;
}
public override int GetHashCode() {
int hash = 1;
if (Name.Length != 0) hash ^= Name.GetHashCode();
if (Root.Length != 0) hash ^= Root.GetHashCode();
return hash;
}
public override string ToString() {
return pb::JsonFormatter.Default.Format(this);
}
public void WriteTo(pb::CodedOutputStream output) {
if (Name.Length != 0) {
output.WriteRawTag(10);
output.WriteString(Name);
}
if (Root.Length != 0) {
output.WriteRawTag(18);
output.WriteString(Root);
}
}
public int CalculateSize() {
int size = 0;
if (Name.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
}
if (Root.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(Root);
}
return size;
}
public void MergeFrom(Mixin other) {
if (other == null) {
return;
}
if (other.Name.Length != 0) {
Name = other.Name;
}
if (other.Root.Length != 0) {
Root = other.Root;
}
}
public void MergeFrom(pb::CodedInputStream input) {
uint tag;
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
input.SkipLastField();
break;
case 10: {
Name = input.ReadString();
break;
}
case 18: {
Root = input.ReadString();
break;
}
} }
} }
} }
......
csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs
View file @ 9489817d
...@@ -24,9 +24,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -24,9 +24,9 @@ namespace Google.Protobuf.WellKnownTypes {
byte[] descriptorData = global::System.Convert.FromBase64String( byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat( string.Concat(
"Chtnb29nbGUvcHJvdG9idWYvZW1wdHkucHJvdG8SD2dvb2dsZS5wcm90b2J1", "Chtnb29nbGUvcHJvdG9idWYvZW1wdHkucHJvdG8SD2dvb2dsZS5wcm90b2J1",
"ZiIHCgVFbXB0eUJKChNjb20uZ29vZ2xlLnByb3RvYnVmQgpFbXB0eVByb3Rv", "ZiIHCgVFbXB0eUJNChNjb20uZ29vZ2xlLnByb3RvYnVmQgpFbXB0eVByb3Rv",
"UAGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnBy", "UAGgAQGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNi",
"b3RvMw==")); "BnByb3RvMw=="));
descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] {
......
csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
View file @ 9489817d
...@@ -24,9 +24,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -24,9 +24,9 @@ namespace Google.Protobuf.WellKnownTypes {
byte[] descriptorData = global::System.Convert.FromBase64String( byte[] descriptorData = global::System.Convert.FromBase64String(
string.Concat( string.Concat(
"CiBnb29nbGUvcHJvdG9idWYvZmllbGRfbWFzay5wcm90bxIPZ29vZ2xlLnBy", "CiBnb29nbGUvcHJvdG9idWYvZmllbGRfbWFzay5wcm90bxIPZ29vZ2xlLnBy",
"b3RvYnVmIhoKCUZpZWxkTWFzaxINCgVwYXRocxgBIAMoCUJOChNjb20uZ29v", "b3RvYnVmIhoKCUZpZWxkTWFzaxINCgVwYXRocxgBIAMoCUJRChNjb20uZ29v",
"Z2xlLnByb3RvYnVmQg5GaWVsZE1hc2tQcm90b1ABogIDR1BCqgIeR29vZ2xl", "Z2xlLnByb3RvYnVmQg5GaWVsZE1hc2tQcm90b1ABoAEBogIDR1BCqgIeR29v",
"LlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZwcm90bzM=")); "Z2xlLlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZwcm90bzM="));
descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] {
......
csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
View file @ 9489817d
...@@ -25,9 +25,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -25,9 +25,9 @@ namespace Google.Protobuf.WellKnownTypes {
string.Concat( string.Concat(
"CiRnb29nbGUvcHJvdG9idWYvc291cmNlX2NvbnRleHQucHJvdG8SD2dvb2ds", "CiRnb29nbGUvcHJvdG9idWYvc291cmNlX2NvbnRleHQucHJvdG8SD2dvb2ds",
"ZS5wcm90b2J1ZiIiCg1Tb3VyY2VDb250ZXh0EhEKCWZpbGVfbmFtZRgBIAEo", "ZS5wcm90b2J1ZiIiCg1Tb3VyY2VDb250ZXh0EhEKCWZpbGVfbmFtZRgBIAEo",
"CUJSChNjb20uZ29vZ2xlLnByb3RvYnVmQhJTb3VyY2VDb250ZXh0UHJvdG9Q", "CUJVChNjb20uZ29vZ2xlLnByb3RvYnVmQhJTb3VyY2VDb250ZXh0UHJvdG9Q",
"AaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IGcHJv", "AaABAaICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25vd25UeXBlc2IG",
"dG8z")); "cHJvdG8z"));
descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] {
......
csharp/src/Google.Protobuf/WellKnownTypes/Type.cs
View file @ 9489817d
...@@ -25,41 +25,44 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -25,41 +25,44 @@ namespace Google.Protobuf.WellKnownTypes {
string.Concat( string.Concat(
"Chpnb29nbGUvcHJvdG9idWYvdHlwZS5wcm90bxIPZ29vZ2xlLnByb3RvYnVm", "Chpnb29nbGUvcHJvdG9idWYvdHlwZS5wcm90bxIPZ29vZ2xlLnByb3RvYnVm",
"Ghlnb29nbGUvcHJvdG9idWYvYW55LnByb3RvGiRnb29nbGUvcHJvdG9idWYv", "Ghlnb29nbGUvcHJvdG9idWYvYW55LnByb3RvGiRnb29nbGUvcHJvdG9idWYv",
"c291cmNlX2NvbnRleHQucHJvdG8irgEKBFR5cGUSDAoEbmFtZRgBIAEoCRIm", "c291cmNlX2NvbnRleHQucHJvdG8i1wEKBFR5cGUSDAoEbmFtZRgBIAEoCRIm",
"CgZmaWVsZHMYAiADKAsyFi5nb29nbGUucHJvdG9idWYuRmllbGQSDgoGb25l", "CgZmaWVsZHMYAiADKAsyFi5nb29nbGUucHJvdG9idWYuRmllbGQSDgoGb25l",
"b2ZzGAMgAygJEigKB29wdGlvbnMYBCADKAsyFy5nb29nbGUucHJvdG9idWYu", "b2ZzGAMgAygJEigKB29wdGlvbnMYBCADKAsyFy5nb29nbGUucHJvdG9idWYu",
"T3B0aW9uEjYKDnNvdXJjZV9jb250ZXh0GAUgASgLMh4uZ29vZ2xlLnByb3Rv", "T3B0aW9uEjYKDnNvdXJjZV9jb250ZXh0GAUgASgLMh4uZ29vZ2xlLnByb3Rv",
"YnVmLlNvdXJjZUNvbnRleHQimwUKBUZpZWxkEikKBGtpbmQYASABKA4yGy5n", "YnVmLlNvdXJjZUNvbnRleHQSJwoGc3ludGF4GAYgASgOMhcuZ29vZ2xlLnBy",
"b29nbGUucHJvdG9idWYuRmllbGQuS2luZBI3CgtjYXJkaW5hbGl0eRgCIAEo", "b3RvYnVmLlN5bnRheCK+BQoFRmllbGQSKQoEa2luZBgBIAEoDjIbLmdvb2ds",
"DjIiLmdvb2dsZS5wcm90b2J1Zi5GaWVsZC5DYXJkaW5hbGl0eRIOCgZudW1i", "ZS5wcm90b2J1Zi5GaWVsZC5LaW5kEjcKC2NhcmRpbmFsaXR5GAIgASgOMiIu",
"ZXIYAyABKAUSDAoEbmFtZRgEIAEoCRIQCgh0eXBlX3VybBgGIAEoCRITCgtv", "Z29vZ2xlLnByb3RvYnVmLkZpZWxkLkNhcmRpbmFsaXR5Eg4KBm51bWJlchgD",
"bmVvZl9pbmRleBgHIAEoBRIOCgZwYWNrZWQYCCABKAgSKAoHb3B0aW9ucxgJ", "IAEoBRIMCgRuYW1lGAQgASgJEhAKCHR5cGVfdXJsGAYgASgJEhMKC29uZW9m",
"IAMoCzIXLmdvb2dsZS5wcm90b2J1Zi5PcHRpb24iuAIKBEtpbmQSEAoMVFlQ", "X2luZGV4GAcgASgFEg4KBnBhY2tlZBgIIAEoCBIoCgdvcHRpb25zGAkgAygL",
"RV9VTktOT1dOEAASDwoLVFlQRV9ET1VCTEUQARIOCgpUWVBFX0ZMT0FUEAIS", "MhcuZ29vZ2xlLnByb3RvYnVmLk9wdGlvbhIRCglqc29uX25hbWUYCiABKAki",
"DgoKVFlQRV9JTlQ2NBADEg8KC1RZUEVfVUlOVDY0EAQSDgoKVFlQRV9JTlQz", "yAIKBEtpbmQSEAoMVFlQRV9VTktOT1dOEAASDwoLVFlQRV9ET1VCTEUQARIO",
"MhAFEhAKDFRZUEVfRklYRUQ2NBAGEhAKDFRZUEVfRklYRUQzMhAHEg0KCVRZ", "CgpUWVBFX0ZMT0FUEAISDgoKVFlQRV9JTlQ2NBADEg8KC1RZUEVfVUlOVDY0",
"UEVfQk9PTBAIEg8KC1RZUEVfU1RSSU5HEAkSEAoMVFlQRV9NRVNTQUdFEAsS", "EAQSDgoKVFlQRV9JTlQzMhAFEhAKDFRZUEVfRklYRUQ2NBAGEhAKDFRZUEVf",
"DgoKVFlQRV9CWVRFUxAMEg8KC1RZUEVfVUlOVDMyEA0SDQoJVFlQRV9FTlVN", "RklYRUQzMhAHEg0KCVRZUEVfQk9PTBAIEg8KC1RZUEVfU1RSSU5HEAkSDgoK",
"EA4SEQoNVFlQRV9TRklYRUQzMhAPEhEKDVRZUEVfU0ZJWEVENjQQEBIPCgtU", "VFlQRV9HUk9VUBAKEhAKDFRZUEVfTUVTU0FHRRALEg4KClRZUEVfQllURVMQ",
"WVBFX1NJTlQzMhAREg8KC1RZUEVfU0lOVDY0EBIidAoLQ2FyZGluYWxpdHkS", "DBIPCgtUWVBFX1VJTlQzMhANEg0KCVRZUEVfRU5VTRAOEhEKDVRZUEVfU0ZJ",
"FwoTQ0FSRElOQUxJVFlfVU5LTk9XThAAEhgKFENBUkRJTkFMSVRZX09QVElP", "WEVEMzIQDxIRCg1UWVBFX1NGSVhFRDY0EBASDwoLVFlQRV9TSU5UMzIQERIP",
"TkFMEAESGAoUQ0FSRElOQUxJVFlfUkVRVUlSRUQQAhIYChRDQVJESU5BTElU", "CgtUWVBFX1NJTlQ2NBASInQKC0NhcmRpbmFsaXR5EhcKE0NBUkRJTkFMSVRZ",
"WV9SRVBFQVRFRBADIqUBCgRFbnVtEgwKBG5hbWUYASABKAkSLQoJZW51bXZh", "X1VOS05PV04QABIYChRDQVJESU5BTElUWV9PUFRJT05BTBABEhgKFENBUkRJ",
"bHVlGAIgAygLMhouZ29vZ2xlLnByb3RvYnVmLkVudW1WYWx1ZRIoCgdvcHRp", "TkFMSVRZX1JFUVVJUkVEEAISGAoUQ0FSRElOQUxJVFlfUkVQRUFURUQQAyLO",
"b25zGAMgAygLMhcuZ29vZ2xlLnByb3RvYnVmLk9wdGlvbhI2Cg5zb3VyY2Vf", "AQoERW51bRIMCgRuYW1lGAEgASgJEi0KCWVudW12YWx1ZRgCIAMoCzIaLmdv",
"Y29udGV4dBgEIAEoCzIeLmdvb2dsZS5wcm90b2J1Zi5Tb3VyY2VDb250ZXh0", "b2dsZS5wcm90b2J1Zi5FbnVtVmFsdWUSKAoHb3B0aW9ucxgDIAMoCzIXLmdv",
"IlMKCUVudW1WYWx1ZRIMCgRuYW1lGAEgASgJEg4KBm51bWJlchgCIAEoBRIo", "b2dsZS5wcm90b2J1Zi5PcHRpb24SNgoOc291cmNlX2NvbnRleHQYBCABKAsy",
"CgdvcHRpb25zGAMgAygLMhcuZ29vZ2xlLnByb3RvYnVmLk9wdGlvbiI7CgZP", "Hi5nb29nbGUucHJvdG9idWYuU291cmNlQ29udGV4dBInCgZzeW50YXgYBSAB",
"cHRpb24SDAoEbmFtZRgBIAEoCRIjCgV2YWx1ZRgCIAEoCzIULmdvb2dsZS5w", "KA4yFy5nb29nbGUucHJvdG9idWYuU3ludGF4IlMKCUVudW1WYWx1ZRIMCgRu",
"cm90b2J1Zi5BbnlCSQoTY29tLmdvb2dsZS5wcm90b2J1ZkIJVHlwZVByb3Rv", "YW1lGAEgASgJEg4KBm51bWJlchgCIAEoBRIoCgdvcHRpb25zGAMgAygLMhcu",
"UAGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnBy", "Z29vZ2xlLnByb3RvYnVmLk9wdGlvbiI7CgZPcHRpb24SDAoEbmFtZRgBIAEo",
"b3RvMw==")); "CRIjCgV2YWx1ZRgCIAEoCzIULmdvb2dsZS5wcm90b2J1Zi5BbnkqLgoGU3lu",
"dGF4EhEKDVNZTlRBWF9QUk9UTzIQABIRCg1TWU5UQVhfUFJPVE8zEAFCTAoT",
"Y29tLmdvb2dsZS5wcm90b2J1ZkIJVHlwZVByb3RvUAGgAQGiAgNHUEKqAh5H",
"b29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.Proto.Any.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor, }, new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.Proto.Any.Descriptor, global::Google.Protobuf.WellKnownTypes.Proto.SourceContext.Descriptor, },
new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(new[] {typeof(global::Google.Protobuf.WellKnownTypes.Syntax), }, new pbr::GeneratedCodeInfo[] {
new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Type), new[]{ "Name", "Fields", "Oneofs", "Options", "SourceContext" }, null, null, null), new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Type), new[]{ "Name", "Fields", "Oneofs", "Options", "SourceContext", "Syntax" }, null, null, null),
new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Field), new[]{ "Kind", "Cardinality", "Number", "Name", "TypeUrl", "OneofIndex", "Packed", "Options" }, null, new[]{ typeof(global::Google.Protobuf.WellKnownTypes.Field.Types.Kind), typeof(global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality) }, null), new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Field), new[]{ "Kind", "Cardinality", "Number", "Name", "TypeUrl", "OneofIndex", "Packed", "Options", "JsonName" }, null, new[]{ typeof(global::Google.Protobuf.WellKnownTypes.Field.Types.Kind), typeof(global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality) }, null),
new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Enum), new[]{ "Name", "Enumvalue", "Options", "SourceContext" }, null, null, null), new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Enum), new[]{ "Name", "Enumvalue", "Options", "SourceContext", "Syntax" }, null, null, null),
new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.EnumValue), new[]{ "Name", "Number", "Options" }, null, null, null), new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.EnumValue), new[]{ "Name", "Number", "Options" }, null, null, null),
new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Option), new[]{ "Name", "Value" }, null, null, null) new pbr::GeneratedCodeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Option), new[]{ "Name", "Value" }, null, null, null)
})); }));
...@@ -68,6 +71,14 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -68,6 +71,14 @@ namespace Google.Protobuf.WellKnownTypes {
} }
} }
#region Enums
public enum Syntax {
SYNTAX_PROTO2 = 0,
SYNTAX_PROTO3 = 1,
}
#endregion
#region Messages #region Messages
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public sealed partial class Type : pb::IMessage<Type> { public sealed partial class Type : pb::IMessage<Type> {
...@@ -94,6 +105,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -94,6 +105,7 @@ namespace Google.Protobuf.WellKnownTypes {
oneofs_ = other.oneofs_.Clone(); oneofs_ = other.oneofs_.Clone();
options_ = other.options_.Clone(); options_ = other.options_.Clone();
SourceContext = other.sourceContext_ != null ? other.SourceContext.Clone() : null; SourceContext = other.sourceContext_ != null ? other.SourceContext.Clone() : null;
syntax_ = other.syntax_;
} }
public Type Clone() { public Type Clone() {
...@@ -142,6 +154,15 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -142,6 +154,15 @@ namespace Google.Protobuf.WellKnownTypes {
} }
} }
public const int SyntaxFieldNumber = 6;
private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2;
public global::Google.Protobuf.WellKnownTypes.Syntax Syntax {
get { return syntax_; }
set {
syntax_ = value;
}
}
public override bool Equals(object other) { public override bool Equals(object other) {
return Equals(other as Type); return Equals(other as Type);
} }
...@@ -158,6 +179,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -158,6 +179,7 @@ namespace Google.Protobuf.WellKnownTypes {
if(!oneofs_.Equals(other.oneofs_)) return false; if(!oneofs_.Equals(other.oneofs_)) return false;
if(!options_.Equals(other.options_)) return false; if(!options_.Equals(other.options_)) return false;
if (!object.Equals(SourceContext, other.SourceContext)) return false; if (!object.Equals(SourceContext, other.SourceContext)) return false;
if (Syntax != other.Syntax) return false;
return true; return true;
} }
...@@ -168,6 +190,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -168,6 +190,7 @@ namespace Google.Protobuf.WellKnownTypes {
hash ^= oneofs_.GetHashCode(); hash ^= oneofs_.GetHashCode();
hash ^= options_.GetHashCode(); hash ^= options_.GetHashCode();
if (sourceContext_ != null) hash ^= SourceContext.GetHashCode(); if (sourceContext_ != null) hash ^= SourceContext.GetHashCode();
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) hash ^= Syntax.GetHashCode();
return hash; return hash;
} }
...@@ -187,6 +210,10 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -187,6 +210,10 @@ namespace Google.Protobuf.WellKnownTypes {
output.WriteRawTag(42); output.WriteRawTag(42);
output.WriteMessage(SourceContext); output.WriteMessage(SourceContext);
} }
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
output.WriteRawTag(48);
output.WriteEnum((int) Syntax);
}
} }
public int CalculateSize() { public int CalculateSize() {
...@@ -200,6 +227,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -200,6 +227,9 @@ namespace Google.Protobuf.WellKnownTypes {
if (sourceContext_ != null) { if (sourceContext_ != null) {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext); size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext);
} }
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax);
}
return size; return size;
} }
...@@ -219,6 +249,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -219,6 +249,9 @@ namespace Google.Protobuf.WellKnownTypes {
} }
SourceContext.MergeFrom(other.SourceContext); SourceContext.MergeFrom(other.SourceContext);
} }
if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
Syntax = other.Syntax;
}
} }
public void MergeFrom(pb::CodedInputStream input) { public void MergeFrom(pb::CodedInputStream input) {
...@@ -251,6 +284,10 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -251,6 +284,10 @@ namespace Google.Protobuf.WellKnownTypes {
input.ReadMessage(sourceContext_); input.ReadMessage(sourceContext_);
break; break;
} }
case 48: {
syntax_ = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
break;
}
} }
} }
} }
...@@ -285,6 +322,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -285,6 +322,7 @@ namespace Google.Protobuf.WellKnownTypes {
oneofIndex_ = other.oneofIndex_; oneofIndex_ = other.oneofIndex_;
packed_ = other.packed_; packed_ = other.packed_;
options_ = other.options_.Clone(); options_ = other.options_.Clone();
jsonName_ = other.jsonName_;
} }
public Field Clone() { public Field Clone() {
...@@ -362,6 +400,15 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -362,6 +400,15 @@ namespace Google.Protobuf.WellKnownTypes {
get { return options_; } get { return options_; }
} }
public const int JsonNameFieldNumber = 10;
private string jsonName_ = "";
public string JsonName {
get { return jsonName_; }
set {
jsonName_ = pb::Preconditions.CheckNotNull(value, "value");
}
}
public override bool Equals(object other) { public override bool Equals(object other) {
return Equals(other as Field); return Equals(other as Field);
} }
...@@ -381,6 +428,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -381,6 +428,7 @@ namespace Google.Protobuf.WellKnownTypes {
if (OneofIndex != other.OneofIndex) return false; if (OneofIndex != other.OneofIndex) return false;
if (Packed != other.Packed) return false; if (Packed != other.Packed) return false;
if(!options_.Equals(other.options_)) return false; if(!options_.Equals(other.options_)) return false;
if (JsonName != other.JsonName) return false;
return true; return true;
} }
...@@ -394,6 +442,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -394,6 +442,7 @@ namespace Google.Protobuf.WellKnownTypes {
if (OneofIndex != 0) hash ^= OneofIndex.GetHashCode(); if (OneofIndex != 0) hash ^= OneofIndex.GetHashCode();
if (Packed != false) hash ^= Packed.GetHashCode(); if (Packed != false) hash ^= Packed.GetHashCode();
hash ^= options_.GetHashCode(); hash ^= options_.GetHashCode();
if (JsonName.Length != 0) hash ^= JsonName.GetHashCode();
return hash; return hash;
} }
...@@ -431,6 +480,10 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -431,6 +480,10 @@ namespace Google.Protobuf.WellKnownTypes {
output.WriteBool(Packed); output.WriteBool(Packed);
} }
options_.WriteTo(output, _repeated_options_codec); options_.WriteTo(output, _repeated_options_codec);
if (JsonName.Length != 0) {
output.WriteRawTag(82);
output.WriteString(JsonName);
}
} }
public int CalculateSize() { public int CalculateSize() {
...@@ -457,6 +510,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -457,6 +510,9 @@ namespace Google.Protobuf.WellKnownTypes {
size += 1 + 1; size += 1 + 1;
} }
size += options_.CalculateSize(_repeated_options_codec); size += options_.CalculateSize(_repeated_options_codec);
if (JsonName.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(JsonName);
}
return size; return size;
} }
...@@ -486,6 +542,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -486,6 +542,9 @@ namespace Google.Protobuf.WellKnownTypes {
Packed = other.Packed; Packed = other.Packed;
} }
options_.Add(other.options_); options_.Add(other.options_);
if (other.JsonName.Length != 0) {
JsonName = other.JsonName;
}
} }
public void MergeFrom(pb::CodedInputStream input) { public void MergeFrom(pb::CodedInputStream input) {
...@@ -527,6 +586,10 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -527,6 +586,10 @@ namespace Google.Protobuf.WellKnownTypes {
options_.AddEntriesFrom(input, _repeated_options_codec); options_.AddEntriesFrom(input, _repeated_options_codec);
break; break;
} }
case 82: {
JsonName = input.ReadString();
break;
}
} }
} }
} }
...@@ -545,6 +608,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -545,6 +608,7 @@ namespace Google.Protobuf.WellKnownTypes {
TYPE_FIXED32 = 7, TYPE_FIXED32 = 7,
TYPE_BOOL = 8, TYPE_BOOL = 8,
TYPE_STRING = 9, TYPE_STRING = 9,
TYPE_GROUP = 10,
TYPE_MESSAGE = 11, TYPE_MESSAGE = 11,
TYPE_BYTES = 12, TYPE_BYTES = 12,
TYPE_UINT32 = 13, TYPE_UINT32 = 13,
...@@ -591,6 +655,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -591,6 +655,7 @@ namespace Google.Protobuf.WellKnownTypes {
enumvalue_ = other.enumvalue_.Clone(); enumvalue_ = other.enumvalue_.Clone();
options_ = other.options_.Clone(); options_ = other.options_.Clone();
SourceContext = other.sourceContext_ != null ? other.SourceContext.Clone() : null; SourceContext = other.sourceContext_ != null ? other.SourceContext.Clone() : null;
syntax_ = other.syntax_;
} }
public Enum Clone() { public Enum Clone() {
...@@ -631,6 +696,15 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -631,6 +696,15 @@ namespace Google.Protobuf.WellKnownTypes {
} }
} }
public const int SyntaxFieldNumber = 5;
private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2;
public global::Google.Protobuf.WellKnownTypes.Syntax Syntax {
get { return syntax_; }
set {
syntax_ = value;
}
}
public override bool Equals(object other) { public override bool Equals(object other) {
return Equals(other as Enum); return Equals(other as Enum);
} }
...@@ -646,6 +720,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -646,6 +720,7 @@ namespace Google.Protobuf.WellKnownTypes {
if(!enumvalue_.Equals(other.enumvalue_)) return false; if(!enumvalue_.Equals(other.enumvalue_)) return false;
if(!options_.Equals(other.options_)) return false; if(!options_.Equals(other.options_)) return false;
if (!object.Equals(SourceContext, other.SourceContext)) return false; if (!object.Equals(SourceContext, other.SourceContext)) return false;
if (Syntax != other.Syntax) return false;
return true; return true;
} }
...@@ -655,6 +730,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -655,6 +730,7 @@ namespace Google.Protobuf.WellKnownTypes {
hash ^= enumvalue_.GetHashCode(); hash ^= enumvalue_.GetHashCode();
hash ^= options_.GetHashCode(); hash ^= options_.GetHashCode();
if (sourceContext_ != null) hash ^= SourceContext.GetHashCode(); if (sourceContext_ != null) hash ^= SourceContext.GetHashCode();
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) hash ^= Syntax.GetHashCode();
return hash; return hash;
} }
...@@ -673,6 +749,10 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -673,6 +749,10 @@ namespace Google.Protobuf.WellKnownTypes {
output.WriteRawTag(34); output.WriteRawTag(34);
output.WriteMessage(SourceContext); output.WriteMessage(SourceContext);
} }
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
output.WriteRawTag(40);
output.WriteEnum((int) Syntax);
}
} }
public int CalculateSize() { public int CalculateSize() {
...@@ -685,6 +765,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -685,6 +765,9 @@ namespace Google.Protobuf.WellKnownTypes {
if (sourceContext_ != null) { if (sourceContext_ != null) {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext); size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext);
} }
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax);
}
return size; return size;
} }
...@@ -703,6 +786,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -703,6 +786,9 @@ namespace Google.Protobuf.WellKnownTypes {
} }
SourceContext.MergeFrom(other.SourceContext); SourceContext.MergeFrom(other.SourceContext);
} }
if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) {
Syntax = other.Syntax;
}
} }
public void MergeFrom(pb::CodedInputStream input) { public void MergeFrom(pb::CodedInputStream input) {
...@@ -731,6 +817,10 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -731,6 +817,10 @@ namespace Google.Protobuf.WellKnownTypes {
input.ReadMessage(sourceContext_); input.ReadMessage(sourceContext_);
break; break;
} }
case 40: {
syntax_ = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
break;
}
} }
} }
} }
......
csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
View file @ 9489817d
...@@ -27,9 +27,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -27,9 +27,9 @@ namespace Google.Protobuf.WellKnownTypes {
"KAMiHAoLVUludDY0VmFsdWUSDQoFdmFsdWUYASABKAQiGwoKSW50MzJWYWx1", "KAMiHAoLVUludDY0VmFsdWUSDQoFdmFsdWUYASABKAQiGwoKSW50MzJWYWx1",
"ZRINCgV2YWx1ZRgBIAEoBSIcCgtVSW50MzJWYWx1ZRINCgV2YWx1ZRgBIAEo", "ZRINCgV2YWx1ZRgBIAEoBSIcCgtVSW50MzJWYWx1ZRINCgV2YWx1ZRgBIAEo",
"DSIaCglCb29sVmFsdWUSDQoFdmFsdWUYASABKAgiHAoLU3RyaW5nVmFsdWUS", "DSIaCglCb29sVmFsdWUSDQoFdmFsdWUYASABKAgiHAoLU3RyaW5nVmFsdWUS",
"DQoFdmFsdWUYASABKAkiGwoKQnl0ZXNWYWx1ZRINCgV2YWx1ZRgBIAEoDEJN", "DQoFdmFsdWUYASABKAkiGwoKQnl0ZXNWYWx1ZRINCgV2YWx1ZRgBIAEoDEJQ",
"ChNjb20uZ29vZ2xlLnByb3RvYnVmQg1XcmFwcGVyc1Byb3RvUAGiAgNHUEKq", "ChNjb20uZ29vZ2xlLnByb3RvYnVmQg1XcmFwcGVyc1Byb3RvUAGgAQGiAgNH",
"Ah5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw==")); "UEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw=="));
descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, descriptor = pbr::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] { new pbr::GeneratedCodeInfo(null, new pbr::GeneratedCodeInfo[] {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment