attempting to upgrade to proto 3.5
This commit is contained in:
1 parent
eb1b42a5e8
commit
cc3510c6c2
368 files changed
+35764
-24867
No files matched your search
@@ -81,10 +81,16 @@ void EnumGenerator::GenerateDefinition(io::Printer* printer) {
|
||||
std::map<string, string> vars;
|
||||
vars["classname"] = classname_;
|
||||
vars["short_name"] = descriptor_->name();
|
||||
vars["enumbase"] = classname_ + (options_.proto_h ? " : int" : "");
|
||||
vars["enumbase"] = options_.proto_h ? " : int" : "";
|
||||
// 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.
|
||||
vars["{"] = "";
|
||||
vars["}"] = "";
|
||||
|
||||
printer->Print(vars, "enum $enumbase$ {\n");
|
||||
printer->Annotate("enumbase", descriptor_);
|
||||
printer->Print(vars, "enum $classname$$enumbase$ {\n");
|
||||
printer->Annotate("classname", descriptor_);
|
||||
printer->Indent();
|
||||
|
||||
const EnumValueDescriptor* min_value = descriptor_->value(0);
|
||||
@@ -102,7 +108,8 @@ void EnumGenerator::GenerateDefinition(io::Printer* printer) {
|
||||
" PROTOBUF_DEPRECATED" : "";
|
||||
|
||||
if (i > 0) printer->Print(",\n");
|
||||
printer->Print(vars, "$prefix$$name$$deprecation$ = $number$");
|
||||
printer->Print(vars, "${$$prefix$$name$$}$$deprecation$ = $number$");
|
||||
printer->Annotate("{", "}", descriptor_->value(i));
|
||||
|
||||
if (descriptor_->value(i)->number() < min_value->number()) {
|
||||
min_value = descriptor_->value(i);
|
||||
@@ -134,14 +141,20 @@ void EnumGenerator::GenerateDefinition(io::Printer* printer) {
|
||||
}
|
||||
|
||||
printer->Print(vars,
|
||||
"$dllexport$bool $classname$_IsValid(int value);\n"
|
||||
"const $classname$ $prefix$$short_name$_MIN = $prefix$$min_name$;\n"
|
||||
"const $classname$ $prefix$$short_name$_MAX = $prefix$$max_name$;\n");
|
||||
"$dllexport$bool $classname$_IsValid(int value);\n"
|
||||
"const $classname$ ${$$prefix$$short_name$_MIN$}$ = "
|
||||
"$prefix$$min_name$;\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
printer->Print(vars,
|
||||
"const $classname$ ${$$prefix$$short_name$_MAX$}$ = "
|
||||
"$prefix$$max_name$;\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
if (generate_array_size_) {
|
||||
printer->Print(vars,
|
||||
"const int $prefix$$short_name$_ARRAYSIZE = "
|
||||
"$prefix$$short_name$_MAX + 1;\n\n");
|
||||
"const int ${$$prefix$$short_name$_ARRAYSIZE$}$ = "
|
||||
"$prefix$$short_name$_MAX + 1;\n\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
if (HasDescriptorMethods(descriptor_->file(), options_)) {
|
||||
@@ -184,6 +197,8 @@ void EnumGenerator::GenerateSymbolImports(io::Printer* printer) {
|
||||
vars["nested_name"] = descriptor_->name();
|
||||
vars["classname"] = classname_;
|
||||
vars["constexpr"] = options_.proto_h ? "constexpr " : "";
|
||||
vars["{"] = "";
|
||||
vars["}"] = "";
|
||||
printer->Print(vars, "typedef $classname$ $nested_name$;\n");
|
||||
|
||||
for (int j = 0; j < descriptor_->value_count(); j++) {
|
||||
@@ -191,22 +206,27 @@ void EnumGenerator::GenerateSymbolImports(io::Printer* printer) {
|
||||
vars["deprecated_attr"] = descriptor_->value(j)->options().deprecated() ?
|
||||
"GOOGLE_PROTOBUF_DEPRECATED_ATTR " : "";
|
||||
printer->Print(vars,
|
||||
"$deprecated_attr$static $constexpr$const $nested_name$ $tag$ =\n"
|
||||
"$deprecated_attr$static $constexpr$const $nested_name$ ${$$tag$$}$ =\n"
|
||||
" $classname$_$tag$;\n");
|
||||
printer->Annotate("{", "}", descriptor_->value(j));
|
||||
}
|
||||
|
||||
printer->Print(vars,
|
||||
"static inline bool $nested_name$_IsValid(int value) {\n"
|
||||
" return $classname$_IsValid(value);\n"
|
||||
"}\n"
|
||||
"static const $nested_name$ $nested_name$_MIN =\n"
|
||||
" $classname$_$nested_name$_MIN;\n"
|
||||
"static const $nested_name$ $nested_name$_MAX =\n"
|
||||
"static const $nested_name$ ${$$nested_name$_MIN$}$ =\n"
|
||||
" $classname$_$nested_name$_MIN;\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
printer->Print(vars,
|
||||
"static const $nested_name$ ${$$nested_name$_MAX$}$ =\n"
|
||||
" $classname$_$nested_name$_MAX;\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (generate_array_size_) {
|
||||
printer->Print(vars,
|
||||
"static const int $nested_name$_ARRAYSIZE =\n"
|
||||
"static const int ${$$nested_name$_ARRAYSIZE$}$ =\n"
|
||||
" $classname$_$nested_name$_ARRAYSIZE;\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
if (HasDescriptorMethods(descriptor_->file(), options_)) {
|
||||
@@ -229,27 +249,10 @@ void EnumGenerator::GenerateSymbolImports(io::Printer* printer) {
|
||||
}
|
||||
}
|
||||
|
||||
void EnumGenerator::GenerateDescriptorInitializer(io::Printer* printer) {
|
||||
std::map<string, string> vars;
|
||||
vars["index"] = SimpleItoa(descriptor_->index());
|
||||
vars["index_in_metadata"] = SimpleItoa(index_in_metadata_);
|
||||
|
||||
if (descriptor_->containing_type() == NULL) {
|
||||
printer->Print(vars,
|
||||
"file_level_enum_descriptors[$index_in_metadata$] = "
|
||||
"file->enum_type($index$);\n");
|
||||
} else {
|
||||
vars["parent"] = ClassName(descriptor_->containing_type(), false);
|
||||
printer->Print(vars,
|
||||
"file_level_enum_descriptors[$index_in_metadata$] = "
|
||||
"$parent$_descriptor->enum_type($index$);\n");
|
||||
}
|
||||
}
|
||||
|
||||
void EnumGenerator::GenerateMethods(io::Printer* printer) {
|
||||
void EnumGenerator::GenerateMethods(int idx, io::Printer* printer) {
|
||||
std::map<string, string> vars;
|
||||
vars["classname"] = classname_;
|
||||
vars["index_in_metadata"] = SimpleItoa(index_in_metadata_);
|
||||
vars["index_in_metadata"] = SimpleItoa(idx);
|
||||
vars["constexpr"] = options_.proto_h ? "constexpr " : "";
|
||||
vars["file_namespace"] = FileLevelNamespace(descriptor_->file()->name());
|
||||
|
||||
|
||||
Reference in new issue
Block a user