Skip to content

P
protobuf
Commit 6f73c509 authored by Sydney Acksman's avatar Sydney Acksman Committed by Jie Luo
Browse files
Options

C# Proto2 feature : Groups (#5183) 

Add group support for proto2
parent 29f27bfd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 502 additions and 134 deletions
csharp/src/AddressBook/Addressbook.cs
View file @ 6f73c509
...@@ -260,7 +260,9 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -260,7 +260,9 @@ namespace Google.Protobuf.Examples.AddressBook {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -440,7 +442,9 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -440,7 +442,9 @@ namespace Google.Protobuf.Examples.AddressBook {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Number = input.ReadString(); Number = input.ReadString();
...@@ -573,7 +577,9 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -573,7 +577,9 @@ namespace Google.Protobuf.Examples.AddressBook {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
people_.AddEntriesFrom(input, _repeated_people_codec); people_.AddEntriesFrom(input, _repeated_people_codec);
......
csharp/src/Google.Protobuf.Conformance/Conformance.cs
View file @ 6f73c509
...@@ -343,7 +343,9 @@ namespace Conformance { ...@@ -343,7 +343,9 @@ namespace Conformance {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
ProtobufPayload = input.ReadBytes(); ProtobufPayload = input.ReadBytes();
...@@ -683,7 +685,9 @@ namespace Conformance { ...@@ -683,7 +685,9 @@ namespace Conformance {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
ParseError = input.ReadString(); ParseError = input.ReadString();
......
csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
View file @ 6f73c509
...@@ -541,7 +541,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -541,7 +541,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec); mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec);
...@@ -737,7 +739,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -737,7 +739,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
if (testMap_ == null) { if (testMap_ == null) {
...@@ -861,7 +865,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -861,7 +865,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
mapInt32Message_.AddEntriesFrom(input, _map_mapInt32Message_codec); mapInt32Message_.AddEntriesFrom(input, _map_mapInt32Message_codec);
...@@ -1001,7 +1007,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -1001,7 +1007,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
map1_.AddEntriesFrom(input, _map_map1_codec); map1_.AddEntriesFrom(input, _map_map1_codec);
...@@ -1350,7 +1358,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -1350,7 +1358,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec); mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec);
...@@ -1531,7 +1541,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -1531,7 +1541,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
type_.AddEntriesFrom(input, _map_type_codec); type_.AddEntriesFrom(input, _map_type_codec);
...@@ -1666,7 +1678,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -1666,7 +1678,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
entry_.AddEntriesFrom(input, _map_entry_codec); entry_.AddEntriesFrom(input, _map_entry_codec);
......
csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs
View file @ 6f73c509
...@@ -2867,7 +2867,9 @@ namespace ProtobufTestMessages.Proto3 { ...@@ -2867,7 +2867,9 @@ namespace ProtobufTestMessages.Proto3 {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
OptionalInt32 = input.ReadInt32(); OptionalInt32 = input.ReadInt32();
...@@ -3582,7 +3584,9 @@ namespace ProtobufTestMessages.Proto3 { ...@@ -3582,7 +3584,9 @@ namespace ProtobufTestMessages.Proto3 {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
A = input.ReadInt32(); A = input.ReadInt32();
...@@ -3723,7 +3727,9 @@ namespace ProtobufTestMessages.Proto3 { ...@@ -3723,7 +3727,9 @@ namespace ProtobufTestMessages.Proto3 {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
C = input.ReadInt32(); C = input.ReadInt32();
......
csharp/src/Google.Protobuf.Test/TestProtos/UnittestCustomOptionsProto3.cs
View file @ 6f73c509
...@@ -352,7 +352,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -352,7 +352,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Field1 = input.ReadString(); Field1 = input.ReadString();
...@@ -478,7 +480,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -478,7 +480,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -579,7 +583,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -579,7 +583,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -680,7 +686,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -680,7 +686,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -781,7 +789,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -781,7 +789,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -882,7 +892,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -882,7 +892,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -996,7 +1008,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -996,7 +1008,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -1097,7 +1111,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1097,7 +1111,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -1198,7 +1214,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1198,7 +1214,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -1299,7 +1317,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1299,7 +1317,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -1400,7 +1420,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1400,7 +1420,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -1501,7 +1523,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1501,7 +1523,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -1690,7 +1714,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1690,7 +1714,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Foo = input.ReadInt32(); Foo = input.ReadInt32();
...@@ -1902,7 +1928,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1902,7 +1928,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
if (bar_ == null) { if (bar_ == null) {
...@@ -2051,7 +2079,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -2051,7 +2079,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Waldo = input.ReadInt32(); Waldo = input.ReadInt32();
...@@ -2185,7 +2215,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -2185,7 +2215,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Qux = input.ReadInt32(); Qux = input.ReadInt32();
...@@ -2293,7 +2325,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -2293,7 +2325,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -2475,7 +2509,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -2475,7 +2509,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
I = input.ReadInt32(); I = input.ReadInt32();
...@@ -2615,7 +2651,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -2615,7 +2651,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Fieldname = input.ReadInt32(); Fieldname = input.ReadInt32();
...@@ -2723,7 +2761,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -2723,7 +2761,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -2855,7 +2895,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -2855,7 +2895,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
NestedField = input.ReadInt32(); NestedField = input.ReadInt32();
......
csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs
View file @ 6f73c509
...@@ -167,7 +167,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -167,7 +167,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
D = input.ReadInt32(); D = input.ReadInt32();
......
csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportPublicProto3.cs
View file @ 6f73c509
...@@ -155,7 +155,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -155,7 +155,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
E = input.ReadInt32(); E = input.ReadInt32();
......
csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs
View file @ 6f73c509
...@@ -181,7 +181,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -181,7 +181,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -284,7 +286,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -284,7 +286,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -387,7 +391,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -387,7 +391,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -554,7 +560,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -554,7 +560,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Value = (global::UnitTest.Issues.TestProtos.NegativeEnum) input.ReadEnum(); Value = (global::UnitTest.Issues.TestProtos.NegativeEnum) input.ReadEnum();
...@@ -669,7 +677,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -669,7 +677,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -899,7 +909,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -899,7 +909,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
PrimitiveValue = input.ReadInt32(); PrimitiveValue = input.ReadInt32();
...@@ -1056,7 +1068,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1056,7 +1068,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Item = input.ReadInt32(); Item = input.ReadInt32();
...@@ -1209,7 +1223,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1209,7 +1223,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Types_ = input.ReadInt32(); Types_ = input.ReadInt32();
...@@ -1323,7 +1339,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1323,7 +1339,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
...@@ -1647,7 +1665,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1647,7 +1665,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
PlainString = input.ReadString(); PlainString = input.ReadString();
...@@ -1847,7 +1867,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1847,7 +1867,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -2047,7 +2069,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -2047,7 +2069,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Text = input.ReadString(); Text = input.ReadString();
...@@ -2211,7 +2235,9 @@ namespace UnitTest.Issues.TestProtos { ...@@ -2211,7 +2235,9 @@ namespace UnitTest.Issues.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
X = input.ReadInt32(); X = input.ReadInt32();
......
csharp/src/Google.Protobuf.Test/TestProtos/UnittestWellKnownTypes.cs
View file @ 6f73c509
...@@ -788,7 +788,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -788,7 +788,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
if (anyField_ == null) { if (anyField_ == null) {
...@@ -1316,7 +1318,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -1316,7 +1318,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
anyField_.AddEntriesFrom(input, _repeated_anyField_codec); anyField_.AddEntriesFrom(input, _repeated_anyField_codec);
...@@ -2027,7 +2031,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -2027,7 +2031,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
global::Google.Protobuf.WellKnownTypes.Any subBuilder = new global::Google.Protobuf.WellKnownTypes.Any(); global::Google.Protobuf.WellKnownTypes.Any subBuilder = new global::Google.Protobuf.WellKnownTypes.Any();
...@@ -2538,7 +2544,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -2538,7 +2544,9 @@ namespace Google.Protobuf.TestProtos {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
anyField_.AddEntriesFrom(input, _map_anyField_codec); anyField_.AddEntriesFrom(input, _map_anyField_codec);
......
csharp/src/Google.Protobuf/CodedInputStream.cs
View file @ 6f73c509
...@@ -373,7 +373,7 @@ namespace Google.Protobuf ...@@ -373,7 +373,7 @@ namespace Google.Protobuf
if (IsAtEnd) if (IsAtEnd)
{ {
lastTag = 0; lastTag = 0;
return 0; // This is the only case in which we return 0. return 0;
} }
lastTag = ReadRawVarint32(); lastTag = ReadRawVarint32();
...@@ -383,6 +383,10 @@ namespace Google.Protobuf ...@@ -383,6 +383,10 @@ namespace Google.Protobuf
// If we actually read a tag with a field of 0, that's not a valid tag. // If we actually read a tag with a field of 0, that's not a valid tag.
throw InvalidProtocolBufferException.InvalidTag(); throw InvalidProtocolBufferException.InvalidTag();
} }
if (ReachedLimit)
{
return 0;
}
return lastTag; return lastTag;
} }
...@@ -591,6 +595,20 @@ namespace Google.Protobuf ...@@ -591,6 +595,20 @@ namespace Google.Protobuf
PopLimit(oldLimit); PopLimit(oldLimit);
} }
/// <summary>
/// Reads an embedded group field from the stream.
/// </summary>
public void ReadGroup(IMessage builder)
{
if (recursionDepth >= recursionLimit)
{
throw InvalidProtocolBufferException.RecursionLimitExceeded();
}
++recursionDepth;
builder.MergeFrom(this);
--recursionDepth;
}
/// <summary> /// <summary>
/// Reads a bytes field value from the stream. /// Reads a bytes field value from the stream.
/// </summary> /// </summary>
......
csharp/src/Google.Protobuf/CodedOutputStream.cs
View file @ 6f73c509
...@@ -303,6 +303,15 @@ namespace Google.Protobuf ...@@ -303,6 +303,15 @@ namespace Google.Protobuf
value.WriteTo(this); value.WriteTo(this);
} }
/// <summary>
/// Writes a group, without a tag, to the stream.
/// </summary>
/// <param name="value">The value to write</param>
public void WriteGroup(IMessage value)
{
value.WriteTo(this);
}
/// <summary> /// <summary>
/// Write a byte string, without a tag, to the stream. /// Write a byte string, without a tag, to the stream.
/// The data is length-prefixed. /// The data is length-prefixed.
......
csharp/src/Google.Protobuf/Collections/RepeatedField.cs
View file @ 6f73c509
...@@ -208,6 +208,10 @@ namespace Google.Protobuf.Collections ...@@ -208,6 +208,10 @@ namespace Google.Protobuf.Collections
{ {
output.WriteTag(tag); output.WriteTag(tag);
writer(output, array[i]); writer(output, array[i]);
if (codec.EndTag != 0)
{
output.WriteTag(codec.EndTag);
}
} }
} }
} }
......
csharp/src/Google.Protobuf/FieldCodec.cs
View file @ 6f73c509
...@@ -225,6 +225,19 @@ namespace Google.Protobuf ...@@ -225,6 +225,19 @@ namespace Google.Protobuf
(output, value) => output.WriteMessage(value), message => CodedOutputStream.ComputeMessageSize(message), tag); (output, value) => output.WriteMessage(value), message => CodedOutputStream.ComputeMessageSize(message), tag);
} }
/// <summary>
/// Retrieves a codec suitable for a group field with the given tag.
/// </summary>
/// <param name="startTag">The start group tag.</param>
/// <param name="endTag">The end group tag.</param>
/// <param name="parser">A parser to use for the group message type.</param>
/// <returns>A codec for given tag</returns>
public static FieldCodec<T> ForGroup<T>(uint startTag, uint endTag, MessageParser<T> parser) where T : IMessage<T>
{
return new FieldCodec<T>(input => { T message = parser.CreateTemplate(); input.ReadGroup(message); return message; },
(output, value) => output.WriteGroup(value), message => CodedOutputStream.ComputeGroupSize(message), startTag, endTag);
}
/// <summary> /// <summary>
/// Creates a codec for a wrapper type of a class - which must be string or ByteString. /// Creates a codec for a wrapper type of a class - which must be string or ByteString.
/// </summary> /// </summary>
...@@ -235,7 +248,7 @@ namespace Google.Protobuf ...@@ -235,7 +248,7 @@ namespace Google.Protobuf
input => WrapperCodecs.Read<T>(input, nestedCodec), input => WrapperCodecs.Read<T>(input, nestedCodec),
(output, value) => WrapperCodecs.Write<T>(output, value, nestedCodec), (output, value) => WrapperCodecs.Write<T>(output, value, nestedCodec),
value => WrapperCodecs.CalculateSize<T>(value, nestedCodec), value => WrapperCodecs.CalculateSize<T>(value, nestedCodec),
tag, tag, 0,
null); // Default value for the wrapper null); // Default value for the wrapper
} }
...@@ -250,7 +263,7 @@ namespace Google.Protobuf ...@@ -250,7 +263,7 @@ namespace Google.Protobuf
input => WrapperCodecs.Read<T>(input, nestedCodec), input => WrapperCodecs.Read<T>(input, nestedCodec),
(output, value) => WrapperCodecs.Write<T>(output, value.Value, nestedCodec), (output, value) => WrapperCodecs.Write<T>(output, value.Value, nestedCodec),
value => value == null ? 0 : WrapperCodecs.CalculateSize<T>(value.Value, nestedCodec), value => value == null ? 0 : WrapperCodecs.CalculateSize<T>(value.Value, nestedCodec),
tag, tag, 0,
null); // Default value for the wrapper null); // Default value for the wrapper
} }
...@@ -399,6 +412,14 @@ namespace Google.Protobuf ...@@ -399,6 +412,14 @@ namespace Google.Protobuf
/// </value> /// </value>
internal uint Tag { get; } internal uint Tag { get; }
/// <summary>
/// Gets the end tag of the codec or 0 if there is no end tag
/// </summary>
/// <value>
/// The end tag of the codec.
/// </value>
internal uint EndTag { get; }
/// <summary> /// <summary>
/// Default value for this codec. Usually the same for every instance of the same type, but /// Default value for this codec. Usually the same for every instance of the same type, but
/// for string/ByteString wrapper fields the codec's default value is null, whereas for /// for string/ByteString wrapper fields the codec's default value is null, whereas for
...@@ -424,7 +445,8 @@ namespace Google.Protobuf ...@@ -424,7 +445,8 @@ namespace Google.Protobuf
Func<CodedInputStream, T> reader, Func<CodedInputStream, T> reader,
Action<CodedOutputStream, T> writer, Action<CodedOutputStream, T> writer,
Func<T, int> sizeCalculator, Func<T, int> sizeCalculator,
uint tag) : this(reader, writer, sizeCalculator, tag, DefaultDefault) uint tag,
uint endTag = 0) : this(reader, writer, sizeCalculator, tag, endTag, DefaultDefault)
{ {
} }
...@@ -433,6 +455,7 @@ namespace Google.Protobuf ...@@ -433,6 +455,7 @@ namespace Google.Protobuf
Action<CodedOutputStream, T> writer, Action<CodedOutputStream, T> writer,
Func<T, int> sizeCalculator, Func<T, int> sizeCalculator,
uint tag, uint tag,
uint endTag,
T defaultValue) T defaultValue)
{ {
ValueReader = reader; ValueReader = reader;
...@@ -455,6 +478,10 @@ namespace Google.Protobuf ...@@ -455,6 +478,10 @@ namespace Google.Protobuf
{ {
output.WriteTag(Tag); output.WriteTag(Tag);
ValueWriter(output, value); ValueWriter(output, value);
if (EndTag != 0)
{
output.WriteTag(EndTag);
}
} }
} }
......
csharp/src/Google.Protobuf/Reflection/Descriptor.cs
View file @ 6f73c509
...@@ -302,7 +302,9 @@ namespace Google.Protobuf.Reflection { ...@@ -302,7 +302,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
file_.AddEntriesFrom(input, _repeated_file_codec); file_.AddEntriesFrom(input, _repeated_file_codec);
...@@ -733,7 +735,9 @@ namespace Google.Protobuf.Reflection { ...@@ -733,7 +735,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -1098,7 +1102,9 @@ namespace Google.Protobuf.Reflection { ...@@ -1098,7 +1102,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -1357,7 +1363,9 @@ namespace Google.Protobuf.Reflection { ...@@ -1357,7 +1363,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Start = input.ReadInt32(); Start = input.ReadInt32();
...@@ -1560,7 +1568,9 @@ namespace Google.Protobuf.Reflection { ...@@ -1560,7 +1568,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Start = input.ReadInt32(); Start = input.ReadInt32();
...@@ -1693,7 +1703,9 @@ namespace Google.Protobuf.Reflection { ...@@ -1693,7 +1703,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 7994: { case 7994: {
uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec); uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
...@@ -2200,7 +2212,9 @@ namespace Google.Protobuf.Reflection { ...@@ -2200,7 +2212,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -2487,7 +2501,9 @@ namespace Google.Protobuf.Reflection { ...@@ -2487,7 +2501,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -2732,7 +2748,9 @@ namespace Google.Protobuf.Reflection { ...@@ -2732,7 +2748,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -2948,7 +2966,9 @@ namespace Google.Protobuf.Reflection { ...@@ -2948,7 +2966,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Start = input.ReadInt32(); Start = input.ReadInt32();
...@@ -3177,7 +3197,9 @@ namespace Google.Protobuf.Reflection { ...@@ -3177,7 +3197,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -3385,7 +3407,9 @@ namespace Google.Protobuf.Reflection { ...@@ -3385,7 +3407,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -3735,7 +3759,9 @@ namespace Google.Protobuf.Reflection { ...@@ -3735,7 +3759,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -6923,7 +6949,9 @@ namespace Google.Protobuf.Reflection { ...@@ -6923,7 +6949,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 18: { case 18: {
name_.AddEntriesFrom(input, _repeated_name_codec); name_.AddEntriesFrom(input, _repeated_name_codec);
...@@ -7136,7 +7164,9 @@ namespace Google.Protobuf.Reflection { ...@@ -7136,7 +7164,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
NamePart_ = input.ReadString(); NamePart_ = input.ReadString();
...@@ -7315,7 +7345,9 @@ namespace Google.Protobuf.Reflection { ...@@ -7315,7 +7345,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
location_.AddEntriesFrom(input, _repeated_location_codec); location_.AddEntriesFrom(input, _repeated_location_codec);
...@@ -7623,7 +7655,9 @@ namespace Google.Protobuf.Reflection { ...@@ -7623,7 +7655,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: case 10:
case 8: { case 8: {
...@@ -7776,7 +7810,9 @@ namespace Google.Protobuf.Reflection { ...@@ -7776,7 +7810,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
annotation_.AddEntriesFrom(input, _repeated_annotation_codec); annotation_.AddEntriesFrom(input, _repeated_annotation_codec);
...@@ -8027,7 +8063,9 @@ namespace Google.Protobuf.Reflection { ...@@ -8027,7 +8063,9 @@ namespace Google.Protobuf.Reflection {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: case 10:
case 8: { case 8: {
......
csharp/src/Google.Protobuf/UnknownField.cs
View file @ 6f73c509
...@@ -55,6 +55,7 @@ namespace Google.Protobuf ...@@ -55,6 +55,7 @@ namespace Google.Protobuf
private List<uint> fixed32List; private List<uint> fixed32List;
private List<ulong> fixed64List; private List<ulong> fixed64List;
private List<ByteString> lengthDelimitedList; private List<ByteString> lengthDelimitedList;
private List<UnknownFieldSet> groupList;
/// <summary> /// <summary>
/// Creates a new UnknownField. /// Creates a new UnknownField.
...@@ -77,7 +78,8 @@ namespace Google.Protobuf ...@@ -77,7 +78,8 @@ namespace Google.Protobuf
&& Lists.Equals(varintList, otherField.varintList) && Lists.Equals(varintList, otherField.varintList)
&& Lists.Equals(fixed32List, otherField.fixed32List) && Lists.Equals(fixed32List, otherField.fixed32List)
&& Lists.Equals(fixed64List, otherField.fixed64List) && Lists.Equals(fixed64List, otherField.fixed64List)
&& Lists.Equals(lengthDelimitedList, otherField.lengthDelimitedList); && Lists.Equals(lengthDelimitedList, otherField.lengthDelimitedList)
&& Lists.Equals(groupList, otherField.groupList);
} }
/// <summary> /// <summary>
...@@ -90,6 +92,7 @@ namespace Google.Protobuf ...@@ -90,6 +92,7 @@ namespace Google.Protobuf
hash = hash * 47 + Lists.GetHashCode(fixed32List); hash = hash * 47 + Lists.GetHashCode(fixed32List);
hash = hash * 47 + Lists.GetHashCode(fixed64List); hash = hash * 47 + Lists.GetHashCode(fixed64List);
hash = hash * 47 + Lists.GetHashCode(lengthDelimitedList); hash = hash * 47 + Lists.GetHashCode(lengthDelimitedList);
hash = hash * 47 + Lists.GetHashCode(groupList);
return hash; return hash;
} }
...@@ -133,6 +136,15 @@ namespace Google.Protobuf ...@@ -133,6 +136,15 @@ namespace Google.Protobuf
output.WriteBytes(value); output.WriteBytes(value);
} }
} }
if (groupList != null)
{
foreach (UnknownFieldSet value in groupList)
{
output.WriteTag(fieldNumber, WireFormat.WireType.StartGroup);
value.WriteTo(output);
output.WriteTag(fieldNumber, WireFormat.WireType.EndGroup);
}
}
} }
/// <summary> /// <summary>
...@@ -168,6 +180,14 @@ namespace Google.Protobuf ...@@ -168,6 +180,14 @@ namespace Google.Protobuf
result += CodedOutputStream.ComputeBytesSize(value); result += CodedOutputStream.ComputeBytesSize(value);
} }
} }
if (groupList != null)
{
result += CodedOutputStream.ComputeTagSize(fieldNumber) * 2 * groupList.Count;
foreach (UnknownFieldSet value in groupList)
{
result += value.CalculateSize();
}
}
return result; return result;
} }
...@@ -182,6 +202,7 @@ namespace Google.Protobuf ...@@ -182,6 +202,7 @@ namespace Google.Protobuf
fixed32List = AddAll(fixed32List, other.fixed32List); fixed32List = AddAll(fixed32List, other.fixed32List);
fixed64List = AddAll(fixed64List, other.fixed64List); fixed64List = AddAll(fixed64List, other.fixed64List);
lengthDelimitedList = AddAll(lengthDelimitedList, other.lengthDelimitedList); lengthDelimitedList = AddAll(lengthDelimitedList, other.lengthDelimitedList);
groupList = AddAll(groupList, other.groupList);
return this; return this;
} }
...@@ -245,6 +266,12 @@ namespace Google.Protobuf ...@@ -245,6 +266,12 @@ namespace Google.Protobuf
return this; return this;
} }
internal UnknownField AddGroup(UnknownFieldSet value)
{
groupList = Add(groupList, value);
return this;
}
/// <summary> /// <summary>
/// Adds <paramref name="value"/> to the <paramref name="list"/>, creating /// Adds <paramref name="value"/> to the <paramref name="list"/>, creating
/// a new list if <paramref name="list"/> is null. The list is returned - either /// a new list if <paramref name="list"/> is null. The list is returned - either
......
csharp/src/Google.Protobuf/UnknownFieldSet.cs
View file @ 6f73c509
...@@ -183,7 +183,7 @@ namespace Google.Protobuf ...@@ -183,7 +183,7 @@ namespace Google.Protobuf
/// </summary> /// </summary>
/// <param name="input">The coded input stream containing the field</param> /// <param name="input">The coded input stream containing the field</param>
/// <returns>false if the tag is an "end group" tag, true otherwise</returns> /// <returns>false if the tag is an "end group" tag, true otherwise</returns>
private void MergeFieldFrom(CodedInputStream input) private bool MergeFieldFrom(CodedInputStream input)
{ {
uint tag = input.LastTag; uint tag = input.LastTag;
int number = WireFormat.GetTagFieldNumber(tag); int number = WireFormat.GetTagFieldNumber(tag);
...@@ -193,34 +193,40 @@ namespace Google.Protobuf ...@@ -193,34 +193,40 @@ namespace Google.Protobuf
{ {
ulong uint64 = input.ReadUInt64(); ulong uint64 = input.ReadUInt64();
GetOrAddField(number).AddVarint(uint64); GetOrAddField(number).AddVarint(uint64);
return; return true;
} }
case WireFormat.WireType.Fixed32: case WireFormat.WireType.Fixed32:
{ {
uint uint32 = input.ReadFixed32(); uint uint32 = input.ReadFixed32();
GetOrAddField(number).AddFixed32(uint32); GetOrAddField(number).AddFixed32(uint32);
return; return true;
} }
case WireFormat.WireType.Fixed64: case WireFormat.WireType.Fixed64:
{ {
ulong uint64 = input.ReadFixed64(); ulong uint64 = input.ReadFixed64();
GetOrAddField(number).AddFixed64(uint64); GetOrAddField(number).AddFixed64(uint64);
return; return true;
} }
case WireFormat.WireType.LengthDelimited: case WireFormat.WireType.LengthDelimited:
{ {
ByteString bytes = input.ReadBytes(); ByteString bytes = input.ReadBytes();
GetOrAddField(number).AddLengthDelimited(bytes); GetOrAddField(number).AddLengthDelimited(bytes);
return; return true;
} }
case WireFormat.WireType.StartGroup: case WireFormat.WireType.StartGroup:
{ {
input.SkipGroup(tag); uint endTag = WireFormat.MakeTag(number, WireFormat.WireType.EndGroup);
return; UnknownFieldSet set = new UnknownFieldSet();
while (input.ReadTag() != endTag)
{
set.MergeFieldFrom(input);
}
GetOrAddField(number).AddGroup(set);
return true;
} }
case WireFormat.WireType.EndGroup: case WireFormat.WireType.EndGroup:
{ {
throw new InvalidProtocolBufferException("Merge an unknown field of end-group tag, indicating that the corresponding start-group was missing."); return false;
} }
default: default:
throw new InvalidOperationException("Wire Type is invalid."); throw new InvalidOperationException("Wire Type is invalid.");
...@@ -248,8 +254,34 @@ namespace Google.Protobuf ...@@ -248,8 +254,34 @@ namespace Google.Protobuf
{ {
unknownFields = new UnknownFieldSet(); unknownFields = new UnknownFieldSet();
} }
unknownFields.MergeFieldFrom(input); if (!unknownFields.MergeFieldFrom(input))
{
throw new InvalidProtocolBufferException("Merge an unknown field of end-group tag, indicating that the corresponding start-group was missing."); // match the old code-gen
}
return unknownFields; return unknownFields;
}
/// <summary>
/// Create a new UnknownFieldSet if unknownFields is null.
/// Parse a single field from <paramref name="input"/> and merge it
/// into unknownFields. If <paramref name="input"/> is configured to discard unknown fields,
/// <paramref name="unknownFields"/> will be returned as-is and the field will be skipped.
/// </summary>
/// <param name="unknownFields">The UnknownFieldSet which need to be merged</param>
/// <param name="input">The coded input stream containing the field</param>
/// <returns>The merged UnknownFieldSet</returns>
public static bool MergeFieldFrom(ref UnknownFieldSet unknownFields, CodedInputStream input)
{
if (input.DiscardUnknownFields)
{
input.SkipLastField();
return true;
}
if (unknownFields == null)
{
unknownFields = new UnknownFieldSet();
}
return unknownFields.MergeFieldFrom(input);
} }
/// <summary> /// <summary>
......
csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
View file @ 6f73c509
...@@ -292,7 +292,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -292,7 +292,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
TypeUrl = input.ReadString(); TypeUrl = input.ReadString();
......
csharp/src/Google.Protobuf/WellKnownTypes/Api.cs
View file @ 6f73c509
...@@ -345,7 +345,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -345,7 +345,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -661,7 +663,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -661,7 +663,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -925,7 +929,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -925,7 +929,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
......
csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
View file @ 6f73c509
...@@ -254,7 +254,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -254,7 +254,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Seconds = input.ReadInt64(); Seconds = input.ReadInt64();
......
csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs
View file @ 6f73c509
...@@ -143,7 +143,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -143,7 +143,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
} }
} }
......
csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
View file @ 6f73c509
...@@ -352,7 +352,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -352,7 +352,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
paths_.AddEntriesFrom(input, _repeated_paths_codec); paths_.AddEntriesFrom(input, _repeated_paths_codec);
......
csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
View file @ 6f73c509
...@@ -165,7 +165,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -165,7 +165,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
FileName = input.ReadString(); FileName = input.ReadString();
......
csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
View file @ 6f73c509
...@@ -189,7 +189,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -189,7 +189,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
fields_.AddEntriesFrom(input, _map_fields_codec); fields_.AddEntriesFrom(input, _map_fields_codec);
...@@ -513,7 +515,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -513,7 +515,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
kind_ = input.ReadEnum(); kind_ = input.ReadEnum();
...@@ -673,7 +677,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -673,7 +677,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
values_.AddEntriesFrom(input, _repeated_values_codec); values_.AddEntriesFrom(input, _repeated_values_codec);
......
csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
View file @ 6f73c509
...@@ -273,7 +273,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -273,7 +273,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Seconds = input.ReadInt64(); Seconds = input.ReadInt64();
......
csharp/src/Google.Protobuf/WellKnownTypes/Type.cs
View file @ 6f73c509
...@@ -328,7 +328,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -328,7 +328,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -723,7 +725,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -723,7 +725,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Kind = (global::Google.Protobuf.WellKnownTypes.Field.Types.Kind) input.ReadEnum(); Kind = (global::Google.Protobuf.WellKnownTypes.Field.Types.Kind) input.ReadEnum();
...@@ -1100,7 +1104,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -1100,7 +1104,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -1300,7 +1306,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -1300,7 +1306,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
...@@ -1480,7 +1488,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -1480,7 +1488,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Name = input.ReadString(); Name = input.ReadString();
......
csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
View file @ 6f73c509
...@@ -177,7 +177,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -177,7 +177,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 9: { case 9: {
Value = input.ReadDouble(); Value = input.ReadDouble();
...@@ -314,7 +316,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -314,7 +316,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 13: { case 13: {
Value = input.ReadFloat(); Value = input.ReadFloat();
...@@ -451,7 +455,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -451,7 +455,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Value = input.ReadInt64(); Value = input.ReadInt64();
...@@ -588,7 +594,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -588,7 +594,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Value = input.ReadUInt64(); Value = input.ReadUInt64();
...@@ -725,7 +733,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -725,7 +733,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Value = input.ReadInt32(); Value = input.ReadInt32();
...@@ -862,7 +872,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -862,7 +872,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Value = input.ReadUInt32(); Value = input.ReadUInt32();
...@@ -999,7 +1011,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -999,7 +1011,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 8: { case 8: {
Value = input.ReadBool(); Value = input.ReadBool();
...@@ -1136,7 +1150,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -1136,7 +1150,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Value = input.ReadString(); Value = input.ReadString();
...@@ -1273,7 +1289,9 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -1273,7 +1289,9 @@ namespace Google.Protobuf.WellKnownTypes {
while ((tag = input.ReadTag()) != 0) { while ((tag = input.ReadTag()) != 0) {
switch(tag) { switch(tag) {
default: default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input); if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break; break;
case 10: { case 10: {
Value = input.ReadBytes(); Value = input.ReadBytes();
......
src/google/protobuf/compiler/csharp/csharp_message.cc
View file @ 6f73c509
...@@ -539,7 +539,9 @@ void MessageGenerator::GenerateMergingMethods(io::Printer* printer) { ...@@ -539,7 +539,9 @@ void MessageGenerator::GenerateMergingMethods(io::Printer* printer) {
} else { } else {
printer->Print( printer->Print(
"default:\n" "default:\n"
" _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);\n" " if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {\n"
" return;\n"
" }\n"
" break;\n"); " break;\n");
} }
for (int i = 0; i < fields_by_number().size(); i++) { for (int i = 0; i < fields_by_number().size(); i++) {
......
src/google/protobuf/compiler/csharp/csharp_message_field.cc
View file @ 6f73c509
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#include <google/protobuf/io/printer.h> #include <google/protobuf/io/printer.h>
#include <google/protobuf/io/zero_copy_stream.h> #include <google/protobuf/io/zero_copy_stream.h>
#include <google/protobuf/stubs/strutil.h> #include <google/protobuf/stubs/strutil.h>
#include <google/protobuf/wire_format.h>
#include <google/protobuf/wire_format_lite.h>
#include <google/protobuf/compiler/csharp/csharp_doc_comment.h> #include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
#include <google/protobuf/compiler/csharp/csharp_helpers.h> #include <google/protobuf/compiler/csharp/csharp_helpers.h>
...@@ -56,6 +58,21 @@ MessageFieldGenerator::MessageFieldGenerator(const FieldDescriptor* descriptor, ...@@ -56,6 +58,21 @@ MessageFieldGenerator::MessageFieldGenerator(const FieldDescriptor* descriptor,
variables_["has_property_check"] = name() + "_ != null"; variables_["has_property_check"] = name() + "_ != null";
variables_["has_not_property_check"] = name() + "_ == null"; variables_["has_not_property_check"] = name() + "_ == null";
} }
if (descriptor_->type() == FieldDescriptor::Type::TYPE_GROUP) {
int tag_size = internal::WireFormat::TagSize(descriptor_->number(), descriptor_->type()) / 2;
uint tag = internal::WireFormatLite::MakeTag(
descriptor_->number(),
internal::WireFormatLite::WIRETYPE_END_GROUP);
uint8 tag_array[5];
io::CodedOutputStream::WriteTagToArray(tag, tag_array);
string tag_bytes = SimpleItoa(tag_array[0]);
for (int i = 1; i < tag_size; i++) {
tag_bytes += ", " + SimpleItoa(tag_array[i]);
}
variables_["end_tag"] = SimpleItoa(tag);
variables_["end_tag_bytes"] = tag_bytes;
}
} }
MessageFieldGenerator::~MessageFieldGenerator() { MessageFieldGenerator::~MessageFieldGenerator() {
...@@ -114,25 +131,47 @@ void MessageFieldGenerator::GenerateParsingCode(io::Printer* printer) { ...@@ -114,25 +131,47 @@ void MessageFieldGenerator::GenerateParsingCode(io::Printer* printer) {
variables_, variables_,
"if ($has_not_property_check$) {\n" "if ($has_not_property_check$) {\n"
" $property_name$ = new $type_name$();\n" " $property_name$ = new $type_name$();\n"
"}\n" "}\n");
"input.ReadMessage($property_name$);\n"); if (descriptor_->type() == FieldDescriptor::Type::TYPE_MESSAGE) {
printer->Print(variables_, "input.ReadMessage($property_name$);\n");
} else {
printer->Print(variables_, "input.ReadGroup($property_name$);\n");
}
} }
void MessageFieldGenerator::GenerateSerializationCode(io::Printer* printer) { void MessageFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
printer->Print( if (descriptor_->type() == FieldDescriptor::Type::TYPE_MESSAGE) {
variables_, printer->Print(
"if ($has_property_check$) {\n" variables_,
" output.WriteRawTag($tag_bytes$);\n" "if ($has_property_check$) {\n"
" output.WriteMessage($property_name$);\n" " output.WriteRawTag($tag_bytes$);\n"
"}\n"); " output.WriteMessage($property_name$);\n"
"}\n");
} else {
printer->Print(
variables_,
"if ($has_property_check$) {\n"
" output.WriteRawTag($tag_bytes$);\n"
" output.WriteGroup($property_name$);\n"
" output.WriteRawTag($end_tag_bytes$);\n"
"}\n");
}
} }
void MessageFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) { void MessageFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
printer->Print( if (descriptor_->type() == FieldDescriptor::Type::TYPE_MESSAGE) {
variables_, printer->Print(
"if ($has_property_check$) {\n" variables_,
" size += $tag_size$ + pb::CodedOutputStream.ComputeMessageSize($property_name$);\n" "if ($has_property_check$) {\n"
"}\n"); " size += $tag_size$ + pb::CodedOutputStream.ComputeMessageSize($property_name$);\n"
"}\n");
} else {
printer->Print(
variables_,
"if ($has_property_check$) {\n"
" size += $tag_size$ + $tag_size$ + pb::CodedOutputStream.ComputeGroupSize($property_name$);\n"
"}\n");
}
} }
void MessageFieldGenerator::WriteHash(io::Printer* printer) { void MessageFieldGenerator::WriteHash(io::Printer* printer) {
...@@ -160,9 +199,15 @@ void MessageFieldGenerator::GenerateFreezingCode(io::Printer* printer) { ...@@ -160,9 +199,15 @@ void MessageFieldGenerator::GenerateFreezingCode(io::Printer* printer) {
} }
void MessageFieldGenerator::GenerateCodecCode(io::Printer* printer) { void MessageFieldGenerator::GenerateCodecCode(io::Printer* printer) {
printer->Print( if (descriptor_->type() == FieldDescriptor::Type::TYPE_MESSAGE) {
variables_, printer->Print(
"pb::FieldCodec.ForMessage($tag$, $type_name$.Parser)"); variables_,
"pb::FieldCodec.ForMessage($tag$, $type_name$.Parser)");
} else {
printer->Print(
variables_,
"pb::FieldCodec.ForGroup($tag$, $end_tag$, $type_name$.Parser)");
}
} }
MessageOneofFieldGenerator::MessageOneofFieldGenerator( MessageOneofFieldGenerator::MessageOneofFieldGenerator(
...@@ -228,9 +273,13 @@ void MessageOneofFieldGenerator::GenerateParsingCode(io::Printer* printer) { ...@@ -228,9 +273,13 @@ void MessageOneofFieldGenerator::GenerateParsingCode(io::Printer* printer) {
"$type_name$ subBuilder = new $type_name$();\n" "$type_name$ subBuilder = new $type_name$();\n"
"if ($has_property_check$) {\n" "if ($has_property_check$) {\n"
" subBuilder.MergeFrom($property_name$);\n" " subBuilder.MergeFrom($property_name$);\n"
"}\n" "}\n");
"input.ReadMessage(subBuilder);\n" if (descriptor_->type() == FieldDescriptor::Type::TYPE_MESSAGE) {
"$property_name$ = subBuilder;\n"); printer->Print("input.ReadMessage(subBuilder);\n");
} else {
printer->Print("input.ReadGroup(subBuilder);\n");
}
printer->Print(variables_, "$property_name$ = subBuilder;\n");
} }
void MessageOneofFieldGenerator::WriteToString(io::Printer* printer) { void MessageOneofFieldGenerator::WriteToString(io::Printer* printer) {
......
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