Move repeated field generation into separate file to prepare for C++ RepeatedFieldProxy.

PiperOrigin-RevId: 526117153
pull/13171/head
Protobuf Team Bot 2 years ago committed by Copybara-Service
parent 70b92e6cd1
commit ec75a3cbb6
  1. 2
      protos_generator/BUILD
  2. 239
      protos_generator/gen_accessors.cc
  3. 262
      protos_generator/gen_repeated_fields.cc
  4. 66
      protos_generator/gen_repeated_fields.h

@ -52,6 +52,7 @@ cc_library(
"gen_enums.cc", "gen_enums.cc",
"gen_extensions.cc", "gen_extensions.cc",
"gen_messages.cc", "gen_messages.cc",
"gen_repeated_fields.cc",
"gen_utils.cc", "gen_utils.cc",
"output.cc", "output.cc",
], ],
@ -60,6 +61,7 @@ cc_library(
"gen_enums.h", "gen_enums.h",
"gen_extensions.h", "gen_extensions.h",
"gen_messages.h", "gen_messages.h",
"gen_repeated_fields.h",
"gen_utils.h", "gen_utils.h",
"output.h", "output.h",
], ],

@ -25,10 +25,14 @@
#include "protos_generator/gen_accessors.h" #include "protos_generator/gen_accessors.h"
#include <string>
#include "absl/container/flat_hash_set.h" #include "absl/container/flat_hash_set.h"
#include "absl/strings/match.h" #include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "google/protobuf/descriptor.h" #include "google/protobuf/descriptor.h"
#include "protos_generator/gen_repeated_fields.h"
#include "protos_generator/gen_utils.h" #include "protos_generator/gen_utils.h"
#include "protos_generator/output.h" #include "protos_generator/output.h"
#include "upbc/common.h" #include "upbc/common.h"
@ -44,37 +48,23 @@ using NameToFieldDescriptorMap =
void WriteFieldAccessorHazzer(const protobuf::Descriptor* desc, void WriteFieldAccessorHazzer(const protobuf::Descriptor* desc,
const protobuf::FieldDescriptor* field, const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name, absl::string_view resolved_field_name,
const absl::string_view resolved_upbc_name, absl::string_view resolved_upbc_name,
Output& output); Output& output);
void WriteFieldAccessorClear(const protobuf::Descriptor* desc, void WriteFieldAccessorClear(const protobuf::Descriptor* desc,
const protobuf::FieldDescriptor* field, const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name, absl::string_view resolved_field_name,
const absl::string_view resolved_upbc_name, absl::string_view resolved_upbc_name,
Output& output); Output& output);
void WriteMapFieldAccessors(const protobuf::Descriptor* desc, void WriteMapFieldAccessors(const protobuf::Descriptor* desc,
const protobuf::FieldDescriptor* field, const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name, absl::string_view resolved_field_name,
const absl::string_view resolved_upbc_name, absl::string_view resolved_upbc_name,
Output& output); Output& output);
void WriteMapAccessorDefinitions(const protobuf::Descriptor* message, void WriteMapAccessorDefinitions(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field, const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name, absl::string_view resolved_field_name,
const absl::string_view class_name,
Output& output);
void WriteRepeatedMessageAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name,
absl::string_view class_name, Output& output);
void WriteRepeatedStringAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name,
const absl::string_view class_name,
Output& output);
void WriteRepeatedScalarAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name,
absl::string_view class_name, Output& output); absl::string_view class_name, Output& output);
// Returns C++ class member name by resolving naming conflicts across // Returns C++ class member name by resolving naming conflicts across
@ -119,38 +109,8 @@ void WriteFieldAccessorsInHeader(const protobuf::Descriptor* desc,
} else if (desc->options().map_entry()) { } else if (desc->options().map_entry()) {
// TODO(b/237399867) Implement map entry // TODO(b/237399867) Implement map entry
} else if (field->is_repeated()) { } else if (field->is_repeated()) {
output( WriteRepeatedFieldsInMessageHeader(desc, field, resolved_field_name,
R"cc( resolved_upbc_name, output);
inline size_t $1_size() const {
size_t len;
$0_$2(msg_, &len);
return len;
}
inline void clear_$1() { $0_clear_$2(msg_); }
)cc",
MessageName(desc), resolved_field_name, resolved_upbc_name);
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
output(
R"cc(
$1 $2(size_t index) const;
absl::StatusOr<$0> add_$2();
$0 mutable_$2(size_t index) const;
)cc",
MessagePtrConstType(field, /* const */ false),
MessagePtrConstType(field, /* const */ true), resolved_field_name,
resolved_upbc_name);
} else {
output(
R"cc(
$0 $1(size_t index) const;
bool add_$1($0 val);
void set_$1(size_t index, $0 val);
bool resize_$1(size_t len);
)cc",
CppConstType(field), resolved_field_name);
}
} else { } else {
// non-repeated. // non-repeated.
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) { if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_STRING) {
@ -327,143 +287,6 @@ void WriteAccessorsInSource(const protobuf::Descriptor* desc, Output& output) {
output("} // namespace internal\n\n"); output("} // namespace internal\n\n");
} }
void WriteRepeatedMessageAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name,
const absl::string_view class_name,
Output& output) {
const char arena_expression[] = "arena_";
absl::string_view upbc_name = field->name();
output(
R"cc(
$1 $0::$2(size_t index) const {
size_t len;
auto* ptr = $3_$5(msg_, &len);
assert(index < len);
return ::protos::internal::CreateMessage<$4>((upb_Message*)*(ptr + index));
}
)cc",
class_name, MessagePtrConstType(field, /* is_const */ true),
resolved_field_name, MessageName(message),
MessageBaseType(field, /* maybe_const */ false), upbc_name);
output(
R"cc(
absl::StatusOr<$1> $0::add_$2() {
auto new_msg = $3_add_$6(msg_, $5);
if (!new_msg) {
return ::protos::MessageAllocationError();
}
return ::protos::internal::CreateMessageProxy<$4>((upb_Message*)new_msg, $5);
}
)cc",
class_name, MessagePtrConstType(field, /* const */ false),
resolved_field_name, MessageName(message),
MessageBaseType(field, /* maybe_const */ false), arena_expression,
upbc_name);
output(
R"cc(
$1 $0::mutable_$2(size_t index) const {
size_t len;
auto* ptr = $3_$6(msg_, &len);
assert(index < len);
return ::protos::internal::CreateMessageProxy<$4>(
(upb_Message*)*(ptr + index), $5);
}
)cc",
class_name, MessagePtrConstType(field, /* is_const */ false),
resolved_field_name, MessageName(message),
MessageBaseType(field, /* maybe_const */ false), arena_expression,
upbc_name);
}
void WriteRepeatedStringAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name,
const absl::string_view class_name,
Output& output) {
absl::string_view upbc_name = field->name();
output(
R"cc(
$1 $0::$2(size_t index) const {
size_t len;
auto* ptr = $3_mutable_$4(msg_, &len);
assert(index < len);
return ::protos::UpbStrToStringView(*(ptr + index));
}
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
output(
R"cc(
bool $0::resize_$1(size_t len) {
return $2_resize_$3(msg_, len, arena_);
}
)cc",
class_name, resolved_field_name, MessageName(message), upbc_name);
output(
R"cc(
bool $0::add_$2($1 val) {
return $3_add_$4(msg_, ::protos::UpbStrFromStringView(val, arena_), arena_);
}
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
output(
R"cc(
void $0::set_$2(size_t index, $1 val) {
size_t len;
auto* ptr = $3_mutable_$4(msg_, &len);
assert(index < len);
*(ptr + index) = ::protos::UpbStrFromStringView(val, arena_);
}
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
}
void WriteRepeatedScalarAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name,
const absl::string_view class_name,
Output& output) {
absl::string_view upbc_name = field->name();
output(
R"cc(
$1 $0::$2(size_t index) const {
size_t len;
auto* ptr = $3_mutable_$4(msg_, &len);
assert(index < len);
return *(ptr + index);
}
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
output(
R"cc(
bool $0::resize_$1(size_t len) {
return $2_resize_$3(msg_, len, arena_);
}
)cc",
class_name, resolved_field_name, MessageName(message), upbc_name);
output(
R"cc(
bool $0::add_$2($1 val) { return $3_add_$4(msg_, val, arena_); }
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
output(
R"cc(
void $0::set_$2(size_t index, $1 val) {
size_t len;
auto* ptr = $3_mutable_$4(msg_, &len);
assert(index < len);
*(ptr + index) = val;
}
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
}
void WriteMapAccessorDefinitions(const protobuf::Descriptor* message, void WriteMapAccessorDefinitions(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field, const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name, const absl::string_view resolved_field_name,
@ -628,40 +451,8 @@ void WriteUsingAccessorsInHeader(const protobuf::Descriptor* desc,
} else if (desc->options().map_entry()) { } else if (desc->options().map_entry()) {
// TODO(b/237399867) Implement map entry // TODO(b/237399867) Implement map entry
} else if (field->is_repeated()) { } else if (field->is_repeated()) {
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) { WriteRepeatedFieldUsingAccessors(field, class_name, resolved_field_name,
output( output, read_only);
R"cc(
using $0Access::$1;
using $0Access::$1_size;
using $0Access::mutable_$1;
)cc",
class_name, resolved_field_name);
if (!read_only) {
output(
R"cc(
using $0Access::add_$1;
using $0Access::clear_$1;
)cc",
class_name, resolved_field_name);
}
} else {
output(
R"cc(
using $0Access::$1;
using $0Access::$1_size;
)cc",
class_name, resolved_field_name);
if (!read_only) {
output(
R"cc(
using $0Access::add_$1;
using $0Access::clear_$1;
using $0Access::resize_$1;
using $0Access::set_$1;
)cc",
class_name, resolved_field_name);
}
}
} else { } else {
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) { if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
output("using $0Access::$1;\n", ClassName(desc), resolved_field_name); output("using $0Access::$1;\n", ClassName(desc), resolved_field_name);

@ -0,0 +1,262 @@
/*
* 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.
*/
#include "protos_generator/gen_repeated_fields.h"
#include <string>
#include <vector>
#include "google/protobuf/descriptor.pb.h"
#include "google/protobuf/descriptor.h"
#include "protos_generator/gen_accessors.h"
#include "protos_generator/gen_enums.h"
#include "protos_generator/gen_extensions.h"
#include "protos_generator/gen_utils.h"
#include "protos_generator/output.h"
#include "upbc/common.h"
#include "upbc/file_layout.h"
namespace protos_generator {
namespace protobuf = ::google::protobuf;
// Adds using accessors to reuse base Access class members from a Proxy/CProxy.
void WriteRepeatedFieldUsingAccessors(const protobuf::FieldDescriptor* field,
absl::string_view class_name,
absl::string_view resolved_field_name,
Output& output, bool read_only) {
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
output(
R"cc(
using $0Access::$1;
using $0Access::$1_size;
using $0Access::mutable_$1;
)cc",
class_name, resolved_field_name);
if (!read_only) {
output(
R"cc(
using $0Access::add_$1;
using $0Access::clear_$1;
)cc",
class_name, resolved_field_name);
}
} else {
output(
R"cc(
using $0Access::$1;
using $0Access::$1_size;
)cc",
class_name, resolved_field_name);
if (!read_only) {
output(
R"cc(
using $0Access::add_$1;
using $0Access::clear_$1;
using $0Access::resize_$1;
using $0Access::set_$1;
)cc",
class_name, resolved_field_name);
}
}
}
void WriteRepeatedFieldsInMessageHeader(const protobuf::Descriptor* desc,
const protobuf::FieldDescriptor* field,
absl::string_view resolved_field_name,
absl::string_view resolved_upbc_name,
Output& output) {
output(
R"cc(
inline size_t $1_size() const {
size_t len;
$0_$2(msg_, &len);
return len;
}
inline void clear_$1() { $0_clear_$2(msg_); }
)cc",
MessageName(desc), resolved_field_name, resolved_upbc_name);
if (field->cpp_type() == protobuf::FieldDescriptor::CPPTYPE_MESSAGE) {
output(
R"cc(
$1 $2(size_t index) const;
absl::StatusOr<$0> add_$2();
$0 mutable_$2(size_t index) const;
)cc",
MessagePtrConstType(field, /* const */ false),
MessagePtrConstType(field, /* const */ true), resolved_field_name,
resolved_upbc_name);
} else {
output(
R"cc(
$0 $1(size_t index) const;
bool add_$1($0 val);
void set_$1(size_t index, $0 val);
bool resize_$1(size_t len);
)cc",
CppConstType(field), resolved_field_name);
}
}
void WriteRepeatedMessageAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name,
const absl::string_view class_name,
Output& output) {
const char arena_expression[] = "arena_";
absl::string_view upbc_name = field->name();
output(
R"cc(
$1 $0::$2(size_t index) const {
size_t len;
auto* ptr = $3_$5(msg_, &len);
assert(index < len);
return ::protos::internal::CreateMessage<$4>((upb_Message*)*(ptr + index));
}
)cc",
class_name, MessagePtrConstType(field, /* is_const */ true),
resolved_field_name, MessageName(message),
MessageBaseType(field, /* maybe_const */ false), upbc_name);
output(
R"cc(
absl::StatusOr<$1> $0::add_$2() {
auto new_msg = $3_add_$6(msg_, $5);
if (!new_msg) {
return ::protos::MessageAllocationError();
}
return ::protos::internal::CreateMessageProxy<$4>((upb_Message*)new_msg, $5);
}
)cc",
class_name, MessagePtrConstType(field, /* const */ false),
resolved_field_name, MessageName(message),
MessageBaseType(field, /* maybe_const */ false), arena_expression,
upbc_name);
output(
R"cc(
$1 $0::mutable_$2(size_t index) const {
size_t len;
auto* ptr = $3_$6(msg_, &len);
assert(index < len);
return ::protos::internal::CreateMessageProxy<$4>(
(upb_Message*)*(ptr + index), $5);
}
)cc",
class_name, MessagePtrConstType(field, /* is_const */ false),
resolved_field_name, MessageName(message),
MessageBaseType(field, /* maybe_const */ false), arena_expression,
upbc_name);
}
void WriteRepeatedStringAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name,
const absl::string_view class_name,
Output& output) {
absl::string_view upbc_name = field->name();
output(
R"cc(
$1 $0::$2(size_t index) const {
size_t len;
auto* ptr = $3_mutable_$4(msg_, &len);
assert(index < len);
return ::protos::UpbStrToStringView(*(ptr + index));
}
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
output(
R"cc(
bool $0::resize_$1(size_t len) {
return $2_resize_$3(msg_, len, arena_);
}
)cc",
class_name, resolved_field_name, MessageName(message), upbc_name);
output(
R"cc(
bool $0::add_$2($1 val) {
return $3_add_$4(msg_, ::protos::UpbStrFromStringView(val, arena_), arena_);
}
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
output(
R"cc(
void $0::set_$2(size_t index, $1 val) {
size_t len;
auto* ptr = $3_mutable_$4(msg_, &len);
assert(index < len);
*(ptr + index) = ::protos::UpbStrFromStringView(val, arena_);
}
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
}
void WriteRepeatedScalarAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
const absl::string_view resolved_field_name,
const absl::string_view class_name,
Output& output) {
absl::string_view upbc_name = field->name();
output(
R"cc(
$1 $0::$2(size_t index) const {
size_t len;
auto* ptr = $3_mutable_$4(msg_, &len);
assert(index < len);
return *(ptr + index);
}
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
output(
R"cc(
bool $0::resize_$1(size_t len) {
return $2_resize_$3(msg_, len, arena_);
}
)cc",
class_name, resolved_field_name, MessageName(message), upbc_name);
output(
R"cc(
bool $0::add_$2($1 val) { return $3_add_$4(msg_, val, arena_); }
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
output(
R"cc(
void $0::set_$2(size_t index, $1 val) {
size_t len;
auto* ptr = $3_mutable_$4(msg_, &len);
assert(index < len);
*(ptr + index) = val;
}
)cc",
class_name, CppConstType(field), resolved_field_name,
MessageName(message), upbc_name);
}
} // namespace protos_generator

