improve readability

protocolbuffers · May 27, 2020 · 6a92d59 · 6a92d59
1 parent da35f6f
commit 6a92d59
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 55 deletions.
diff --git a/src/google/protobuf/compiler/csharp/csharp_map_field.cc b/src/google/protobuf/compiler/csharp/csharp_map_field.cc
@@ -98,15 +98,11 @@ void MapFieldGenerator::GenerateParsingCode(io::Printer* printer) {
 }
 
 void MapFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  if (use_parse_context) {
-    printer->Print(
-      variables_,
-      "$name$_.AddEntriesFrom(ref input, _map_$name$_codec);\n");
-  } else {
-    printer->Print(
-      variables_,
-      "$name$_.AddEntriesFrom(input, _map_$name$_codec);\n");
-  }
+  printer->Print(
+    variables_,
+    use_parse_context
+    ? "$name$_.AddEntriesFrom(ref input, _map_$name$_codec);\n"
+    : "$name$_.AddEntriesFrom(input, _map_$name$_codec);\n");
 }
 
 void MapFieldGenerator::GenerateSerializationCode(io::Printer* printer) {

diff --git a/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc b/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
@@ -82,15 +82,11 @@ void RepeatedEnumFieldGenerator::GenerateParsingCode(io::Printer* printer) {
 }
 
 void RepeatedEnumFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  if (use_parse_context) {
-    printer->Print(
-      variables_,
-      "$name$_.AddEntriesFrom(ref input, _repeated_$name$_codec);\n");
-  } else {
-    printer->Print(
-      variables_,
-      "$name$_.AddEntriesFrom(input, _repeated_$name$_codec);\n");
-  }
+  printer->Print(
+    variables_,
+    use_parse_context
+    ? "$name$_.AddEntriesFrom(ref input, _repeated_$name$_codec);\n"
+    : "$name$_.AddEntriesFrom(input, _repeated_$name$_codec);\n");
 }
 
 void RepeatedEnumFieldGenerator::GenerateSerializationCode(io::Printer* printer) {

diff --git a/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc b/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc
@@ -97,15 +97,11 @@ void RepeatedMessageFieldGenerator::GenerateParsingCode(io::Printer* printer) {
 }
 
 void RepeatedMessageFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  if (use_parse_context) {
-    printer->Print(
-      variables_,
-      "$name$_.AddEntriesFrom(ref input, _repeated_$name$_codec);\n");
-  } else {
-    printer->Print(
-      variables_,
-      "$name$_.AddEntriesFrom(input, _repeated_$name$_codec);\n");
-  }
+  printer->Print(
+    variables_,
+    use_parse_context
+    ? "$name$_.AddEntriesFrom(ref input, _repeated_$name$_codec);\n"
+    : "$name$_.AddEntriesFrom(input, _repeated_$name$_codec);\n");
 }
 
 void RepeatedMessageFieldGenerator::GenerateSerializationCode(io::Printer* printer) {

diff --git a/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc b/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
@@ -82,15 +82,11 @@ void RepeatedPrimitiveFieldGenerator::GenerateParsingCode(io::Printer* printer)
 }
 
 void RepeatedPrimitiveFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  if (use_parse_context) {
-    printer->Print(
-      variables_,
-      "$name$_.AddEntriesFrom(ref input, _repeated_$name$_codec);\n");
-  } else {
-    printer->Print(
-      variables_,
-      "$name$_.AddEntriesFrom(input, _repeated_$name$_codec);\n");
-  }
+  printer->Print(
+    variables_,
+    use_parse_context
+    ? "$name$_.AddEntriesFrom(ref input, _repeated_$name$_codec);\n"
+    : "$name$_.AddEntriesFrom(input, _repeated_$name$_codec);\n");
 }
 
 void RepeatedPrimitiveFieldGenerator::GenerateSerializationCode(io::Printer* printer) {

diff --git a/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc b/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
@@ -118,21 +118,17 @@ void WrapperFieldGenerator::GenerateParsingCode(io::Printer* printer) {
 }
 
 void WrapperFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  if (use_parse_context) {
-    printer->Print(
-      variables_,
-      "$type_name$ value = _single_$name$_codec.Read(ref input);\n"
+  printer->Print(
+    variables_,
+    use_parse_context
+    ? "$type_name$ value = _single_$name$_codec.Read(ref input);\n"
       "if ($has_not_property_check$ || value != $default_value$) {\n"
       "  $property_name$ = value;\n"
-      "}\n");
-  } else {
-    printer->Print(
-      variables_,
-      "$type_name$ value = _single_$name$_codec.Read(input);\n"
+      "}\n"
+    : "$type_name$ value = _single_$name$_codec.Read(input);\n"
       "if ($has_not_property_check$ || value != $default_value$) {\n"
       "  $property_name$ = value;\n"
       "}\n");
-  }
 }
 
 void WrapperFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
@@ -265,15 +261,11 @@ void WrapperOneofFieldGenerator::GenerateParsingCode(io::Printer* printer) {
 }
 
 void WrapperOneofFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  if (use_parse_context) {
-    printer->Print(
-      variables_,
-      "$property_name$ = _oneof_$name$_codec.Read(ref input);\n");
-  } else {
-    printer->Print(
-      variables_,
-      "$property_name$ = _oneof_$name$_codec.Read(input);\n");
-  }
+  printer->Print(
+    variables_,
+    use_parse_context
+    ? "$property_name$ = _oneof_$name$_codec.Read(ref input);\n"
+    : "$property_name$ = _oneof_$name$_codec.Read(input);\n");
 }
 
 void WrapperOneofFieldGenerator::GenerateSerializationCode(io::Printer* printer) {