Upgrade linux protobuf
This commit is contained in:
1 parent
79f2f356d5
commit
0f3130fb47
689 files changed
+141922
-132057
No files matched your search
@@ -43,6 +43,7 @@
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/stubs/map_util.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -58,7 +59,7 @@ EnumLiteGenerator::EnumLiteGenerator(const EnumDescriptor* descriptor,
|
||||
for (int i = 0; i < descriptor_->value_count(); i++) {
|
||||
const EnumValueDescriptor* value = descriptor_->value(i);
|
||||
const EnumValueDescriptor* canonical_value =
|
||||
descriptor_->FindValueByNumber(value->number());
|
||||
descriptor_->FindValueByNumber(value->number());
|
||||
|
||||
if (value == canonical_value) {
|
||||
canonical_values_.push_back(value);
|
||||
@@ -77,22 +78,22 @@ void EnumLiteGenerator::Generate(io::Printer* printer) {
|
||||
WriteEnumDocComment(printer, descriptor_);
|
||||
MaybePrintGeneratedAnnotation(context_, printer, descriptor_, immutable_api_);
|
||||
printer->Print(
|
||||
"public enum $classname$\n"
|
||||
"$deprecation$public enum $classname$\n"
|
||||
" implements com.google.protobuf.Internal.EnumLite {\n",
|
||||
"classname", descriptor_->name());
|
||||
"classname", descriptor_->name(), "deprecation",
|
||||
descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "");
|
||||
printer->Annotate("classname", descriptor_);
|
||||
printer->Indent();
|
||||
|
||||
for (int i = 0; i < canonical_values_.size(); i++) {
|
||||
std::map<string, string> vars;
|
||||
std::map<std::string, std::string> vars;
|
||||
vars["name"] = canonical_values_[i]->name();
|
||||
vars["number"] = SimpleItoa(canonical_values_[i]->number());
|
||||
vars["number"] = StrCat(canonical_values_[i]->number());
|
||||
WriteEnumValueDocComment(printer, canonical_values_[i]);
|
||||
if (canonical_values_[i]->options().deprecated()) {
|
||||
printer->Print("@java.lang.Deprecated\n");
|
||||
}
|
||||
printer->Print(vars,
|
||||
"$name$($number$),\n");
|
||||
printer->Print(vars, "$name$($number$),\n");
|
||||
printer->Annotate("name", canonical_values_[i]);
|
||||
}
|
||||
|
||||
@@ -102,31 +103,35 @@ void EnumLiteGenerator::Generate(io::Printer* printer) {
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
";\n"
|
||||
"\n");
|
||||
";\n"
|
||||
"\n");
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
|
||||
for (int i = 0; i < aliases_.size(); i++) {
|
||||
std::map<string, string> vars;
|
||||
std::map<std::string, std::string> vars;
|
||||
vars["classname"] = descriptor_->name();
|
||||
vars["name"] = aliases_[i].value->name();
|
||||
vars["canonical_name"] = aliases_[i].canonical_value->name();
|
||||
WriteEnumValueDocComment(printer, aliases_[i].value);
|
||||
printer->Print(vars,
|
||||
"public static final $classname$ $name$ = $canonical_name$;\n");
|
||||
printer->Print(
|
||||
vars, "public static final $classname$ $name$ = $canonical_name$;\n");
|
||||
printer->Annotate("name", aliases_[i].value);
|
||||
}
|
||||
|
||||
for (int i = 0; i < descriptor_->value_count(); i++) {
|
||||
std::map<string, string> vars;
|
||||
std::map<std::string, std::string> vars;
|
||||
vars["name"] = descriptor_->value(i)->name();
|
||||
vars["number"] = SimpleItoa(descriptor_->value(i)->number());
|
||||
vars["number"] = StrCat(descriptor_->value(i)->number());
|
||||
vars["{"] = "";
|
||||
vars["}"] = "";
|
||||
vars["deprecation"] = descriptor_->value(i)->options().deprecated()
|
||||
? "@java.lang.Deprecated "
|
||||
: "";
|
||||
WriteEnumValueDocComment(printer, descriptor_->value(i));
|
||||
printer->Print(vars,
|
||||
"public static final int ${$$name$_VALUE$}$ = $number$;\n");
|
||||
"$deprecation$public static final int ${$$name$_VALUE$}$ = "
|
||||
"$number$;\n");
|
||||
printer->Annotate("{", "}", descriptor_->value(i));
|
||||
}
|
||||
printer->Print("\n");
|
||||
@@ -149,6 +154,8 @@ void EnumLiteGenerator::Generate(io::Printer* printer) {
|
||||
"}\n"
|
||||
"\n"
|
||||
"/**\n"
|
||||
" * @param value The number of the enum to look for.\n"
|
||||
" * @return The enum associated with the given number.\n"
|
||||
" * @deprecated Use {@link #forNumber(int)} instead.\n"
|
||||
" */\n"
|
||||
"@java.lang.Deprecated\n"
|
||||
@@ -163,63 +170,65 @@ void EnumLiteGenerator::Generate(io::Printer* printer) {
|
||||
printer->Indent();
|
||||
|
||||
for (int i = 0; i < canonical_values_.size(); i++) {
|
||||
printer->Print(
|
||||
"case $number$: return $name$;\n",
|
||||
"name", canonical_values_[i]->name(),
|
||||
"number", SimpleItoa(canonical_values_[i]->number()));
|
||||
printer->Print("case $number$: return $name$;\n", "name",
|
||||
canonical_values_[i]->name(), "number",
|
||||
StrCat(canonical_values_[i]->number()));
|
||||
}
|
||||
|
||||
printer->Outdent();
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
" default: return null;\n"
|
||||
" }\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"public static com.google.protobuf.Internal.EnumLiteMap<$classname$>\n"
|
||||
" internalGetValueMap() {\n"
|
||||
" return internalValueMap;\n"
|
||||
"}\n"
|
||||
"private static final com.google.protobuf.Internal.EnumLiteMap<\n"
|
||||
" $classname$> internalValueMap =\n"
|
||||
" new com.google.protobuf.Internal.EnumLiteMap<$classname$>() {\n"
|
||||
" @java.lang.Override\n"
|
||||
" public $classname$ findValueByNumber(int number) {\n"
|
||||
" return $classname$.forNumber(number);\n"
|
||||
" }\n"
|
||||
" };\n"
|
||||
"\n",
|
||||
"classname", descriptor_->name());
|
||||
" default: return null;\n"
|
||||
" }\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"public static com.google.protobuf.Internal.EnumLiteMap<$classname$>\n"
|
||||
" internalGetValueMap() {\n"
|
||||
" return internalValueMap;\n"
|
||||
"}\n"
|
||||
"private static final com.google.protobuf.Internal.EnumLiteMap<\n"
|
||||
" $classname$> internalValueMap =\n"
|
||||
" new com.google.protobuf.Internal.EnumLiteMap<$classname$>() {\n"
|
||||
" @java.lang.Override\n"
|
||||
" public $classname$ findValueByNumber(int number) {\n"
|
||||
" return $classname$.forNumber(number);\n"
|
||||
" }\n"
|
||||
" };\n"
|
||||
"\n"
|
||||
"public static com.google.protobuf.Internal.EnumVerifier \n"
|
||||
" internalGetVerifier() {\n"
|
||||
" return $classname$Verifier.INSTANCE;\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"private static final class $classname$Verifier implements \n"
|
||||
" com.google.protobuf.Internal.EnumVerifier { \n"
|
||||
" static final com.google.protobuf.Internal.EnumVerifier "
|
||||
" INSTANCE = new $classname$Verifier();\n"
|
||||
" @java.lang.Override\n"
|
||||
" public boolean isInRange(int number) {\n"
|
||||
" return $classname$.forNumber(number) != null;\n"
|
||||
" }\n"
|
||||
" };\n"
|
||||
"\n",
|
||||
"classname", descriptor_->name());
|
||||
|
||||
printer->Print(
|
||||
"private final int value;\n\n"
|
||||
"private $classname$(int value) {\n",
|
||||
"classname", descriptor_->name());
|
||||
"private final int value;\n\n"
|
||||
"private $classname$(int value) {\n",
|
||||
"classname", descriptor_->name());
|
||||
printer->Print(
|
||||
" this.value = value;\n"
|
||||
"}\n");
|
||||
" this.value = value;\n"
|
||||
"}\n");
|
||||
|
||||
printer->Print(
|
||||
"\n"
|
||||
"// @@protoc_insertion_point(enum_scope:$full_name$)\n",
|
||||
"full_name", descriptor_->full_name());
|
||||
"\n"
|
||||
"// @@protoc_insertion_point(enum_scope:$full_name$)\n",
|
||||
"full_name", descriptor_->full_name());
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print("}\n\n");
|
||||
}
|
||||
|
||||
bool EnumLiteGenerator::CanUseEnumValues() {
|
||||
if (canonical_values_.size() != descriptor_->value_count()) {
|
||||
return false;
|
||||
}
|
||||
for (int i = 0; i < descriptor_->value_count(); i++) {
|
||||
if (descriptor_->value(i)->name() != canonical_values_[i]->name()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
|
||||
Reference in new issue
Block a user