@ -0,0 +1,66 @@
/*
* 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 THIRD_PARTY_UPB_PROTOS_GENERATOR_GEN_REPEATED_FIELDS_H_
#define THIRD_PARTY_UPB_PROTOS_GENERATOR_GEN_REPEATED_FIELDS_H_
#include "absl/strings/string_view.h"
#include "google/protobuf/descriptor.h"
#include "protos_generator/output.h"
namespace protos_generator {
namespace protobuf = ::google::protobuf;
void WriteRepeatedFieldUsingAccessors(const protobuf::FieldDescriptor* field,
absl::string_view class_name,
absl::string_view resolved_field_name,
Output& output, bool read_only);
void WriteRepeatedFieldsInMessageHeader(const protobuf::Descriptor* desc,
const protobuf::FieldDescriptor* field,
absl::string_view resolved_field_name,
absl::string_view resolved_upbc_name,
Output& output);
void WriteRepeatedMessageAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
absl::string_view resolved_field_name,
absl::string_view class_name, Output& output);
void WriteRepeatedStringAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
absl::string_view resolved_field_name,
absl::string_view class_name, Output& output);
void WriteRepeatedScalarAccessor(const protobuf::Descriptor* message,
const protobuf::FieldDescriptor* field,
absl::string_view resolved_field_name,
absl::string_view class_name, Output& output);
} // namespace protos_generator
#endif // THIRD_PARTY_UPB_PROTOS_GENERATOR_GEN_REPEATED_FIELDS_H_
Loading…
Cancel
Save