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

Remove the _internal_$name$(index)/_internal_add_$name$() from repeated fields generated code.

Browse Source 
Also fix some issues with missing and unused headers.

PiperOrigin-RevId: 527358203
pull/12570/head
Protobuf Team Bot 2 years ago committed by Copybara-Service
parent 4af9fb5ca7
commit 155068d313
10 changed files with 242 additions and 590 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. 4
      src/google/protobuf/compiler/cpp/field_generators/cord_field.cc
  2. 28
      src/google/protobuf/compiler/cpp/field_generators/enum_field.cc
  3. 59
      src/google/protobuf/compiler/cpp/field_generators/message_field.cc
  4. 23
      src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc
  5. 32
      src/google/protobuf/compiler/cpp/field_generators/string_field.cc
  6. 31
      src/google/protobuf/compiler/cpp/parse_function_generator.cc
  7. 12
      src/google/protobuf/compiler/plugin.pb.cc
  8. 36
      src/google/protobuf/compiler/plugin.pb.h
  9. 149
      src/google/protobuf/descriptor.pb.cc
  10. 458
      src/google/protobuf/descriptor.pb.h

4
src/google/protobuf/compiler/cpp/field_generators/cord_field.cc
Unescape View File

@ -38,12 +38,16 @@
#include "absl/container/flat_hash_map.h"
#include "absl/log/absl_check.h"
#include "absl/memory/memory.h"
#include "absl/strings/escaping.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "absl/strings/substitute.h"
#include "google/protobuf/compiler/cpp/field.h"
#include "google/protobuf/compiler/cpp/field_generators/generators.h"
#include "google/protobuf/compiler/cpp/helpers.h"
#include "google/protobuf/compiler/cpp/options.h"
#include "google/protobuf/descriptor.h"
namespace google {
namespace protobuf {

28
src/google/protobuf/compiler/cpp/field_generators/enum_field.cc
Unescape View File

@ -34,17 +34,18 @@
#include <memory>
#include <string>
#include <tuple>
#include <vector>
#include "absl/container/flat_hash_map.h"
#include "absl/log/absl_check.h"
#include "absl/memory/memory.h"
#include "absl/strings/substitute.h"
#include "google/protobuf/compiler/cpp/field.h"
#include "google/protobuf/compiler/cpp/field_generators/generators.h"
#include "google/protobuf/compiler/cpp/helpers.h"
#include "google/protobuf/compiler/cpp/options.h"
#include "google/protobuf/descriptor.h"
#include "google/protobuf/descriptor.pb.h"
#include "google/protobuf/io/printer.h"
namespace google {
namespace protobuf {
@ -334,8 +335,8 @@ class RepeatedEnum : public FieldGeneratorBase {
};
void RepeatedEnum::GenerateAccessorDeclarations(io::Printer* p) const {
auto v = p->WithVars(AnnotatedAccessors(
field_, {"", "_internal_", "_internal_add_", "_internal_mutable_"}));
auto v = p->WithVars(
AnnotatedAccessors(field_, {"", "_internal_", "_internal_mutable_"}));
auto vs =
p->WithVars(AnnotatedAccessors(field_, {"set_", "add_"}, Semantic::kSet));
auto vm =
@ -350,8 +351,6 @@ void RepeatedEnum::GenerateAccessorDeclarations(io::Printer* p) const {
$DEPRECATED$ $pb$::RepeatedField<int>* $mutable_name$();
private:
$Enum$ $_internal_name$(int index) const;
void $_internal_add_name$($Enum$ value);
const $pb$::RepeatedField<int>& $_internal_name$() const;
$pb$::RepeatedField<int>* $_internal_mutable_name$();
@ -364,7 +363,7 @@ void RepeatedEnum::GenerateInlineAccessorDefinitions(io::Printer* p) const {
inline $Enum$ $Msg$::$name$(int index) const {
$annotate_get$;
// @@protoc_insertion_point(field_get:$pkg.Msg.field$)
return _internal_$name$(index);
return static_cast<$Enum$>(_internal_$name$().Get(index));
}
inline void $Msg$::set_$name$(int index, $Enum$ value) {
$assert_valid$;
@ -373,7 +372,8 @@ void RepeatedEnum::GenerateInlineAccessorDefinitions(io::Printer* p) const {
// @@protoc_insertion_point(field_set:$pkg.Msg.field$)
}
inline void $Msg$::add_$name$($Enum$ value) {
_internal_add_$name$(value);
$assert_valid$;
_internal_mutable_$name$()->Add(value);
$annotate_add$
// @@protoc_insertion_point(field_add:$pkg.Msg.field$)
}
@ -387,13 +387,6 @@ void RepeatedEnum::GenerateInlineAccessorDefinitions(io::Printer* p) const {
// @@protoc_insertion_point(field_mutable_list:$pkg.Msg.field$)
return _internal_mutable_$name$();
}
inline $Enum$ $Msg$::_internal_$name$(int index) const {
return static_cast<$Enum$>(_internal_$name$().Get(index));
}
inline void $Msg$::_internal_add_$name$($Enum$ value) {
$assert_valid$;
_internal_mutable_$name$()->Add(value);
}
inline const $pb$::RepeatedField<int>& $Msg$::_internal_$name$() const {
return $field_$;
}
@ -421,7 +414,8 @@ void RepeatedEnum::GenerateSerializeWithCachedSizesToArray(
for (int i = 0, n = this->_internal_$name$_size(); i < n; ++i) {
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::WriteEnumToArray(
$number$, this->_internal_$name$(i), target);
$number$, static_cast<$Enum$>(this->_internal_$name$().Get(i)),
target);
}
)cc");
}
@ -455,7 +449,7 @@ void RepeatedEnum::GenerateByteSize(io::Printer* p) const {
for (std::size_t i = 0; i < count; ++i) {
data_size += ::_pbi::WireFormatLite::EnumSize(
this->_internal_$name$(static_cast<int>(i)));
this->_internal_$name$().Get(static_cast<int>(i)));
}
total_size += data_size;
$add_to_size$;

59
src/google/protobuf/compiler/cpp/field_generators/message_field.cc
Unescape View File

@ -763,12 +763,9 @@ void RepeatedMessage::GenerateAccessorDeclarations(io::Printer* p) const {
std::make_tuple(field_, GeneratedCodeInfo::Annotation::ALIAS));
format(
"private:\n"
"const $Submsg$& ${1$_internal_$name$$}$(int index) const;\n"
"$Submsg$* ${1$_internal_add_$name$$}$();\n"
"const $pb$::RepeatedPtrField<$Submsg$>& _internal_$name$() const;\n"
"$pb$::RepeatedPtrField<$Submsg$>* _internal_mutable_$name$();\n"
"public:\n",
field_);
"public:\n");
format("$DEPRECATED$ const $Submsg$& ${1$$name$$}$(int index) const;\n",
field_);
format("$DEPRECATED$ $Submsg$* ${1$add_$name$$}$();\n",
@ -796,37 +793,25 @@ void RepeatedMessage::GenerateInlineAccessorDefinitions(io::Printer* p) const {
" return _internal_mutable_$name$();\n"
"}\n");
if (opts_->safe_boundary_check) {
p->Emit(
"inline const $Submsg$& $Msg$::_internal_$name$(int index) const "
"{\n"
" return _internal_$name$().InternalCheckedGet(index,\n"
" reinterpret_cast<const $Submsg$&>($kDefault$));\n"
"}\n");
} else {
p->Emit(
"inline const $Submsg$& $Msg$::_internal_$name$(int index) const "
"{\n"
"$StrongRef$;"
" return _internal_$name$().Get(index);\n"
"}\n");
}
p->Emit(
"inline const $Submsg$& $Msg$::$name$(int index) const {\n"
"$annotate_get$"
" // @@protoc_insertion_point(field_get:$pkg.Msg.field$)\n"
" return _internal_$name$(index);\n"
"}\n"
"inline $Submsg$* $Msg$::_internal_add_$name$() {\n"
" return _internal_mutable_$name$()->Add();\n"
"}\n"
"inline $Submsg$* $Msg$::add_$name$() {\n"
" $Submsg$* _add = _internal_add_$name$();\n"
"$annotate_add_mutable$"
" // @@protoc_insertion_point(field_add:$pkg.Msg.field$)\n"
" return _add;\n"
"}\n");
p->Emit({{"Get", opts_->safe_boundary_check ? "InternalCheckedGet" : "Get"},
{"GetExtraArg",
[&] {
p->Emit(opts_->safe_boundary_check
? ", reinterpret_cast<const $Submsg$&>($kDefault$)"
: "");
}}},
"inline const $Submsg$& $Msg$::$name$(int index) const {\n"
"$annotate_get$"
" // @@protoc_insertion_point(field_get:$pkg.Msg.field$)\n"
" $StrongRef$;"
" return _internal_$name$().$Get$(index$GetExtraArg$);\n"
"}\n"
"inline $Submsg$* $Msg$::add_$name$() {\n"
" $Submsg$* _add = _internal_mutable_$name$()->Add();\n"
"$annotate_add_mutable$"
" // @@protoc_insertion_point(field_add:$pkg.Msg.field$)\n"
" return _add;\n"
"}\n");
p->Emit(
"inline const $pb$::RepeatedPtrField< $Submsg$ >&\n"
@ -914,7 +899,7 @@ void RepeatedMessage::GenerateSerializeWithCachedSizesToArray(
" i < n; i++) {\n");
if (field_->type() == FieldDescriptor::TYPE_MESSAGE) {
p->Emit(
" const auto& repfield = this->_internal_$name$(i);\n"
" const auto& repfield = this->_internal_$name$().Get(i);\n"
" target = $pbi$::WireFormatLite::\n"
" InternalWrite$declared_type$($number$, "
"repfield, repfield.GetCachedSize(), target, stream);\n"
@ -924,7 +909,7 @@ void RepeatedMessage::GenerateSerializeWithCachedSizesToArray(
" target = stream->EnsureSpace(target);\n"
" target = $pbi$::WireFormatLite::\n"
" InternalWrite$declared_type$($number$, "
"this->_internal_$name$(i), target, stream);\n"
"this->_internal_$name$().Get(i), target, stream);\n"
"}\n");
}
}

23
src/google/protobuf/compiler/cpp/field_generators/primitive_field.cc
Unescape View File

@ -32,19 +32,20 @@
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
#include <cstddef>
#include <memory>
#include <string>
#include <tuple>
#include <vector>
#include "absl/container/flat_hash_map.h"
#include "absl/log/absl_check.h"
#include "absl/log/absl_log.h"
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "google/protobuf/compiler/cpp/field.h"
#include "google/protobuf/compiler/cpp/field_generators/generators.h"
#include "google/protobuf/compiler/cpp/helpers.h"
#include "google/protobuf/compiler/cpp/options.h"
#include "google/protobuf/descriptor.h"
#include "google/protobuf/descriptor.pb.h"
#include "google/protobuf/io/printer.h"
#include "google/protobuf/wire_format.h"
@ -390,8 +391,8 @@ void RepeatedPrimitive::GeneratePrivateMembers(io::Printer* p) const {
}
void RepeatedPrimitive::GenerateAccessorDeclarations(io::Printer* p) const {
auto v = p->WithVars(AnnotatedAccessors(
field_, {"", "_internal_", "_internal_add_", "_internal_mutable_"}));
auto v = p->WithVars(
AnnotatedAccessors(field_, {"", "_internal_", "_internal_mutable_"}));
auto vs =
p->WithVars(AnnotatedAccessors(field_, {"set_", "add_"}, Semantic::kSet));
auto va =
@ -404,8 +405,6 @@ void RepeatedPrimitive::GenerateAccessorDeclarations(io::Printer* p) const {
$DEPRECATED$ $pb$::RepeatedField<$Type$>* $mutable_name$();
private:
$Type$ $_internal_name$(int index) const;
void $_internal_add_name$($Type$ value);
const $pb$::RepeatedField<$Type$>& $_internal_name$() const;
$pb$::RepeatedField<$Type$>* $_internal_mutable_name$();
@ -419,7 +418,7 @@ void RepeatedPrimitive::GenerateInlineAccessorDefinitions(
inline $Type$ $Msg$::$name$(int index) const {
$annotate_get$;
// @@protoc_insertion_point(field_get:$pkg.Msg.field$)
return _internal_$name$(index);
return _internal_$name$().Get(index);
}
inline void $Msg$::set_$name$(int index, $Type$ value) {
$annotate_set$;
@ -427,7 +426,7 @@ void RepeatedPrimitive::GenerateInlineAccessorDefinitions(
// @@protoc_insertion_point(field_set:$pkg.Msg.field$)
}
inline void $Msg$::add_$name$($Type$ value) {
_internal_add_$name$(value);
_internal_mutable_$name$()->Add(value);
$annotate_add$;
// @@protoc_insertion_point(field_add:$pkg.Msg.field$)
}
@ -442,12 +441,6 @@ void RepeatedPrimitive::GenerateInlineAccessorDefinitions(
return _internal_mutable_$name$();
}
inline $Type$ $Msg$::_internal_$name$(int index) const {
return _internal_$name$().Get(index);
}
inline void $Msg$::_internal_add_$name$($Type$ value) {
_internal_mutable_$name$()->Add(value);
}
inline const $pb$::RepeatedField<$Type$>& $Msg$::_internal_$name$() const {
return $field_$;
}
@ -464,7 +457,7 @@ void RepeatedPrimitive::GenerateSerializeWithCachedSizesToArray(
for (int i = 0, n = this->_internal_$name$_size(); i < n; ++i) {
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::Write$DeclaredType$ToArray(
$number$, this->_internal_$name$(i), target);
$number$, this->_internal_$name$().Get(i), target);
}
)cc");
return;

32
src/google/protobuf/compiler/cpp/field_generators/string_field.cc
Unescape View File

@ -36,12 +36,14 @@
#include <string>
#include <vector>
#include "absl/container/flat_hash_map.h"
#include "absl/log/absl_check.h"
#include "absl/memory/memory.h"
#include "absl/strings/str_cat.h"
#include "google/protobuf/compiler/cpp/field.h"
#include "google/protobuf/compiler/cpp/field_generators/generators.h"
#include "google/protobuf/compiler/cpp/helpers.h"
#include "google/protobuf/compiler/cpp/options.h"
#include "google/protobuf/descriptor.h"
#include "google/protobuf/descriptor.pb.h"
#include "google/protobuf/io/printer.h"
@ -769,8 +771,7 @@ void RepeatedString::GenerateAccessorDeclarations(io::Printer* p) const {
)cc");
}
auto v1 = p->WithVars(
AnnotatedAccessors(field_, {"", "_internal_", "_internal_add_"}));
auto v1 = p->WithVars(AnnotatedAccessors(field_, {"", "_internal_"}));
auto v2 = p->WithVars(
AnnotatedAccessors(field_, {"set_", "add_"}, AnnotationCollector::kSet));
auto v3 = p->WithVars(
@ -794,8 +795,6 @@ void RepeatedString::GenerateAccessorDeclarations(io::Printer* p) const {
$DEPRECATED$ $pb$::RepeatedPtrField<std::string>* $mutable_name$();
private:
const std::string& $_internal_name$(int index) const;
std::string* $_internal_add_name$();
const $pb$::RepeatedPtrField<std::string>& _internal_$name$() const;
$pb$::RepeatedPtrField<std::string>* _internal_mutable_$name$();
@ -805,18 +804,15 @@ void RepeatedString::GenerateAccessorDeclarations(io::Printer* p) const {
void RepeatedString::GenerateInlineAccessorDefinitions(io::Printer* p) const {
p->Emit({{"Get", opts_->safe_boundary_check ? "InternalCheckedGet" : "Get"},
{"get_args",
{"GetExtraArg",
[&] {
if (!opts_->safe_boundary_check) {
p->Emit("index");
return;
}
p->Emit(R"cc(index, $pbi$::GetEmptyStringAlreadyInited())cc");
p->Emit(opts_->safe_boundary_check
? ", $pbi$::GetEmptyStringAlreadyInited()"
: "");
}}},
R"cc(
inline std::string* $Msg$::add_$name$() {
std::string* _s = _internal_add_$name$();
std::string* _s = _internal_mutable_$name$()->Add();
$annotate_add_mutable$;
// @@protoc_insertion_point(field_add_mutable:$pkg.Msg.field$)
return _s;
@ -824,7 +820,7 @@ void RepeatedString::GenerateInlineAccessorDefinitions(io::Printer* p) const {
inline const std::string& $Msg$::$name$(int index) const {
$annotate_get$;
// @@protoc_insertion_point(field_get:$pkg.Msg.field$)
return _internal_$name$(index);
return _internal_$name$().$Get$(index$GetExtraArg$);
}
inline std::string* $Msg$::mutable_$name$(int index) {
$annotate_mutable$;
@ -898,12 +894,6 @@ void RepeatedString::GenerateInlineAccessorDefinitions(io::Printer* p) const {
// @@protoc_insertion_point(field_mutable_list:$pkg.Msg.field$)
return _internal_mutable_$name$();
}
inline const std::string& $Msg$::_internal_$name$(int index) const {
return _internal_$name$().$Get$($get_args$);
}
inline std::string* $Msg$::_internal_add_$name$() {
return _internal_mutable_$name$()->Add();
}
inline const ::$proto_ns$::RepeatedPtrField<std::string>&
$Msg$::_internal_$name$() const {
return $field_$;
@ -925,7 +915,7 @@ void RepeatedString::GenerateSerializeWithCachedSizesToArray(
}}},
R"cc(
for (int i = 0, n = this->_internal_$name$_size(); i < n; ++i) {
const auto& s = this->_internal_$name$(i);
const auto& s = this->_internal_$name$().Get(i);
$utf8_check$;
target = stream->Write$DeclaredType$($number$, s, target);
}

31
src/google/protobuf/compiler/cpp/parse_function_generator.cc
Unescape View File

@ -31,18 +31,25 @@
#include "google/protobuf/compiler/cpp/parse_function_generator.h"
#include <algorithm>
#include <limits>
#include <cstdint>
#include <string>
#include <utility>
#include <vector>
#include "absl/container/flat_hash_map.h"
#include "absl/log/absl_check.h"
#include "absl/log/absl_log.h"
#include "absl/strings/match.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h"
#include "google/protobuf/compiler/cpp/helpers.h"
#include "google/protobuf/compiler/cpp/options.h"
#include "google/protobuf/descriptor.h"
#include "google/protobuf/generated_message_tctable_gen.h"
#include "google/protobuf/generated_message_tctable_impl.h"
#include "google/protobuf/io/coded_stream.h"
#include "google/protobuf/wire_format.h"
#include "google/protobuf/wire_format_lite.h"
namespace google {
namespace protobuf {
@ -908,12 +915,17 @@ void ParseFunctionGenerator::GenerateStrings(Formatter& format,
parser_name = "StringPieceParser";
break;
}
format(
"auto str = $msg$$1$$2$_$name$();\n"
"ptr = ::_pbi::Inline$3$(str, ptr, ctx);\n",
HasInternalAccessors(ctype) ? "_internal_" : "",
field->is_repeated() && !field->is_packable() ? "add" : "mutable",
parser_name);
// Repeated cord doesn't have _internal_mutable_$name$(), unlike other
// repeated fields.
if (field->options().ctype() == FieldOptions::CORD &&
field->is_repeated() && !field->is_packable()) {
format("auto str = $msg$$field$.Add();\n");
} else {
format("auto str = $msg$$1$mutable_$name$()$2$;\n",
HasInternalAccessors(ctype) ? "_internal_" : "",
field->is_repeated() && !field->is_packable() ? "->Add()" : "");
}
format("ptr = ::_pbi::Inline$1$(str, ptr, ctx);\n", parser_name);
}
// It is intentionally placed before VerifyUTF8 because it doesn't make sense
// to verify UTF8 when we already know parsing failed.
@ -1094,8 +1106,9 @@ void ParseFunctionGenerator::GenerateFieldBody(
{{"name", FieldName(field)},
{"primitive_type", PrimitiveTypeName(options_, field->cpp_type())}});
if (field->is_repeated()) {
format.AddMap({{"put_field", absl::StrCat("add_", FieldName(field))},
{"mutable_field", absl::StrCat("add_", FieldName(field))}});
const std::string add_field =
absl::StrCat("mutable_", FieldName(field), "()->Add");
format.AddMap({{"put_field", add_field}, {"mutable_field", add_field}});
} else {
format.AddMap(
{{"put_field", absl::StrCat("set_", FieldName(field))},

12
src/google/protobuf/compiler/plugin.pb.cc
Unescape View File

@ -748,7 +748,7 @@ const char* CodeGeneratorRequest::_InternalParse(const char* ptr, ::_pbi::ParseC
ptr -= 1;
do {
ptr += 1;
auto str = _internal_add_file_to_generate();
auto str = _internal_mutable_file_to_generate()->Add();
ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
CHK_(ptr);
#ifndef NDEBUG
@ -788,7 +788,7 @@ const char* CodeGeneratorRequest::_InternalParse(const char* ptr, ::_pbi::ParseC
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_proto_file(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_proto_file()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<122>(ptr));
@ -828,7 +828,7 @@ failure:
// repeated string file_to_generate = 1;
for (int i = 0, n = this->_internal_file_to_generate_size(); i < n; ++i) {
const auto& s = this->_internal_file_to_generate(i);
const auto& s = this->_internal_file_to_generate().Get(i);
::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(s.data(), static_cast<int>(s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
"google.protobuf.compiler.CodeGeneratorRequest.file_to_generate");
target = stream->WriteString(1, s, target);
@ -853,7 +853,7 @@ failure:
// repeated .google.protobuf.FileDescriptorProto proto_file = 15;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_proto_file_size()); i < n; i++) {
const auto& repfield = this->_internal_proto_file(i);
const auto& repfield = this->_internal_proto_file().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(15, repfield, repfield.GetCachedSize(), target, stream);
}
@ -1481,7 +1481,7 @@ const char* CodeGeneratorResponse::_InternalParse(const char* ptr, ::_pbi::Parse
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_file(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_file()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<122>(ptr));
@ -1538,7 +1538,7 @@ failure:
// repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_file_size()); i < n; i++) {
const auto& repfield = this->_internal_file(i);
const auto& repfield = this->_internal_file().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(15, repfield, repfield.GetCachedSize(), target, stream);
}

36
src/google/protobuf/compiler/plugin.pb.h
Unescape View File

@ -480,8 +480,6 @@ class PROTOC_EXPORT CodeGeneratorRequest final :
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_file_to_generate();
private:
const std::string& _internal_file_to_generate(int index) const;
std::string* _internal_add_file_to_generate();
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& _internal_file_to_generate() const;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* _internal_mutable_file_to_generate();
@ -497,8 +495,6 @@ class PROTOC_EXPORT CodeGeneratorRequest final :
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >*
mutable_proto_file();
private:
const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& _internal_proto_file(int index) const;
::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* _internal_add_proto_file();
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::FileDescriptorProto>& _internal_proto_file() const;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::FileDescriptorProto>* _internal_mutable_proto_file();
public:
@ -952,8 +948,6 @@ class PROTOC_EXPORT CodeGeneratorResponse final :
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File >*
mutable_file();
private:
const ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File& _internal_file(int index) const;
::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* _internal_add_file();
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File>& _internal_file() const;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File>* _internal_mutable_file();
public:
@ -1182,13 +1176,13 @@ inline void CodeGeneratorRequest::clear_file_to_generate() {
_internal_mutable_file_to_generate()->Clear();
}
inline std::string* CodeGeneratorRequest::add_file_to_generate() {
std::string* _s = _internal_add_file_to_generate();
std::string* _s = _internal_mutable_file_to_generate()->Add();
// @@protoc_insertion_point(field_add_mutable:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
return _s;
}
inline const std::string& CodeGeneratorRequest::file_to_generate(int index) const {
// @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
return _internal_file_to_generate(index);
return _internal_file_to_generate().Get(index);
}
inline std::string* CodeGeneratorRequest::mutable_file_to_generate(int index) {
// @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
@ -1249,12 +1243,6 @@ inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* CodeGeneratorRequ
// @@protoc_insertion_point(field_mutable_list:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
return _internal_mutable_file_to_generate();
}
inline const std::string& CodeGeneratorRequest::_internal_file_to_generate(int index) const {
return _internal_file_to_generate().Get(index);
}
inline std::string* CodeGeneratorRequest::_internal_add_file_to_generate() {
return _internal_mutable_file_to_generate()->Add();
}
inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
CodeGeneratorRequest::_internal_file_to_generate() const {
return _impl_.file_to_generate_;
@ -1345,18 +1333,12 @@ CodeGeneratorRequest::mutable_proto_file() {
// @@protoc_insertion_point(field_mutable_list:google.protobuf.compiler.CodeGeneratorRequest.proto_file)
return _internal_mutable_proto_file();
}
inline const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& CodeGeneratorRequest::_internal_proto_file(int index) const {
return _internal_proto_file().Get(index);
}
inline const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& CodeGeneratorRequest::proto_file(int index) const {
// @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorRequest.proto_file)
return _internal_proto_file(index);
}
inline ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* CodeGeneratorRequest::_internal_add_proto_file() {
return _internal_mutable_proto_file()->Add();
return _internal_proto_file().Get(index);
}
inline ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* CodeGeneratorRequest::add_proto_file() {
::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* _add = _internal_add_proto_file();
::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* _add = _internal_mutable_proto_file()->Add();
// @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorRequest.proto_file)
return _add;
}
@ -1857,18 +1839,12 @@ CodeGeneratorResponse::mutable_file() {
// @@protoc_insertion_point(field_mutable_list:google.protobuf.compiler.CodeGeneratorResponse.file)
return _internal_mutable_file();
}
inline const ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File& CodeGeneratorResponse::_internal_file(int index) const {
return _internal_file().Get(index);
}
inline const ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File& CodeGeneratorResponse::file(int index) const {
// @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorResponse.file)
return _internal_file(index);
}
inline ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* CodeGeneratorResponse::_internal_add_file() {
return _internal_mutable_file()->Add();
return _internal_file().Get(index);
}
inline ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* CodeGeneratorResponse::add_file() {
::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* _add = _internal_add_file();
::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* _add = _internal_mutable_file()->Add();
// @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorResponse.file)
return _add;
}

149
src/google/protobuf/descriptor.pb.cc
Unescape View File

@ -1901,7 +1901,7 @@ const char* FileDescriptorSet::_InternalParse(const char* ptr, ::_pbi::ParseCont
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_file(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_file()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
@ -1941,7 +1941,7 @@ failure:
// repeated .google.protobuf.FileDescriptorProto file = 1;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_file_size()); i < n; i++) {
const auto& repfield = this->_internal_file(i);
const auto& repfield = this->_internal_file().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
}
@ -2273,7 +2273,7 @@ const char* FileDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
auto str = _internal_add_dependency();
auto str = _internal_mutable_dependency()->Add();
ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
CHK_(ptr);
#ifndef NDEBUG
@ -2291,7 +2291,7 @@ const char* FileDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_message_type(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_message_type()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr));
@ -2305,7 +2305,7 @@ const char* FileDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_enum_type(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_enum_type()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<42>(ptr));
@ -2319,7 +2319,7 @@ const char* FileDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_service(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_service()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<50>(ptr));
@ -2333,7 +2333,7 @@ const char* FileDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_extension(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_extension()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<58>(ptr));
@ -2365,7 +2365,7 @@ const char* FileDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
_internal_add_public_dependency(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
_internal_mutable_public_dependency()->Add(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<80>(ptr));
@ -2382,7 +2382,7 @@ const char* FileDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
_internal_add_weak_dependency(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
_internal_mutable_weak_dependency()->Add(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<88>(ptr));
@ -2468,7 +2468,7 @@ failure:
// repeated string dependency = 3;
for (int i = 0, n = this->_internal_dependency_size(); i < n; ++i) {
const auto& s = this->_internal_dependency(i);
const auto& s = this->_internal_dependency().Get(i);
::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(s.data(), static_cast<int>(s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
"google.protobuf.FileDescriptorProto.dependency");
target = stream->WriteString(3, s, target);
@ -2477,7 +2477,7 @@ failure:
// repeated .google.protobuf.DescriptorProto message_type = 4;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_message_type_size()); i < n; i++) {
const auto& repfield = this->_internal_message_type(i);
const auto& repfield = this->_internal_message_type().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
}
@ -2485,7 +2485,7 @@ failure:
// repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_enum_type_size()); i < n; i++) {
const auto& repfield = this->_internal_enum_type(i);
const auto& repfield = this->_internal_enum_type().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(5, repfield, repfield.GetCachedSize(), target, stream);
}
@ -2493,7 +2493,7 @@ failure:
// repeated .google.protobuf.ServiceDescriptorProto service = 6;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_service_size()); i < n; i++) {
const auto& repfield = this->_internal_service(i);
const auto& repfield = this->_internal_service().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(6, repfield, repfield.GetCachedSize(), target, stream);
}
@ -2501,7 +2501,7 @@ failure:
// repeated .google.protobuf.FieldDescriptorProto extension = 7;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_extension_size()); i < n; i++) {
const auto& repfield = this->_internal_extension(i);
const auto& repfield = this->_internal_extension().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(7, repfield, repfield.GetCachedSize(), target, stream);
}
@ -2524,14 +2524,14 @@ failure:
for (int i = 0, n = this->_internal_public_dependency_size(); i < n; ++i) {
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::WriteInt32ToArray(
10, this->_internal_public_dependency(i), target);
10, this->_internal_public_dependency().Get(i), target);
}
// repeated int32 weak_dependency = 11;
for (int i = 0, n = this->_internal_weak_dependency_size(); i < n; ++i) {
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::WriteInt32ToArray(
11, this->_internal_weak_dependency(i), target);
11, this->_internal_weak_dependency().Get(i), target);
}
// optional string syntax = 12;
@ -3460,7 +3460,7 @@ const char* DescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContex
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_field(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_field()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
@ -3474,7 +3474,7 @@ const char* DescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContex
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_nested_type(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_nested_type()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr));
@ -3488,7 +3488,7 @@ const char* DescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContex
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_enum_type(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_enum_type()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr));
@ -3502,7 +3502,7 @@ const char* DescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContex
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_extension_range(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_extension_range()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<42>(ptr));
@ -3516,7 +3516,7 @@ const char* DescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContex
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_extension(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_extension()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<50>(ptr));
@ -3539,7 +3539,7 @@ const char* DescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContex
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_oneof_decl(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_oneof_decl()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<66>(ptr));
@ -3553,7 +3553,7 @@ const char* DescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContex
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_reserved_range(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_reserved_range()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<74>(ptr));
@ -3567,7 +3567,7 @@ const char* DescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContex
ptr -= 1;
do {
ptr += 1;
auto str = _internal_add_reserved_name();
auto str = _internal_mutable_reserved_name()->Add();
ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
CHK_(ptr);
#ifndef NDEBUG
@ -3621,7 +3621,7 @@ failure:
// repeated .google.protobuf.FieldDescriptorProto field = 2;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_field_size()); i < n; i++) {
const auto& repfield = this->_internal_field(i);
const auto& repfield = this->_internal_field().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
}
@ -3629,7 +3629,7 @@ failure:
// repeated .google.protobuf.DescriptorProto nested_type = 3;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_nested_type_size()); i < n; i++) {
const auto& repfield = this->_internal_nested_type(i);
const auto& repfield = this->_internal_nested_type().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
}
@ -3637,7 +3637,7 @@ failure:
// repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_enum_type_size()); i < n; i++) {
const auto& repfield = this->_internal_enum_type(i);
const auto& repfield = this->_internal_enum_type().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
}
@ -3645,7 +3645,7 @@ failure:
// repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_extension_range_size()); i < n; i++) {
const auto& repfield = this->_internal_extension_range(i);
const auto& repfield = this->_internal_extension_range().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(5, repfield, repfield.GetCachedSize(), target, stream);
}
@ -3653,7 +3653,7 @@ failure:
// repeated .google.protobuf.FieldDescriptorProto extension = 6;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_extension_size()); i < n; i++) {
const auto& repfield = this->_internal_extension(i);
const auto& repfield = this->_internal_extension().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(6, repfield, repfield.GetCachedSize(), target, stream);
}
@ -3668,7 +3668,7 @@ failure:
// repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_oneof_decl_size()); i < n; i++) {
const auto& repfield = this->_internal_oneof_decl(i);
const auto& repfield = this->_internal_oneof_decl().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(8, repfield, repfield.GetCachedSize(), target, stream);
}
@ -3676,14 +3676,14 @@ failure:
// repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_reserved_range_size()); i < n; i++) {
const auto& repfield = this->_internal_reserved_range(i);
const auto& repfield = this->_internal_reserved_range().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(9, repfield, repfield.GetCachedSize(), target, stream);
}
// repeated string reserved_name = 10;
for (int i = 0, n = this->_internal_reserved_name_size(); i < n; ++i) {
const auto& s = this->_internal_reserved_name(i);
const auto& s = this->_internal_reserved_name().Get(i);
::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(s.data(), static_cast<int>(s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
"google.protobuf.DescriptorProto.reserved_name");
target = stream->WriteString(10, s, target);
@ -4382,7 +4382,7 @@ const char* ExtensionRangeOptions::_InternalParse(const char* ptr, ::_pbi::Parse
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_declaration(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_declaration()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
@ -4410,7 +4410,7 @@ const char* ExtensionRangeOptions::_InternalParse(const char* ptr, ::_pbi::Parse
ptr -= 2;
do {
ptr += 2;
ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_uninterpreted_option()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
@ -4456,7 +4456,7 @@ failure:
// repeated .google.protobuf.ExtensionRangeOptions.Declaration declaration = 2 [retention = RETENTION_SOURCE];
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_declaration_size()); i < n; i++) {
const auto& repfield = this->_internal_declaration(i);
const auto& repfield = this->_internal_declaration().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
}
@ -4472,7 +4472,7 @@ failure:
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
const auto& repfield = this->_internal_uninterpreted_option(i);
const auto& repfield = this->_internal_uninterpreted_option().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
}
@ -5908,7 +5908,7 @@ const char* EnumDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_value(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_value()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
@ -5931,7 +5931,7 @@ const char* EnumDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_reserved_range(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_reserved_range()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr));
@ -5945,7 +5945,7 @@ const char* EnumDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
auto str = _internal_add_reserved_name();
auto str = _internal_mutable_reserved_name()->Add();
ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
CHK_(ptr);
#ifndef NDEBUG
@ -5999,7 +5999,7 @@ failure:
// repeated .google.protobuf.EnumValueDescriptorProto value = 2;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_value_size()); i < n; i++) {
const auto& repfield = this->_internal_value(i);
const auto& repfield = this->_internal_value().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
}
@ -6014,14 +6014,14 @@ failure:
// repeated .google.protobuf.EnumDescriptorProto.EnumReservedRange reserved_range = 4;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_reserved_range_size()); i < n; i++) {
const auto& repfield = this->_internal_reserved_range(i);
const auto& repfield = this->_internal_reserved_range().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
}
// repeated string reserved_name = 5;
for (int i = 0, n = this->_internal_reserved_name_size(); i < n; ++i) {
const auto& s = this->_internal_reserved_name(i);
const auto& s = this->_internal_reserved_name().Get(i);
::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(s.data(), static_cast<int>(s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
"google.protobuf.EnumDescriptorProto.reserved_name");
target = stream->WriteString(5, s, target);
@ -6595,7 +6595,7 @@ const char* ServiceDescriptorProto::_InternalParse(const char* ptr, ::_pbi::Pars
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_method(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_method()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
@ -6654,7 +6654,7 @@ failure:
// repeated .google.protobuf.MethodDescriptorProto method = 2;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_method_size()); i < n; i++) {
const auto& repfield = this->_internal_method(i);
const auto& repfield = this->_internal_method().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
}
@ -7851,7 +7851,7 @@ const char* FileOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* c
ptr -= 2;
do {
ptr += 2;
ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_uninterpreted_option()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
@ -8048,7 +8048,7 @@ failure:
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
const auto& repfield = this->_internal_uninterpreted_option(i);
const auto& repfield = this->_internal_uninterpreted_option().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
}
@ -8526,7 +8526,7 @@ const char* MessageOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext
ptr -= 2;
do {
ptr += 2;
ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_uninterpreted_option()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
@ -8608,7 +8608,7 @@ failure:
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
const auto& repfield = this->_internal_uninterpreted_option(i);
const auto& repfield = this->_internal_uninterpreted_option().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
}
@ -9039,7 +9039,7 @@ const char* FieldOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext*
::int32_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
CHK_(ptr);
if (PROTOBUF_PREDICT_TRUE(::PROTOBUF_NAMESPACE_ID::FieldOptions_OptionTargetType_IsValid(static_cast<int>(val)))) {
_internal_add_targets(static_cast<::PROTOBUF_NAMESPACE_ID::FieldOptions_OptionTargetType>(val));
_internal_mutable_targets()->Add(static_cast<::PROTOBUF_NAMESPACE_ID::FieldOptions_OptionTargetType>(val));
} else {
::PROTOBUF_NAMESPACE_ID::internal::WriteVarint(19, val, mutable_unknown_fields());
}
@ -9058,7 +9058,7 @@ const char* FieldOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext*
ptr -= 2;
do {
ptr += 2;
ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_uninterpreted_option()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
@ -9176,13 +9176,14 @@ failure:
for (int i = 0, n = this->_internal_targets_size(); i < n; ++i) {
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::WriteEnumToArray(
19, this->_internal_targets(i), target);
19, static_cast<::PROTOBUF_NAMESPACE_ID::FieldOptions_OptionTargetType>(this->_internal_targets().Get(i)),
target);
}
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
const auto& repfield = this->_internal_uninterpreted_option(i);
const auto& repfield = this->_internal_uninterpreted_option().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
}
@ -9216,7 +9217,7 @@ failure:
for (std::size_t i = 0; i < count; ++i) {
data_size += ::_pbi::WireFormatLite::EnumSize(
this->_internal_targets(static_cast<int>(i)));
this->_internal_targets().Get(static_cast<int>(i)));
}
total_size += data_size;
total_size += std::size_t{2} * count;
@ -9462,7 +9463,7 @@ const char* OneofOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext*
ptr -= 2;
do {
ptr += 2;
ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_uninterpreted_option()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
@ -9507,7 +9508,7 @@ failure:
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
const auto& repfield = this->_internal_uninterpreted_option(i);
const auto& repfield = this->_internal_uninterpreted_option().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
}
@ -9732,7 +9733,7 @@ const char* EnumOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* c
ptr -= 2;
do {
ptr += 2;
ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_uninterpreted_option()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
@ -9800,7 +9801,7 @@ failure:
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
const auto& repfield = this->_internal_uninterpreted_option(i);
const auto& repfield = this->_internal_uninterpreted_option().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
}
@ -10025,7 +10026,7 @@ const char* EnumValueOptions::_InternalParse(const char* ptr, ::_pbi::ParseConte
ptr -= 2;
do {
ptr += 2;
ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_uninterpreted_option()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
@ -10079,7 +10080,7 @@ failure:
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
const auto& repfield = this->_internal_uninterpreted_option(i);
const auto& repfield = this->_internal_uninterpreted_option().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
}
@ -10278,7 +10279,7 @@ const char* ServiceOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext
ptr -= 2;
do {
ptr += 2;
ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_uninterpreted_option()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
@ -10332,7 +10333,7 @@ failure:
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
const auto& repfield = this->_internal_uninterpreted_option(i);
const auto& repfield = this->_internal_uninterpreted_option().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
}
@ -10559,7 +10560,7 @@ const char* MethodOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext*
ptr -= 2;
do {
ptr += 2;
ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_uninterpreted_option()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
@ -10620,7 +10621,7 @@ failure:
// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
const auto& repfield = this->_internal_uninterpreted_option(i);
const auto& repfield = this->_internal_uninterpreted_option().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
}
@ -11187,7 +11188,7 @@ const char* UninterpretedOption::_InternalParse(const char* ptr, ::_pbi::ParseCo
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_name(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_name()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
@ -11294,7 +11295,7 @@ failure:
// repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_name_size()); i < n; i++) {
const auto& repfield = this->_internal_name(i);
const auto& repfield = this->_internal_name().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
}
@ -11627,7 +11628,7 @@ const char* SourceCodeInfo_Location::_InternalParse(const char* ptr, ::_pbi::Par
ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedInt32Parser(_internal_mutable_path(), ptr, ctx);
CHK_(ptr);
} else if (static_cast<::uint8_t>(tag) == 8) {
_internal_add_path(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
_internal_mutable_path()->Add(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
CHK_(ptr);
} else {
goto handle_unusual;
@ -11639,7 +11640,7 @@ const char* SourceCodeInfo_Location::_InternalParse(const char* ptr, ::_pbi::Par
ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedInt32Parser(_internal_mutable_span(), ptr, ctx);
CHK_(ptr);
} else if (static_cast<::uint8_t>(tag) == 16) {
_internal_add_span(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
_internal_mutable_span()->Add(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
CHK_(ptr);
} else {
goto handle_unusual;
@ -11677,7 +11678,7 @@ const char* SourceCodeInfo_Location::_InternalParse(const char* ptr, ::_pbi::Par
ptr -= 1;
do {
ptr += 1;
auto str = _internal_add_leading_detached_comments();
auto str = _internal_mutable_leading_detached_comments()->Add();
ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
CHK_(ptr);
#ifndef NDEBUG
@ -11756,7 +11757,7 @@ failure:
// repeated string leading_detached_comments = 6;
for (int i = 0, n = this->_internal_leading_detached_comments_size(); i < n; ++i) {
const auto& s = this->_internal_leading_detached_comments(i);
const auto& s = this->_internal_leading_detached_comments().Get(i);
::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(s.data(), static_cast<int>(s.length()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
"google.protobuf.SourceCodeInfo.Location.leading_detached_comments");
target = stream->WriteString(6, s, target);
@ -11963,7 +11964,7 @@ const char* SourceCodeInfo::_InternalParse(const char* ptr, ::_pbi::ParseContext
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_location(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_location()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
@ -12003,7 +12004,7 @@ failure:
// repeated .google.protobuf.SourceCodeInfo.Location location = 1;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_location_size()); i < n; i++) {
const auto& repfield = this->_internal_location(i);
const auto& repfield = this->_internal_location().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
}
@ -12208,7 +12209,7 @@ const char* GeneratedCodeInfo_Annotation::_InternalParse(const char* ptr, ::_pbi
ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedInt32Parser(_internal_mutable_path(), ptr, ctx);
CHK_(ptr);
} else if (static_cast<::uint8_t>(tag) == 8) {
_internal_add_path(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
_internal_mutable_path()->Add(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
CHK_(ptr);
} else {
goto handle_unusual;
@ -12528,7 +12529,7 @@ const char* GeneratedCodeInfo::_InternalParse(const char* ptr, ::_pbi::ParseCont
ptr -= 1;
do {
ptr += 1;
ptr = ctx->ParseMessage(_internal_add_annotation(), ptr);
ptr = ctx->ParseMessage(_internal_mutable_annotation()->Add(), ptr);
CHK_(ptr);
if (!ctx->DataAvailable(ptr)) break;
} while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
@ -12568,7 +12569,7 @@ failure:
// repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;
for (unsigned i = 0,
n = static_cast<unsigned>(this->_internal_annotation_size()); i < n; i++) {
const auto& repfield = this->_internal_annotation(i);
const auto& repfield = this->_internal_annotation().Get(i);
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
}

458
src/google/protobuf/descriptor.pb.h
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save