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

add movable String interface Reflection

Browse Source
pull/6495/head
reed-lau 6 years ago committed by Adam Cozzette
parent 6e0a6d1cbd
commit 218df038cc
3 changed files with 58 additions and 5 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. 18
      src/google/protobuf/extension_set.h
  2. 39
      src/google/protobuf/generated_message_reflection.cc
  3. 6
      src/google/protobuf/message.h

18
src/google/protobuf/extension_set.h
Unescape View File

@ -269,6 +269,7 @@ class PROTOBUF_EXPORT ExtensionSet {
void SetBool(int number, FieldType type, bool value, desc);
void SetEnum(int number, FieldType type, int value, desc);
void SetString(int number, FieldType type, const std::string& value, desc);
void SetString(int number, FieldType type, std::string&& value, desc);
std::string* MutableString(int number, FieldType type, desc);
MessageLite* MutableMessage(int number, FieldType type,
const MessageLite& prototype, desc);
@ -332,6 +333,7 @@ class PROTOBUF_EXPORT ExtensionSet {
void SetRepeatedBool(int number, int index, bool value);
void SetRepeatedEnum(int number, int index, int value);
void SetRepeatedString(int number, int index, const std::string& value);
void SetRepeatedString(int number, int index, std::string&& value);
std::string* MutableRepeatedString(int number, int index);
MessageLite* MutableRepeatedMessage(int number, int index);
@ -345,6 +347,7 @@ class PROTOBUF_EXPORT ExtensionSet {
void AddBool(int number, FieldType type, bool packed, bool value, desc);
void AddEnum(int number, FieldType type, bool packed, int value, desc);
void AddString(int number, FieldType type, const std::string& value, desc);
void AddString(int number, FieldType type, std::string&& value, desc);
std::string* AddString(int number, FieldType type, desc);
MessageLite* AddMessage(int number, FieldType type,
const MessageLite& prototype, desc);
@ -862,16 +865,29 @@ inline void ExtensionSet::SetString(int number, FieldType type,
const FieldDescriptor* descriptor) {
MutableString(number, type, descriptor)->assign(value);
}
inline void ExtensionSet::SetString(int number, FieldType type,
std::string&& value,
const FieldDescriptor* descriptor) {
*MutableString(number, type, descriptor) = std::move(value);
}
inline void ExtensionSet::SetRepeatedString(int number, int index,
const std::string& value) {
MutableRepeatedString(number, index)->assign(value);
}
inline void ExtensionSet::SetRepeatedString(int number, int index,
std::string&& value) {
*MutableRepeatedString(number, index) = std::move(value);
}
inline void ExtensionSet::AddString(int number, FieldType type,
const std::string& value,
const FieldDescriptor* descriptor) {
AddString(number, type, descriptor)->assign(value);
}
inline void ExtensionSet::AddString(int number, FieldType type,
std::string&& value,
const FieldDescriptor* descriptor) {
*AddString(number, type, descriptor) = std::move(value);
}
// ===================================================================
// Glue for generated extension accessors

39
src/google/protobuf/generated_message_reflection.cc
Unescape View File

@ -1224,11 +1224,11 @@ void Reflection::SetString(Message* message, const FieldDescriptor* field,
void Reflection::SetString(Message* message, const FieldDescriptor* field,
const std::string&& value) const {
std::string&& value) const {
USAGE_CHECK_ALL(SetString, SINGULAR, STRING);
if (field->is_extension()) {
return MutableExtensionSet(message)->SetString(field->number(),
field->type(), value, field);
field->type(), std::move(value), field);
} else {
switch (field->options().ctype()) {
default: // TODO(kenton): Support other string reps.
@ -1247,7 +1247,7 @@ void Reflection::SetString(Message* message, const FieldDescriptor* field,
->UnsafeSetDefault(default_ptr);
}
*(MutableField<ArenaStringPtr>(message, field)
->Mutable(default_ptr, GetArena(message))) = value;
->Mutable(default_ptr, GetArena(message))) = std::move(value);
break;
}
}
@ -1304,6 +1304,23 @@ void Reflection::SetRepeatedString(Message* message,
}
void Reflection::SetRepeatedString(Message* message,
const FieldDescriptor* field, int index,
std::string&& value) const {
USAGE_CHECK_ALL(SetRepeatedString, REPEATED, STRING);
if (field->is_extension()) {
MutableExtensionSet(message)->SetRepeatedString(field->number(), index,
std::move(value));
} else {
switch (field->options().ctype()) {
default: // TODO(kenton): Support other string reps.
case FieldOptions::STRING:
*MutableRepeatedField<std::string>(message, field, index) = std::move(value);
break;
}
}
}
void Reflection::AddString(Message* message, const FieldDescriptor* field,
const std::string& value) const {
USAGE_CHECK_ALL(AddString, REPEATED, STRING);
@ -1321,6 +1338,22 @@ void Reflection::AddString(Message* message, const FieldDescriptor* field,
}
void Reflection::AddString(Message* message, const FieldDescriptor* field,
std::string&& value) const {
USAGE_CHECK_ALL(AddString, REPEATED, STRING);
if (field->is_extension()) {
MutableExtensionSet(message)->AddString(field->number(), field->type(),
std::move(value), field);
} else {
switch (field->options().ctype()) {
default: // TODO(kenton): Support other string reps.
case FieldOptions::STRING:
*AddField<std::string>(message, field) = std::move(value);
break;
}
}
}
// -------------------------------------------------------------------
const EnumValueDescriptor* Reflection::GetEnum(

6
src/google/protobuf/message.h
Unescape View File

@ -541,7 +541,7 @@ class PROTOBUF_EXPORT Reflection final {
void SetString(Message* message, const FieldDescriptor* field,
const std::string& value) const;
void SetString(Message* message, const FieldDescriptor* field,
const std::string&& value) const;
std::string&& value) const;
void SetEnum(Message* message, const FieldDescriptor* field,
const EnumValueDescriptor* value) const;
// Set an enum field's value with an integer rather than EnumValueDescriptor.
@ -642,6 +642,8 @@ class PROTOBUF_EXPORT Reflection final {
int index, bool value) const;
void SetRepeatedString(Message* message, const FieldDescriptor* field,
int index, const std::string& value) const;
void SetRepeatedString(Message* message, const FieldDescriptor* field,
int index, std::string&& value) const;
void SetRepeatedEnum(Message* message, const FieldDescriptor* field,
int index, const EnumValueDescriptor* value) const;
// Set an enum field's value with an integer rather than EnumValueDescriptor.
@ -679,6 +681,8 @@ class PROTOBUF_EXPORT Reflection final {
bool value) const;
void AddString(Message* message, const FieldDescriptor* field,
const std::string& value) const;
void AddString(Message* message, const FieldDescriptor* field,
std::string&& value) const;
void AddEnum(Message* message, const FieldDescriptor* field,
const EnumValueDescriptor* value) const;
// Add an integer value to a repeated enum field rather than

Write Preview
Loading…
Cancel
Save