Upgrade linux protobuf
This commit is contained in:
1 parent
79f2f356d5
commit
0f3130fb47
689 files changed
+141922
-132057
No files matched your search
@@ -34,6 +34,7 @@
|
||||
|
||||
#include <google/protobuf/compiler/java/java_generator.h>
|
||||
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_file.h>
|
||||
@@ -57,15 +58,18 @@ namespace java {
|
||||
JavaGenerator::JavaGenerator() {}
|
||||
JavaGenerator::~JavaGenerator() {}
|
||||
|
||||
uint64_t JavaGenerator::GetSupportedFeatures() const {
|
||||
return CodeGenerator::Feature::FEATURE_PROTO3_OPTIONAL;
|
||||
}
|
||||
|
||||
bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
const string& parameter,
|
||||
const std::string& parameter,
|
||||
GeneratorContext* context,
|
||||
string* error) const {
|
||||
std::string* error) const {
|
||||
// -----------------------------------------------------------------
|
||||
// parse generator options
|
||||
|
||||
|
||||
std::vector<std::pair<string, string> > options;
|
||||
std::vector<std::pair<std::string, std::string> > options;
|
||||
ParseGeneratorParameter(parameter, &options);
|
||||
Options file_options;
|
||||
|
||||
@@ -78,6 +82,10 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
file_options.generate_mutable_code = true;
|
||||
} else if (options[i].first == "shared") {
|
||||
file_options.generate_shared_code = true;
|
||||
} else if (options[i].first == "lite") {
|
||||
// Note: Java Lite does not guarantee API/ABI stability. We may choose to
|
||||
// break existing API in order to boost performance / reduce code size.
|
||||
file_options.enforce_lite = true;
|
||||
} else if (options[i].first == "annotate_code") {
|
||||
file_options.annotate_code = true;
|
||||
} else if (options[i].first == "annotation_list_file") {
|
||||
@@ -104,8 +112,8 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
// -----------------------------------------------------------------
|
||||
|
||||
|
||||
std::vector<string> all_files;
|
||||
std::vector<string> all_annotations;
|
||||
std::vector<std::string> all_files;
|
||||
std::vector<std::string> all_annotations;
|
||||
|
||||
|
||||
std::vector<FileGenerator*> file_generators;
|
||||
@@ -117,6 +125,7 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
file_generators.push_back(new FileGenerator(file, file_options,
|
||||
/* mutable = */ false));
|
||||
}
|
||||
|
||||
for (int i = 0; i < file_generators.size(); ++i) {
|
||||
if (!file_generators[i]->Validate(error)) {
|
||||
for (int j = 0; j < file_generators.size(); ++j) {
|
||||
@@ -129,13 +138,13 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
for (int i = 0; i < file_generators.size(); ++i) {
|
||||
FileGenerator* file_generator = file_generators[i];
|
||||
|
||||
string package_dir = JavaPackageToDir(file_generator->java_package());
|
||||
std::string package_dir = JavaPackageToDir(file_generator->java_package());
|
||||
|
||||
string java_filename = package_dir;
|
||||
std::string java_filename = package_dir;
|
||||
java_filename += file_generator->classname();
|
||||
java_filename += ".java";
|
||||
all_files.push_back(java_filename);
|
||||
string info_full_path = java_filename + ".pb.meta";
|
||||
std::string info_full_path = java_filename + ".pb.meta";
|
||||
if (file_options.annotate_code) {
|
||||
all_annotations.push_back(info_full_path);
|
||||
}
|
||||
@@ -146,9 +155,9 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
GeneratedCodeInfo annotations;
|
||||
io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
|
||||
&annotations);
|
||||
io::Printer printer(output.get(), '$', file_options.annotate_code
|
||||
? &annotation_collector
|
||||
: NULL);
|
||||
io::Printer printer(
|
||||
output.get(), '$',
|
||||
file_options.annotate_code ? &annotation_collector : NULL);
|
||||
|
||||
file_generator->Generate(&printer);
|
||||
|
||||
@@ -163,6 +172,7 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
for (int i = 0; i < file_generators.size(); ++i) {
|
||||
delete file_generators[i];
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user