Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

C# Proto2 feature : Groups #5183

Merged
merged 11 commits into from Nov 5, 2018
Merged

C# Proto2 feature : Groups #5183

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8c13fe7
Group library changes
ObsidianMinor Sep 25, 2018
9024b49
Group compiler changes
ObsidianMinor Sep 25, 2018
9c079c5
Fixed a typo in FieldCodec which resulted in some failed tests
ObsidianMinor Sep 25, 2018
8a43b56
Added new group files to cmake build files
ObsidianMinor Sep 25, 2018
1048bf0
Insert ReachedTagLimit check on ReadTag to return 0 on last tag
ObsidianMinor Oct 25, 2018
f7f732d
Compiler changes (end tag review)
ObsidianMinor Oct 30, 2018
7b7b436
Generated code changes (end tag review)
ObsidianMinor Oct 30, 2018
97b7da7
Library changes (end tag review)
ObsidianMinor Oct 30, 2018
6864106
Write group end tags in repeated fields
ObsidianMinor Nov 1, 2018
75b6351
Readability review
ObsidianMinor Nov 1, 2018
1f97065
Remove C# group files from libprotoc.cmake
ObsidianMinor Nov 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions BUILD
View file
Open in desktop
Expand Up @@ -301,10 +301,12 @@ cc_library(
"src/google/protobuf/compiler/csharp/csharp_map_field.cc",
"src/google/protobuf/compiler/csharp/csharp_message.cc",
"src/google/protobuf/compiler/csharp/csharp_message_field.cc",
"src/google/protobuf/compiler/csharp/csharp_group_field.cc",
"src/google/protobuf/compiler/csharp/csharp_primitive_field.cc",
"src/google/protobuf/compiler/csharp/csharp_reflection_class.cc",
"src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc",
"src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc",
"src/google/protobuf/compiler/csharp/csharp_repeated_group_field.cc",
"src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc",
"src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc",
"src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc",
Expand Down
2 changes: 2 additions & 0 deletions cmake/libprotoc.cmake
View file
Open in desktop
Expand Up @@ -24,10 +24,12 @@ set(libprotoc_files
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_map_field.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_message.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_message_field.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_group_field.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_repeated_group_field.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc
${protobuf_source_dir}/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
Expand Down
12 changes: 9 additions & 3 deletions csharp/src/AddressBook/Addressbook.cs
View file
Open in desktop
Expand Up @@ -260,7 +260,9 @@ public sealed partial class Person : pb::IMessage<Person> {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
Name = input.ReadString();
Expand Down Expand Up @@ -440,7 +442,9 @@ public sealed partial class PhoneNumber : pb::IMessage<PhoneNumber> {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
Number = input.ReadString();
Expand Down Expand Up @@ -573,7 +577,9 @@ public sealed partial class AddressBook : pb::IMessage<AddressBook> {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
people_.AddEntriesFrom(input, _repeated_people_codec);
Expand Down
8 changes: 6 additions & 2 deletions csharp/src/Google.Protobuf.Conformance/Conformance.cs
View file
Open in desktop
Expand Up @@ -343,7 +343,9 @@ public enum PayloadOneofCase {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
ProtobufPayload = input.ReadBytes();
Expand Down Expand Up @@ -683,7 +685,9 @@ public enum ResultOneofCase {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
ParseError = input.ReadString();
Expand Down
28 changes: 21 additions & 7 deletions csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
View file
Open in desktop
Expand Up @@ -541,7 +541,9 @@ public sealed partial class TestMap : pb::IMessage<TestMap> {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec);
Expand Down Expand Up @@ -737,7 +739,9 @@ public sealed partial class TestMapSubmessage : pb::IMessage<TestMapSubmessage>
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
if (testMap_ == null) {
Expand Down Expand Up @@ -861,7 +865,9 @@ public sealed partial class TestMessageMap : pb::IMessage<TestMessageMap> {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
mapInt32Message_.AddEntriesFrom(input, _map_mapInt32Message_codec);
Expand Down Expand Up @@ -1001,7 +1007,9 @@ public sealed partial class TestSameTypeMap : pb::IMessage<TestSameTypeMap> {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
map1_.AddEntriesFrom(input, _map_map1_codec);
Expand Down Expand Up @@ -1350,7 +1358,9 @@ public sealed partial class TestArenaMap : pb::IMessage<TestArenaMap> {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec);
Expand Down Expand Up @@ -1531,7 +1541,9 @@ public sealed partial class MessageContainingEnumCalledType : pb::IMessage<Messa
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
type_.AddEntriesFrom(input, _map_type_codec);
Expand Down Expand Up @@ -1666,7 +1678,9 @@ public sealed partial class MessageContainingMapCalledEntry : pb::IMessage<Messa
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 10: {
entry_.AddEntriesFrom(input, _map_entry_codec);
Expand Down
12 changes: 9 additions & 3 deletions csharp/src/Google.Protobuf.Test/TestProtos/TestMessagesProto3.cs
View file
Open in desktop
Expand Up @@ -2867,7 +2867,9 @@ public enum OneofFieldOneofCase {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 8: {
OptionalInt32 = input.ReadInt32();
Expand Down Expand Up @@ -3582,7 +3584,9 @@ public sealed partial class NestedMessage : pb::IMessage<NestedMessage> {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 8: {
A = input.ReadInt32();
Expand Down Expand Up @@ -3723,7 +3727,9 @@ public sealed partial class ForeignMessage : pb::IMessage<ForeignMessage> {
while ((tag = input.ReadTag()) != 0) {
switch(tag) {
default:
_unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
if (!pb::UnknownFieldSet.MergeFieldFrom(ref _unknownFields, input)) {
return;
}
break;
case 8: {
C = input.ReadInt32();
Expand Down