Upgrade linux protobuf
This commit is contained in:
1 parent
79f2f356d5
commit
0f3130fb47
689 files changed
+141922
-132057
No files matched your search
@@ -50,15 +50,15 @@ namespace compiler {
|
||||
namespace java {
|
||||
|
||||
EnumGenerator::EnumGenerator(const EnumDescriptor* descriptor,
|
||||
bool immutable_api,
|
||||
Context* context)
|
||||
: descriptor_(descriptor), immutable_api_(immutable_api),
|
||||
context_(context),
|
||||
name_resolver_(context->GetNameResolver()) {
|
||||
bool immutable_api, Context* context)
|
||||
: descriptor_(descriptor),
|
||||
immutable_api_(immutable_api),
|
||||
context_(context),
|
||||
name_resolver_(context->GetNameResolver()) {
|
||||
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,14 +77,15 @@ void EnumGenerator::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.ProtocolMessageEnum {\n",
|
||||
"classname", descriptor_->name());
|
||||
"classname", descriptor_->name(), "deprecation",
|
||||
descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "");
|
||||
printer->Annotate("classname", descriptor_);
|
||||
printer->Indent();
|
||||
|
||||
bool ordinal_is_index = true;
|
||||
string index_text = "ordinal()";
|
||||
std::string index_text = "ordinal()";
|
||||
for (int i = 0; i < canonical_values_.size(); i++) {
|
||||
if (canonical_values_[i]->index() != i) {
|
||||
ordinal_is_index = false;
|
||||
@@ -94,20 +95,18 @@ void EnumGenerator::Generate(io::Printer* printer) {
|
||||
}
|
||||
|
||||
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["index"] = SimpleItoa(canonical_values_[i]->index());
|
||||
vars["number"] = SimpleItoa(canonical_values_[i]->number());
|
||||
vars["index"] = StrCat(canonical_values_[i]->index());
|
||||
vars["number"] = StrCat(canonical_values_[i]->number());
|
||||
WriteEnumValueDocComment(printer, canonical_values_[i]);
|
||||
if (canonical_values_[i]->options().deprecated()) {
|
||||
printer->Print("@java.lang.Deprecated\n");
|
||||
}
|
||||
if (ordinal_is_index) {
|
||||
printer->Print(vars,
|
||||
"$name$($number$),\n");
|
||||
printer->Print(vars, "$name$($number$),\n");
|
||||
} else {
|
||||
printer->Print(vars,
|
||||
"$name$($index$, $number$),\n");
|
||||
printer->Print(vars, "$name$($index$, $number$),\n");
|
||||
}
|
||||
printer->Annotate("name", canonical_values_[i]);
|
||||
}
|
||||
@@ -122,31 +121,35 @@ void EnumGenerator::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");
|
||||
@@ -154,85 +157,110 @@ void EnumGenerator::Generate(io::Printer* printer) {
|
||||
// -----------------------------------------------------------------
|
||||
|
||||
printer->Print(
|
||||
"\n"
|
||||
"public final int getNumber() {\n");
|
||||
"\n"
|
||||
"public final int getNumber() {\n");
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
if (ordinal_is_index) {
|
||||
printer->Print(
|
||||
" if (this == UNRECOGNIZED) {\n"
|
||||
" throw new java.lang.IllegalArgumentException(\n"
|
||||
" \"Can't get the number of an unknown enum value.\");\n"
|
||||
" }\n");
|
||||
" if (this == UNRECOGNIZED) {\n"
|
||||
" throw new java.lang.IllegalArgumentException(\n"
|
||||
" \"Can't get the number of an unknown enum value.\");\n"
|
||||
" }\n");
|
||||
} else {
|
||||
printer->Print(
|
||||
" if (index == -1) {\n"
|
||||
" throw new java.lang.IllegalArgumentException(\n"
|
||||
" \"Can't get the number of an unknown enum value.\");\n"
|
||||
" }\n");
|
||||
" if (index == -1) {\n"
|
||||
" throw new java.lang.IllegalArgumentException(\n"
|
||||
" \"Can't get the number of an unknown enum value.\");\n"
|
||||
" }\n");
|
||||
}
|
||||
}
|
||||
printer->Print(
|
||||
" return value;\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"/**\n"
|
||||
" * @deprecated Use {@link #forNumber(int)} instead.\n"
|
||||
" */\n"
|
||||
"@java.lang.Deprecated\n"
|
||||
"public static $classname$ valueOf(int value) {\n"
|
||||
" return forNumber(value);\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"public static $classname$ forNumber(int value) {\n"
|
||||
" switch (value) {\n",
|
||||
"classname", descriptor_->name());
|
||||
" return value;\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"/**\n"
|
||||
" * @param value The numeric wire value of the corresponding enum "
|
||||
"entry.\n"
|
||||
" * @return The enum associated with the given numeric wire value.\n"
|
||||
" * @deprecated Use {@link #forNumber(int)} instead.\n"
|
||||
" */\n"
|
||||
"@java.lang.Deprecated\n"
|
||||
"public static $classname$ valueOf(int value) {\n"
|
||||
" return forNumber(value);\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"/**\n"
|
||||
" * @param value The numeric wire value of the corresponding enum "
|
||||
"entry.\n"
|
||||
" * @return The enum associated with the given numeric wire value.\n"
|
||||
" */\n"
|
||||
"public static $classname$ forNumber(int value) {\n"
|
||||
" switch (value) {\n",
|
||||
"classname", descriptor_->name());
|
||||
printer->Indent();
|
||||
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"
|
||||
" 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"
|
||||
" public $classname$ findValueByNumber(int number) {\n"
|
||||
" return $classname$.forNumber(number);\n"
|
||||
" }\n"
|
||||
" };\n"
|
||||
"\n",
|
||||
"classname", descriptor_->name());
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
// Reflection
|
||||
|
||||
if (HasDescriptorMethods(descriptor_, context_->EnforceLite())) {
|
||||
printer->Print(
|
||||
"public final com.google.protobuf.Descriptors.EnumValueDescriptor\n"
|
||||
" getValueDescriptor() {\n"
|
||||
" return getDescriptor().getValues().get($index_text$);\n"
|
||||
"}\n"
|
||||
"public final com.google.protobuf.Descriptors.EnumDescriptor\n"
|
||||
" getDescriptorForType() {\n"
|
||||
" return getDescriptor();\n"
|
||||
"}\n"
|
||||
"public static final com.google.protobuf.Descriptors.EnumDescriptor\n"
|
||||
" getDescriptor() {\n",
|
||||
"index_text", index_text);
|
||||
"public final com.google.protobuf.Descriptors.EnumValueDescriptor\n"
|
||||
" getValueDescriptor() {\n");
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
if (ordinal_is_index) {
|
||||
printer->Print(
|
||||
" if (this == UNRECOGNIZED) {\n"
|
||||
" throw new java.lang.IllegalStateException(\n"
|
||||
" \"Can't get the descriptor of an unrecognized enum "
|
||||
"value.\");\n"
|
||||
" }\n");
|
||||
} else {
|
||||
printer->Print(
|
||||
" if (index == -1) {\n"
|
||||
" throw new java.lang.IllegalStateException(\n"
|
||||
" \"Can't get the descriptor of an unrecognized enum "
|
||||
"value.\");\n"
|
||||
" }\n");
|
||||
}
|
||||
}
|
||||
printer->Print(
|
||||
" return getDescriptor().getValues().get($index_text$);\n"
|
||||
"}\n"
|
||||
"public final com.google.protobuf.Descriptors.EnumDescriptor\n"
|
||||
" getDescriptorForType() {\n"
|
||||
" return getDescriptor();\n"
|
||||
"}\n"
|
||||
"public static final com.google.protobuf.Descriptors.EnumDescriptor\n"
|
||||
" getDescriptor() {\n",
|
||||
"index_text", index_text);
|
||||
|
||||
// TODO(kenton): Cache statically? Note that we can't access descriptors
|
||||
// at module init time because it wouldn't work with descriptor.proto, but
|
||||
@@ -242,27 +270,30 @@ void EnumGenerator::Generate(io::Printer* printer) {
|
||||
// extensions in both the mutable and immutable cases. (In the mutable api
|
||||
// this is accomplished by attempting to load the immutable outer class).
|
||||
printer->Print(
|
||||
" return $file$.getDescriptor().getEnumTypes().get($index$);\n",
|
||||
"file", name_resolver_->GetClassName(descriptor_->file(),
|
||||
immutable_api_),
|
||||
"index", SimpleItoa(descriptor_->index()));
|
||||
" return $file$.getDescriptor().getEnumTypes().get($index$);\n",
|
||||
"file",
|
||||
name_resolver_->GetClassName(descriptor_->file(), immutable_api_),
|
||||
"index", StrCat(descriptor_->index()));
|
||||
} else {
|
||||
printer->Print(
|
||||
" return $parent$.$descriptor$.getEnumTypes().get($index$);\n",
|
||||
"parent", name_resolver_->GetClassName(descriptor_->containing_type(),
|
||||
immutable_api_),
|
||||
"descriptor", descriptor_->containing_type()->options()
|
||||
.no_standard_descriptor_accessor()
|
||||
? "getDefaultInstance().getDescriptorForType()"
|
||||
: "getDescriptor()",
|
||||
"index", SimpleItoa(descriptor_->index()));
|
||||
"parent",
|
||||
name_resolver_->GetClassName(descriptor_->containing_type(),
|
||||
immutable_api_),
|
||||
"descriptor",
|
||||
descriptor_->containing_type()
|
||||
->options()
|
||||
.no_standard_descriptor_accessor()
|
||||
? "getDefaultInstance().getDescriptorForType()"
|
||||
: "getDescriptor()",
|
||||
"index", StrCat(descriptor_->index()));
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
"}\n"
|
||||
"\n"
|
||||
"private static final $classname$[] VALUES = ",
|
||||
"classname", descriptor_->name());
|
||||
"}\n"
|
||||
"\n"
|
||||
"private static final $classname$[] VALUES = ",
|
||||
"classname", descriptor_->name());
|
||||
|
||||
if (CanUseEnumValues()) {
|
||||
// If the constants we are going to output are exactly the ones we
|
||||
@@ -271,37 +302,43 @@ void EnumGenerator::Generate(io::Printer* printer) {
|
||||
// for every enum.
|
||||
printer->Print("values();\n");
|
||||
} else {
|
||||
printer->Print("getStaticValuesArray();\n");
|
||||
printer->Print("private static $classname$[] getStaticValuesArray() {\n",
|
||||
"classname", descriptor_->name());
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
"{\n"
|
||||
" ");
|
||||
"return new $classname$[] {\n"
|
||||
" ",
|
||||
"classname", descriptor_->name());
|
||||
for (int i = 0; i < descriptor_->value_count(); i++) {
|
||||
printer->Print("$name$, ",
|
||||
"name", descriptor_->value(i)->name());
|
||||
printer->Print("$name$, ", "name", descriptor_->value(i)->name());
|
||||
}
|
||||
printer->Print(
|
||||
"\n"
|
||||
"};\n");
|
||||
printer->Outdent();
|
||||
printer->Print("}");
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
"\n"
|
||||
"public static $classname$ valueOf(\n"
|
||||
" com.google.protobuf.Descriptors.EnumValueDescriptor desc) {\n"
|
||||
" if (desc.getType() != getDescriptor()) {\n"
|
||||
" throw new java.lang.IllegalArgumentException(\n"
|
||||
" \"EnumValueDescriptor is not for this type.\");\n"
|
||||
" }\n",
|
||||
"classname", descriptor_->name());
|
||||
"\n"
|
||||
"public static $classname$ valueOf(\n"
|
||||
" com.google.protobuf.Descriptors.EnumValueDescriptor desc) {\n"
|
||||
" if (desc.getType() != getDescriptor()) {\n"
|
||||
" throw new java.lang.IllegalArgumentException(\n"
|
||||
" \"EnumValueDescriptor is not for this type.\");\n"
|
||||
" }\n",
|
||||
"classname", descriptor_->name());
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
printer->Print(
|
||||
" if (desc.getIndex() == -1) {\n"
|
||||
" return UNRECOGNIZED;\n"
|
||||
" }\n");
|
||||
" if (desc.getIndex() == -1) {\n"
|
||||
" return UNRECOGNIZED;\n"
|
||||
" }\n");
|
||||
}
|
||||
printer->Print(
|
||||
" return VALUES[desc.getIndex()];\n"
|
||||
"}\n"
|
||||
"\n");
|
||||
" return VALUES[desc.getIndex()];\n"
|
||||
"}\n"
|
||||
"\n");
|
||||
|
||||
if (!ordinal_is_index) {
|
||||
printer->Print("private final int index;\n");
|
||||
@@ -310,30 +347,27 @@ void EnumGenerator::Generate(io::Printer* printer) {
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
|
||||
printer->Print(
|
||||
"private final int value;\n\n");
|
||||
printer->Print("private final int value;\n\n");
|
||||
|
||||
if (ordinal_is_index) {
|
||||
printer->Print(
|
||||
"private $classname$(int value) {\n",
|
||||
"classname", descriptor_->name());
|
||||
printer->Print("private $classname$(int value) {\n", "classname",
|
||||
descriptor_->name());
|
||||
} else {
|
||||
printer->Print(
|
||||
"private $classname$(int index, int value) {\n",
|
||||
"classname", descriptor_->name());
|
||||
printer->Print("private $classname$(int index, int value) {\n", "classname",
|
||||
descriptor_->name());
|
||||
}
|
||||
if (HasDescriptorMethods(descriptor_, context_->EnforceLite()) &&
|
||||
!ordinal_is_index) {
|
||||
printer->Print(" this.index = index;\n");
|
||||
}
|
||||
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");
|
||||
|
||||
Reference in new issue
Block a user