From 70002efe0927eea056acff62e551408eefa1f3f1 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Thu, 6 Jul 2023 11:07:25 -0700 Subject: [PATCH] Move EnumFieldGenerator over to Printer::Print PiperOrigin-RevId: 546039434 --- .../compiler/objectivec/enum_field.cc | 63 +++++++++---------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/src/google/protobuf/compiler/objectivec/enum_field.cc b/src/google/protobuf/compiler/objectivec/enum_field.cc index 9c71479b47..1e68769b9d 100644 --- a/src/google/protobuf/compiler/objectivec/enum_field.cc +++ b/src/google/protobuf/compiler/objectivec/enum_field.cc @@ -33,7 +33,6 @@ #include #include "absl/container/flat_hash_map.h" -#include "google/protobuf/compiler/objectivec/helpers.h" #include "google/protobuf/compiler/objectivec/names.h" #include "google/protobuf/io/printer.h" @@ -79,22 +78,21 @@ void EnumFieldGenerator::GenerateCFunctionDeclarations( return; } - // clang-format off - printer->Print( - variables_, - "/**\n" - " * Fetches the raw value of a @c $owning_message_class$'s @c $name$ property, even\n" - " * if the value was not defined by the enum at the time the code was generated.\n" - " **/\n" - "int32_t $owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message);\n" - "/**\n" - " * Sets the raw value of an @c $owning_message_class$'s @c $name$ property, allowing\n" - " * it to be set to a value that was not defined by the enum at the time the code\n" - " * was generated.\n" - " **/\n" - "void Set$owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message, int32_t value);\n" - "\n"); - // clang-format on + auto vars = printer->WithVars(variables_); + printer->Emit(R"objc( + /** + * Fetches the raw value of a @c $owning_message_class$'s @c $name$ property, even + * if the value was not defined by the enum at the time the code was generated. + **/ + int32_t $owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message); + /** + * Sets the raw value of an @c $owning_message_class$'s @c $name$ property, allowing + * it to be set to a value that was not defined by the enum at the time the code + * was generated. + **/ + void Set$owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message, int32_t value); + )objc"); + printer->Emit("\n"); } void EnumFieldGenerator::GenerateCFunctionImplementations( @@ -103,22 +101,21 @@ void EnumFieldGenerator::GenerateCFunctionImplementations( return; } - // clang-format off - printer->Print( - variables_, - "int32_t $owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message) {\n" - " GPBDescriptor *descriptor = [$owning_message_class$ descriptor];\n" - " GPBFieldDescriptor *field = [descriptor fieldWithNumber:$field_number_name$];\n" - " return GPBGetMessageRawEnumField(message, field);\n" - "}\n" - "\n" - "void Set$owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message, int32_t value) {\n" - " GPBDescriptor *descriptor = [$owning_message_class$ descriptor];\n" - " GPBFieldDescriptor *field = [descriptor fieldWithNumber:$field_number_name$];\n" - " GPBSetMessageRawEnumField(message, field, value);\n" - "}\n" - "\n"); - // clang-format on + auto vars = printer->WithVars(variables_); + printer->Emit(R"objc( + int32_t $owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message) { + GPBDescriptor *descriptor = [$owning_message_class$ descriptor]; + GPBFieldDescriptor *field = [descriptor fieldWithNumber:$field_number_name$]; + return GPBGetMessageRawEnumField(message, field); + } + + void Set$owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message, int32_t value) { + GPBDescriptor *descriptor = [$owning_message_class$ descriptor]; + GPBFieldDescriptor *field = [descriptor fieldWithNumber:$field_number_name$]; + GPBSetMessageRawEnumField(message, field, value); + } + )objc"); + printer->Emit("\n"); } void EnumFieldGenerator::DetermineForwardDeclarations(