Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve field name/accessor name conflicts.

Browse Source 
PiperOrigin-RevId: 470335824
pull/13171/head
Protobuf Team Bot 2 years ago committed by Copybara-Service
parent 5b46a55a46
commit 52c9b98692
5 changed files with 230 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      upb/msg_test.proto
  2. 19
      upbc/BUILD
  3. 81
      upbc/names.cc
  4. 51
      upbc/names.h
  5. 123
      upbc/protoc-gen-upb.cc

5
upb/msg_test.proto
Unescape View File

@ -193,3 +193,8 @@ message TestMapFieldExtra {
}
map<int32, EnumMap> map_field = 1;
}
message TestNameConflict {
map<string, string> map_field = 1;
optional bool clear_map_field = 2;
}

19
upbc/BUILD
Unescape View File

@ -114,6 +114,24 @@ cc_library(
visibility = ["//third_party/upb/protos_generator:__pkg__"],
)
cc_library(
name = "names",
srcs = [
"names.cc",
],
hdrs = [
"names.h",
],
copts = UPB_DEFAULT_CPPOPTS,
visibility = ["//third_party/upb/protos_generator:__pkg__"],
deps = [
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/strings",
"@com_google_protobuf//:protobuf",
"@com_google_protobuf//src/google/protobuf/compiler:code_generator",
],
)
cc_binary(
name = "protoc-gen-upb",
srcs = ["protoc-gen-upb.cc"],
@ -122,6 +140,7 @@ cc_binary(
deps = [
":common",
":file_layout",
":names",
"//:mini_table",
"//:port",
"//:upb",

81
upbc/names.cc
Unescape View File

@ -0,0 +1,81 @@
/*
* Copyright (c) 2007-2021, Google LLC
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of Google LLC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "upbc/names.h"
#include <string>
#include "google/protobuf/descriptor.h"
#include "absl/strings/match.h"
namespace upbc {
namespace protobuf = ::google::protobuf;
// List of generated accessor prefixes to check against.
// Example:
// optional repeated string phase = 236;
// optional bool clear_phase = 237;
static constexpr absl::string_view kAccessorPrefixes[] = {
"clear_",
"delete_",
"add_",
"resize_",
};
std::string ResolveFieldName(const protobuf::FieldDescriptor* field,
const NameToFieldDescriptorMap& field_names) {
absl::string_view field_name = field->name();
for (const auto prefix : kAccessorPrefixes) {
// If field name starts with a prefix such as clear_ and the proto
// contains a field name with trailing end, depending on type of field
// (repeated, map, message) we have a conflict to resolve.
if (absl::StartsWith(field_name, prefix)) {
auto match = field_names.find(field_name.substr(prefix.size()));
if (match != field_names.end()) {
const auto* candidate = match->second;
if (candidate->is_repeated() || candidate->is_map()) {
return absl::StrCat(field_name, "_");
}
}
}
}
return std::string(field_name);
}
// Returns field map by name to use for conflict checks.
NameToFieldDescriptorMap CreateFieldNameMap(
const protobuf::Descriptor* message) {
NameToFieldDescriptorMap field_names;
for (int i = 0; i < message->field_count(); i++) {
const protobuf::FieldDescriptor* field = message->field(i);
field_names.emplace(field->name(), field);
}
return field_names;
}
} // namespace upbc

51
upbc/names.h
Unescape View File

@ -0,0 +1,51 @@
/*
* Copyright (c) 2009-2021, Google LLC
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of Google LLC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef UPB_PROTOS_GENERATOR_NAMES_H
#define UPB_PROTOS_GENERATOR_NAMES_H
#include <string>
#include "google/protobuf/descriptor.h"
#include "absl/container/flat_hash_map.h"
namespace upbc {
using NameToFieldDescriptorMap =
absl::flat_hash_map<absl::string_view, const google::protobuf::FieldDescriptor*>;
// Returns field name by resolving naming conflicts across
// proto field names (such as clear_ prefixes).
std::string ResolveFieldName(const google::protobuf::FieldDescriptor* field,
const NameToFieldDescriptorMap& field_names);
// Returns field map by name to use for conflict checks.
NameToFieldDescriptorMap CreateFieldNameMap(const google::protobuf::Descriptor* message);
} // namespace upbc
#endif // UPB_PROTOS_GENERATOR_NAMES_H

123
upbc/protoc-gen-upb.cc
Unescape View File

@ -38,6 +38,7 @@
#include "upb/upb.hpp"
#include "upbc/common.h"
#include "upbc/file_layout.h"
#include "upbc/names.h"
// Must be last.
#include "upb/port_def.inc"
@ -54,7 +55,9 @@ namespace protobuf = ::google::protobuf;
inline std::vector<const google::protobuf::FieldDescriptor*> FieldHotnessOrder(
const google::protobuf::Descriptor* message) {
std::vector<const google::protobuf::FieldDescriptor*> fields;
for (int i = 0; i < message->field_count(); i++) {
size_t field_count = message->field_count();
fields.reserve(field_count);
for (size_t i = 0; i < field_count; i++) {
fields.push_back(message->field(i));
}
std::sort(
@ -400,7 +403,9 @@ void GenerateOneofInHeader(const protobuf::OneofDescriptor* oneof,
void GenerateHazzer(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
std::string resolved_name = ResolveFieldName(field, field_names);
if (layout.HasHasbit(field)) {
output(
R"cc(
@ -408,7 +413,7 @@ void GenerateHazzer(const protobuf::FieldDescriptor* field,
return _upb_hasbit(msg, $2);
}
)cc",
msg_name, field->name(), layout.GetHasbitIndex(field));
msg_name, resolved_name, layout.GetHasbitIndex(field));
} else if (field->real_containing_oneof()) {
output(
R"cc(
@ -416,7 +421,7 @@ void GenerateHazzer(const protobuf::FieldDescriptor* field,
return _upb_getoneofcase(msg, $2) == $3;
}
)cc",
msg_name, field->name(),
msg_name, resolved_name,
layout.GetOneofCaseOffset(field->real_containing_oneof()),
field->number());
} else if (field->message_type()) {
@ -426,19 +431,20 @@ void GenerateHazzer(const protobuf::FieldDescriptor* field,
return _upb_has_submsg_nohasbit(msg, $2);
}
)cc",
msg_name, field->name(), layout.GetFieldOffset(field));
msg_name, resolved_name, layout.GetFieldOffset(field));
}
}
void GenerateClear(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
if (field == field->containing_type()->map_key() ||
field == field->containing_type()->map_value()) {
// Cannot be cleared.
return;
}
std::string resolved_name = ResolveFieldName(field, field_names);
if (field->real_containing_oneof()) {
const protobuf::OneofDescriptor* oneof = field->real_containing_oneof();
std::string oneof_fullname = ToCIdent(oneof->full_name());
@ -452,7 +458,7 @@ void GenerateClear(const protobuf::FieldDescriptor* field,
UPB_WRITE_ONEOF(msg, $2, $3, $7, $4, $6_NOT_SET);
}
)cc",
msg_name, field->name(), CType(field), layout.GetFieldOffset(field),
msg_name, resolved_name, CType(field), layout.GetFieldOffset(field),
layout.GetOneofCaseOffset(field->real_containing_oneof()),
field->number(), oneof_fullname, default_value);
} else {
@ -465,7 +471,7 @@ void GenerateClear(const protobuf::FieldDescriptor* field,
_upb_clearhas(msg, $3);
}
)cc",
msg_name, field->name(), layout.GetFieldOffset(field),
msg_name, resolved_name, layout.GetFieldOffset(field),
layout.GetHasbitIndex(field));
} else {
output(
@ -474,7 +480,7 @@ void GenerateClear(const protobuf::FieldDescriptor* field,
*UPB_PTR_AT(msg, $2, const upb_Message*) = NULL;
}
)cc",
msg_name, field->name(), layout.GetFieldOffset(field));
msg_name, resolved_name, layout.GetFieldOffset(field));
}
} else if (layout.HasHasbit(field)) {
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
@ -485,7 +491,7 @@ void GenerateClear(const protobuf::FieldDescriptor* field,
_upb_clearhas(msg, $4);
}
)cc",
msg_name, field->name(), CType(field), layout.GetFieldOffset(field),
msg_name, resolved_name, CType(field), layout.GetFieldOffset(field),
layout.GetHasbitIndex(field));
} else {
output(
@ -495,7 +501,7 @@ void GenerateClear(const protobuf::FieldDescriptor* field,
_upb_clearhas(msg, $4);
}
)cc",
msg_name, field->name(), CType(field), layout.GetFieldOffset(field),
msg_name, resolved_name, CType(field), layout.GetFieldOffset(field),
layout.GetHasbitIndex(field));
}
} else {
@ -506,7 +512,7 @@ void GenerateClear(const protobuf::FieldDescriptor* field,
*UPB_PTR_AT(msg, $3, $2) = upb_StringView_FromDataAndSize(NULL, 0);
}
)cc",
msg_name, field->name(), CType(field),
msg_name, resolved_name, CType(field),
layout.GetFieldOffset(field));
} else {
output(
@ -515,7 +521,7 @@ void GenerateClear(const protobuf::FieldDescriptor* field,
*UPB_PTR_AT(msg, $3, $2) = 0;
}
)cc",
msg_name, field->name(), CType(field), layout.GetFieldOffset(field),
msg_name, resolved_name, CType(field), layout.GetFieldOffset(field),
layout.GetHasbitIndex(field));
}
}
@ -524,7 +530,9 @@ void GenerateClear(const protobuf::FieldDescriptor* field,
void GenerateRepeatedClear(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
std::string resolved_name = ResolveFieldName(field, field_names);
if (layout.HasHasbit(field)) {
output(
R"cc(
@ -533,7 +541,7 @@ void GenerateRepeatedClear(const protobuf::FieldDescriptor* field,
_upb_clearhas(msg, $4);
}
)cc",
msg_name, field->name(), layout.GetFieldOffset(field),
msg_name, resolved_name, layout.GetFieldOffset(field),
layout.GetHasbitIndex(field));
} else {
output(
@ -542,30 +550,32 @@ void GenerateRepeatedClear(const protobuf::FieldDescriptor* field,
_upb_array_detach(msg, $2);
}
)cc",
msg_name, field->name(), layout.GetFieldOffset(field));
msg_name, resolved_name, layout.GetFieldOffset(field));
}
}
void GenerateMapGetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
const protobuf::Descriptor* entry = field->message_type();
const protobuf::FieldDescriptor* key = entry->FindFieldByNumber(1);
const protobuf::FieldDescriptor* val = entry->FindFieldByNumber(2);
std::string resolved_name = ResolveFieldName(field, field_names);
output(
R"cc(
UPB_INLINE size_t $0_$1_size(const $0* msg) {
return _upb_msg_map_size(msg, $2);
}
)cc",
msg_name, field->name(), layout.GetFieldOffset(field));
msg_name, resolved_name, layout.GetFieldOffset(field));
output(
R"cc(
UPB_INLINE bool $0_$1_get(const $0* msg, $2 key, $3* val) {
return _upb_msg_map_get(msg, $4, &key, $5, val, $6);
}
)cc",
msg_name, field->name(), CType(key), CType(val),
msg_name, resolved_name, CType(key), CType(val),
layout.GetFieldOffset(field),
key->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING
? "0"
@ -579,7 +589,7 @@ void GenerateMapGetters(const protobuf::FieldDescriptor* field,
return ($0)_upb_msg_map_next(msg, $3, iter);
}
)cc",
CTypeConst(field), msg_name, field->name(), layout.GetFieldOffset(field));
CTypeConst(field), msg_name, resolved_name, layout.GetFieldOffset(field));
}
void GenerateMapEntryGetters(const protobuf::FieldDescriptor* field,
@ -600,18 +610,22 @@ void GenerateMapEntryGetters(const protobuf::FieldDescriptor* field,
void GenerateRepeatedGetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout,
absl::string_view msg_name, Output& output) {
absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
output(
R"cc(
UPB_INLINE $0 const* $1_$2(const $1* msg, size_t* len) {
return ($0 const*)_upb_array_accessor(msg, $3, len);
}
)cc",
CTypeConst(field), msg_name, field->name(), layout.GetFieldOffset(field));
CTypeConst(field), msg_name, ResolveFieldName(field, field_names),
layout.GetFieldOffset(field));
}
void GenerateOneofGetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
output(
R"cc(
@ -619,14 +633,17 @@ void GenerateOneofGetters(const protobuf::FieldDescriptor* field,
return UPB_READ_ONEOF(msg, $0, $3, $4, $5, $6);
}
)cc",
CTypeConst(field), msg_name, field->name(), layout.GetFieldOffset(field),
CTypeConst(field), msg_name, ResolveFieldName(field, field_names),
layout.GetFieldOffset(field),
layout.GetOneofCaseOffset(field->real_containing_oneof()),
field->number(), FieldDefault(field));
}
void GenerateScalarGetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
std::string resolved_name = ResolveFieldName(field, field_names);
if (HasNonZeroDefault(field)) {
output(
R"cc(
@ -634,7 +651,7 @@ void GenerateScalarGetters(const protobuf::FieldDescriptor* field,
return $1_has_$2(msg) ? *UPB_PTR_AT(msg, $3, $0) : $4;
}
)cc",
CTypeConst(field), msg_name, field->name(),
CTypeConst(field), msg_name, resolved_name,
layout.GetFieldOffset(field), FieldDefault(field));
} else {
output(
@ -643,45 +660,48 @@ void GenerateScalarGetters(const protobuf::FieldDescriptor* field,
return *UPB_PTR_AT(msg, $3, $0);
}
)cc",
CTypeConst(field), msg_name, field->name(),
CTypeConst(field), msg_name, resolved_name,
layout.GetFieldOffset(field));
}
}
void GenerateGetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
if (field->is_map()) {
GenerateMapGetters(field, layout, msg_name, output);
GenerateMapGetters(field, layout, msg_name, field_names, output);
} else if (field->containing_type()->options().map_entry()) {
GenerateMapEntryGetters(field, msg_name, output);
} else if (field->is_repeated()) {
GenerateRepeatedGetters(field, layout, msg_name, output);
GenerateRepeatedGetters(field, layout, msg_name, field_names, output);
} else if (field->real_containing_oneof()) {
GenerateOneofGetters(field, layout, msg_name, output);
GenerateOneofGetters(field, layout, msg_name, field_names, output);
} else {
GenerateScalarGetters(field, layout, msg_name, output);
GenerateScalarGetters(field, layout, msg_name, field_names, output);
}
}
void GenerateMapSetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
const protobuf::Descriptor* entry = field->message_type();
const protobuf::FieldDescriptor* key = entry->FindFieldByNumber(1);
const protobuf::FieldDescriptor* val = entry->FindFieldByNumber(2);
std::string resolved_name = ResolveFieldName(field, field_names);
output(
R"cc(
UPB_INLINE void $0_$1_clear($0* msg) { _upb_msg_map_clear(msg, $2); }
)cc",
msg_name, field->name(), layout.GetFieldOffset(field));
msg_name, resolved_name, layout.GetFieldOffset(field));
output(
R"cc(
UPB_INLINE bool $0_$1_set($0* msg, $2 key, $3 val, upb_Arena* a) {
return _upb_msg_map_set(msg, $4, &key, $5, &val, $6, a);
}
)cc",
msg_name, field->name(), CType(key), CType(val),
msg_name, resolved_name, CType(key), CType(val),
layout.GetFieldOffset(field),
key->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING
? "0"
@ -695,7 +715,7 @@ void GenerateMapSetters(const protobuf::FieldDescriptor* field,
return _upb_msg_map_delete(msg, $3, &key, $4);
}
)cc",
msg_name, field->name(), CType(key), layout.GetFieldOffset(field),
msg_name, resolved_name, CType(key), layout.GetFieldOffset(field),
key->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING
? "0"
: "sizeof(key)");
@ -705,26 +725,29 @@ void GenerateMapSetters(const protobuf::FieldDescriptor* field,
return ($0)_upb_msg_map_next(msg, $3, iter);
}
)cc",
CType(field), msg_name, field->name(), layout.GetFieldOffset(field));
CType(field), msg_name, resolved_name, layout.GetFieldOffset(field));
}
void GenerateRepeatedSetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout,
absl::string_view msg_name, Output& output) {
absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
std::string resolved_name = ResolveFieldName(field, field_names);
output(
R"cc(
UPB_INLINE $0* $1_mutable_$2($1* msg, size_t* len) {
return ($0*)_upb_array_mutable_accessor(msg, $3, len);
}
)cc",
CType(field), msg_name, field->name(), layout.GetFieldOffset(field));
CType(field), msg_name, resolved_name, layout.GetFieldOffset(field));
output(
R"cc(
UPB_INLINE $0* $1_resize_$2($1* msg, size_t len, upb_Arena* arena) {
return ($0*)_upb_Array_Resize_accessor2(msg, $3, len, $4, arena);
}
)cc",
CType(field), msg_name, field->name(), layout.GetFieldOffset(field),
CType(field), msg_name, resolved_name, layout.GetFieldOffset(field),
SizeLg2(field));
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
output(
@ -736,7 +759,7 @@ void GenerateRepeatedSetters(const protobuf::FieldDescriptor* field,
return sub;
}
)cc",
MessageName(field->message_type()), msg_name, field->name(),
MessageName(field->message_type()), msg_name, resolved_name,
MessageInit(field->message_type()), layout.GetFieldOffset(field),
SizeLg2(field));
} else {
@ -746,23 +769,25 @@ void GenerateRepeatedSetters(const protobuf::FieldDescriptor* field,
return _upb_Array_Append_accessor2(msg, $3, $4, &val, arena);
}
)cc",
CType(field), msg_name, field->name(), layout.GetFieldOffset(field),
CType(field), msg_name, resolved_name, layout.GetFieldOffset(field),
SizeLg2(field));
}
}
void GenerateNonRepeatedSetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout,
absl::string_view msg_name, Output& output) {
absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
if (field == field->containing_type()->map_key()) {
// Key cannot be mutated.
return;
}
std::string resolved_name = ResolveFieldName(field, field_names);
// The common function signature for all setters. Varying
// implementations follow.
output("UPB_INLINE void $0_set_$1($0 *msg, $2 value) {\n", msg_name,
field->name(), CType(field));
resolved_name, CType(field));
if (field == field->containing_type()->map_value()) {
output(
@ -804,20 +829,21 @@ void GenerateNonRepeatedSetters(const protobuf::FieldDescriptor* field,
return sub;
}
)cc",
MessageName(field->message_type()), msg_name, field->name(),
MessageName(field->message_type()), msg_name, resolved_name,
MessageInit(field->message_type()));
}
}
void GenerateSetters(const protobuf::FieldDescriptor* field,
const FileLayout& layout, absl::string_view msg_name,
const NameToFieldDescriptorMap& field_names,
Output& output) {
if (field->is_map()) {
GenerateMapSetters(field, layout, msg_name, output);
GenerateMapSetters(field, layout, msg_name, field_names, output);
} else if (field->is_repeated()) {
GenerateRepeatedSetters(field, layout, msg_name, output);
GenerateRepeatedSetters(field, layout, msg_name, field_names, output);
} else {
GenerateNonRepeatedSetters(field, layout, msg_name, output);
GenerateNonRepeatedSetters(field, layout, msg_name, field_names, output);
}
}
@ -825,7 +851,6 @@ void GenerateMessageInHeader(const protobuf::Descriptor* message,
const FileLayout& layout, Output& output) {
output("/* $0 */\n\n", message->full_name());
std::string msg_name = ToCIdent(message->full_name());
if (!message->options().map_entry()) {
GenerateMessageFunctionsInHeader(message, output);
}
@ -834,20 +859,21 @@ void GenerateMessageInHeader(const protobuf::Descriptor* message,
GenerateOneofInHeader(message->oneof_decl(i), layout, msg_name, output);
}
auto field_names = CreateFieldNameMap(message);
for (auto field : FieldNumberOrder(message)) {
GenerateHazzer(field, layout, msg_name, output);
GenerateHazzer(field, layout, msg_name, field_names, output);
if (field->is_repeated()) {
GenerateRepeatedClear(field, layout, msg_name, output);
GenerateRepeatedClear(field, layout, msg_name, field_names, output);
} else {
GenerateClear(field, layout, msg_name, output);
GenerateClear(field, layout, msg_name, field_names, output);
}
GenerateGetters(field, layout, msg_name, output);
GenerateGetters(field, layout, msg_name, field_names, output);
}
output("\n");
for (auto field : FieldNumberOrder(message)) {
GenerateSetters(field, layout, msg_name, output);
GenerateSetters(field, layout, msg_name, field_names, output);
}
output("\n");
@ -954,7 +980,6 @@ void WriteHeader(const FileLayout& layout, Output& output) {
}
output("\n");
for (auto message : this_file_messages) {
GenerateMessageInHeader(message, layout, output);
}

Write Preview
Loading…
Cancel
Save