Upgrade linux protobuf
This commit is contained in:
1 parent
79f2f356d5
commit
0f3130fb47
689 files changed
+141922
-132057
No files matched your search
@@ -62,15 +62,16 @@ namespace java {
|
||||
|
||||
namespace {
|
||||
|
||||
ImmutableFieldGenerator* MakeImmutableGenerator(
|
||||
const FieldDescriptor* field, int messageBitIndex, int builderBitIndex,
|
||||
Context* context) {
|
||||
ImmutableFieldGenerator* MakeImmutableGenerator(const FieldDescriptor* field,
|
||||
int messageBitIndex,
|
||||
int builderBitIndex,
|
||||
Context* context) {
|
||||
if (field->is_repeated()) {
|
||||
switch (GetJavaType(field)) {
|
||||
case JAVATYPE_MESSAGE:
|
||||
if (IsMapEntry(field->message_type())) {
|
||||
return new ImmutableMapFieldGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
return new ImmutableMapFieldGenerator(field, messageBitIndex,
|
||||
builderBitIndex, context);
|
||||
} else {
|
||||
return new RepeatedImmutableMessageFieldGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
@@ -86,14 +87,14 @@ ImmutableFieldGenerator* MakeImmutableGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
}
|
||||
} else {
|
||||
if (field->containing_oneof()) {
|
||||
if (IsRealOneof(field)) {
|
||||
switch (GetJavaType(field)) {
|
||||
case JAVATYPE_MESSAGE:
|
||||
return new ImmutableMessageOneofFieldGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
case JAVATYPE_ENUM:
|
||||
return new ImmutableEnumOneofFieldGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
return new ImmutableEnumOneofFieldGenerator(field, messageBitIndex,
|
||||
builderBitIndex, context);
|
||||
case JAVATYPE_STRING:
|
||||
return new ImmutableStringOneofFieldGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
@@ -104,75 +105,74 @@ ImmutableFieldGenerator* MakeImmutableGenerator(
|
||||
} else {
|
||||
switch (GetJavaType(field)) {
|
||||
case JAVATYPE_MESSAGE:
|
||||
return new ImmutableMessageFieldGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
return new ImmutableMessageFieldGenerator(field, messageBitIndex,
|
||||
builderBitIndex, context);
|
||||
case JAVATYPE_ENUM:
|
||||
return new ImmutableEnumFieldGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
return new ImmutableEnumFieldGenerator(field, messageBitIndex,
|
||||
builderBitIndex, context);
|
||||
case JAVATYPE_STRING:
|
||||
return new ImmutableStringFieldGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
return new ImmutableStringFieldGenerator(field, messageBitIndex,
|
||||
builderBitIndex, context);
|
||||
default:
|
||||
return new ImmutablePrimitiveFieldGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
return new ImmutablePrimitiveFieldGenerator(field, messageBitIndex,
|
||||
builderBitIndex, context);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ImmutableFieldLiteGenerator* MakeImmutableLiteGenerator(
|
||||
const FieldDescriptor* field, int messageBitIndex, int builderBitIndex,
|
||||
Context* context) {
|
||||
const FieldDescriptor* field, int messageBitIndex, Context* context) {
|
||||
if (field->is_repeated()) {
|
||||
switch (GetJavaType(field)) {
|
||||
case JAVATYPE_MESSAGE:
|
||||
if (IsMapEntry(field->message_type())) {
|
||||
return new ImmutableMapFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
return new ImmutableMapFieldLiteGenerator(field, messageBitIndex,
|
||||
context);
|
||||
} else {
|
||||
return new RepeatedImmutableMessageFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
field, messageBitIndex, context);
|
||||
}
|
||||
case JAVATYPE_ENUM:
|
||||
return new RepeatedImmutableEnumFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
field, messageBitIndex, context);
|
||||
case JAVATYPE_STRING:
|
||||
return new RepeatedImmutableStringFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
field, messageBitIndex, context);
|
||||
default:
|
||||
return new RepeatedImmutablePrimitiveFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
field, messageBitIndex, context);
|
||||
}
|
||||
} else {
|
||||
if (field->containing_oneof()) {
|
||||
if (IsRealOneof(field)) {
|
||||
switch (GetJavaType(field)) {
|
||||
case JAVATYPE_MESSAGE:
|
||||
return new ImmutableMessageOneofFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
field, messageBitIndex, context);
|
||||
case JAVATYPE_ENUM:
|
||||
return new ImmutableEnumOneofFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
field, messageBitIndex, context);
|
||||
case JAVATYPE_STRING:
|
||||
return new ImmutableStringOneofFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
field, messageBitIndex, context);
|
||||
default:
|
||||
return new ImmutablePrimitiveOneofFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
field, messageBitIndex, context);
|
||||
}
|
||||
} else {
|
||||
switch (GetJavaType(field)) {
|
||||
case JAVATYPE_MESSAGE:
|
||||
return new ImmutableMessageFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
return new ImmutableMessageFieldLiteGenerator(field, messageBitIndex,
|
||||
context);
|
||||
case JAVATYPE_ENUM:
|
||||
return new ImmutableEnumFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
return new ImmutableEnumFieldLiteGenerator(field, messageBitIndex,
|
||||
context);
|
||||
case JAVATYPE_STRING:
|
||||
return new ImmutableStringFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
return new ImmutableStringFieldLiteGenerator(field, messageBitIndex,
|
||||
context);
|
||||
default:
|
||||
return new ImmutablePrimitiveFieldLiteGenerator(
|
||||
field, messageBitIndex, builderBitIndex, context);
|
||||
field, messageBitIndex, context);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -193,26 +193,19 @@ static inline void ReportUnexpectedPackedFieldsCall(io::Printer* printer) {
|
||||
|
||||
ImmutableFieldGenerator::~ImmutableFieldGenerator() {}
|
||||
|
||||
void ImmutableFieldGenerator::
|
||||
GenerateParsingCodeFromPacked(io::Printer* printer) const {
|
||||
void ImmutableFieldGenerator::GenerateParsingCodeFromPacked(
|
||||
io::Printer* printer) const {
|
||||
ReportUnexpectedPackedFieldsCall(printer);
|
||||
}
|
||||
|
||||
ImmutableFieldLiteGenerator::~ImmutableFieldLiteGenerator() {}
|
||||
|
||||
void ImmutableFieldLiteGenerator::
|
||||
GenerateParsingCodeFromPacked(io::Printer* printer) const {
|
||||
ReportUnexpectedPackedFieldsCall(printer);
|
||||
}
|
||||
|
||||
// ===================================================================
|
||||
|
||||
template <>
|
||||
FieldGeneratorMap<ImmutableFieldGenerator>::FieldGeneratorMap(
|
||||
const Descriptor* descriptor, Context* context)
|
||||
: descriptor_(descriptor),
|
||||
field_generators_(descriptor->field_count()) {
|
||||
|
||||
: descriptor_(descriptor), field_generators_(descriptor->field_count()) {
|
||||
// Construct all the FieldGenerators and assign them bit indices for their
|
||||
// bit fields.
|
||||
int messageBitIndex = 0;
|
||||
@@ -226,67 +219,84 @@ FieldGeneratorMap<ImmutableFieldGenerator>::FieldGeneratorMap(
|
||||
}
|
||||
}
|
||||
|
||||
template<>
|
||||
template <>
|
||||
FieldGeneratorMap<ImmutableFieldGenerator>::~FieldGeneratorMap() {}
|
||||
|
||||
template <>
|
||||
FieldGeneratorMap<ImmutableFieldLiteGenerator>::FieldGeneratorMap(
|
||||
const Descriptor* descriptor, Context* context)
|
||||
: descriptor_(descriptor),
|
||||
field_generators_(descriptor->field_count()) {
|
||||
: descriptor_(descriptor), field_generators_(descriptor->field_count()) {
|
||||
// Construct all the FieldGenerators and assign them bit indices for their
|
||||
// bit fields.
|
||||
int messageBitIndex = 0;
|
||||
int builderBitIndex = 0;
|
||||
for (int i = 0; i < descriptor->field_count(); i++) {
|
||||
ImmutableFieldLiteGenerator* generator = MakeImmutableLiteGenerator(
|
||||
descriptor->field(i), messageBitIndex, builderBitIndex, context);
|
||||
descriptor->field(i), messageBitIndex, context);
|
||||
field_generators_[i].reset(generator);
|
||||
messageBitIndex += generator->GetNumBitsForMessage();
|
||||
builderBitIndex += generator->GetNumBitsForBuilder();
|
||||
}
|
||||
}
|
||||
|
||||
template<>
|
||||
template <>
|
||||
FieldGeneratorMap<ImmutableFieldLiteGenerator>::~FieldGeneratorMap() {}
|
||||
|
||||
|
||||
void SetCommonFieldVariables(const FieldDescriptor* descriptor,
|
||||
const FieldGeneratorInfo* info,
|
||||
std::map<string, string>* variables) {
|
||||
std::map<std::string, std::string>* variables) {
|
||||
(*variables)["field_name"] = descriptor->name();
|
||||
(*variables)["name"] = info->name;
|
||||
(*variables)["classname"] = descriptor->containing_type()->name();
|
||||
(*variables)["capitalized_name"] = info->capitalized_name;
|
||||
(*variables)["disambiguated_reason"] = info->disambiguated_reason;
|
||||
(*variables)["constant_name"] = FieldConstantName(descriptor);
|
||||
(*variables)["number"] = SimpleItoa(descriptor->number());
|
||||
(*variables)["number"] = StrCat(descriptor->number());
|
||||
(*variables)["kt_dsl_builder"] = "_builder";
|
||||
// These variables are placeholders to pick out the beginning and ends of
|
||||
// identifiers for annotations (when doing so with existing variables would
|
||||
// be ambiguous or impossible). They should never be set to anything but the
|
||||
// empty string.
|
||||
(*variables)["{"] = "";
|
||||
(*variables)["}"] = "";
|
||||
(*variables)["kt_name"] =
|
||||
IsForbiddenKotlin(info->name) ? info->name + "_" : info->name;
|
||||
(*variables)["kt_capitalized_name"] = IsForbiddenKotlin(info->name)
|
||||
? info->capitalized_name + "_"
|
||||
: info->capitalized_name;
|
||||
if (!descriptor->is_repeated()) {
|
||||
(*variables)["annotation_field_type"] = FieldTypeName(descriptor->type());
|
||||
} else if (GetJavaType(descriptor) == JAVATYPE_MESSAGE &&
|
||||
IsMapEntry(descriptor->message_type())) {
|
||||
(*variables)["annotation_field_type"] =
|
||||
std::string(FieldTypeName(descriptor->type())) + "MAP";
|
||||
} else {
|
||||
(*variables)["annotation_field_type"] =
|
||||
std::string(FieldTypeName(descriptor->type())) + "_LIST";
|
||||
if (descriptor->is_packed()) {
|
||||
(*variables)["annotation_field_type"] =
|
||||
(*variables)["annotation_field_type"] + "_PACKED";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SetCommonOneofVariables(const FieldDescriptor* descriptor,
|
||||
const OneofGeneratorInfo* info,
|
||||
std::map<string, string>* variables) {
|
||||
std::map<std::string, std::string>* variables) {
|
||||
(*variables)["oneof_name"] = info->name;
|
||||
(*variables)["oneof_capitalized_name"] = info->capitalized_name;
|
||||
(*variables)["oneof_index"] =
|
||||
SimpleItoa(descriptor->containing_oneof()->index());
|
||||
(*variables)["set_oneof_case_message"] = info->name +
|
||||
"Case_ = " + SimpleItoa(descriptor->number());
|
||||
(*variables)["clear_oneof_case_message"] = info->name +
|
||||
"Case_ = 0";
|
||||
(*variables)["has_oneof_case_message"] = info->name +
|
||||
"Case_ == " + SimpleItoa(descriptor->number());
|
||||
StrCat(descriptor->containing_oneof()->index());
|
||||
(*variables)["oneof_stored_type"] = GetOneofStoredType(descriptor);
|
||||
(*variables)["set_oneof_case_message"] =
|
||||
info->name + "Case_ = " + StrCat(descriptor->number());
|
||||
(*variables)["clear_oneof_case_message"] = info->name + "Case_ = 0";
|
||||
(*variables)["has_oneof_case_message"] =
|
||||
info->name + "Case_ == " + StrCat(descriptor->number());
|
||||
}
|
||||
|
||||
void PrintExtraFieldInfo(const std::map<string, string>& variables,
|
||||
void PrintExtraFieldInfo(const std::map<std::string, std::string>& variables,
|
||||
io::Printer* printer) {
|
||||
const std::map<string, string>::const_iterator it =
|
||||
const std::map<std::string, std::string>::const_iterator it =
|
||||
variables.find("disambiguated_reason");
|
||||
if (it != variables.end() && !it->second.empty()) {
|
||||
printer->Print(
|
||||
|
||||
Reference in new issue
Block a user