diff options
author | Paul Yang <TeBoring@users.noreply.github.com> | 2017-04-20 16:55:56 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-20 16:55:56 -0700 |
commit | 4523c9c233dbb61d03996a5bbe25d1b5aea51f7f (patch) | |
tree | bebedd58dac1966bc462c00dfc39b1fea5deb6c6 /src | |
parent | 4c57e8475f78ccac80407f03c2d23d30014785f9 (diff) | |
download | protobuf-4523c9c233dbb61d03996a5bbe25d1b5aea51f7f.tar.gz protobuf-4523c9c233dbb61d03996a5bbe25d1b5aea51f7f.tar.bz2 protobuf-4523c9c233dbb61d03996a5bbe25d1b5aea51f7f.zip |
Allow proto files to import descriptor.proto (#2995)
descriptor.proto uses proto2 syntax, which is not ready for external
usage. However, some proto3 files import descriptor.proto and cannot be
used. In this PR, all references (We cheated by only removing
extensions, which is enough for now. User should avoid using messages
defined in descriptor.proto as field type.) to content in
descriptor.proto are removed from generated files. Those that import
descriptor.proto can be used like other proto files.
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/compiler/php/php_generator.cc | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/php/php_generator.cc b/src/google/protobuf/compiler/php/php_generator.cc index d24e1e5e..4d475b1f 100644 --- a/src/google/protobuf/compiler/php/php_generator.cc +++ b/src/google/protobuf/compiler/php/php_generator.cc @@ -674,6 +674,12 @@ void GenerateAddFileToPool(const FileDescriptor* file, bool is_descriptor, } else { for (int i = 0; i < file->dependency_count(); i++) { const std::string& name = file->dependency(i)->name(); + // Currently, descriptor.proto is not ready for external usage. Skip to + // import it for now, so that its dependencies can still work as long as + // they don't use protos defined in descriptor.proto. + if (name == kDescriptorFile) { + continue; + } std::string dependency_filename = GeneratedMetadataFileName(name, is_descriptor); printer->Print( @@ -685,6 +691,26 @@ void GenerateAddFileToPool(const FileDescriptor* file, bool is_descriptor, FileDescriptorSet files; FileDescriptorProto* file_proto = files.add_file(); file->CopyTo(file_proto); + + // Filter out descriptor.proto as it cannot be depended on for now. + RepeatedPtrField<string>* dependency = file_proto->mutable_dependency(); + for (RepeatedPtrField<string>::iterator it = dependency->begin(); + it != dependency->end(); ++it) { + if (*it != kDescriptorFile) { + dependency->erase(it); + break; + } + } + + // Filter out all extensions, since we do not support extension yet. + file_proto->clear_extension(); + RepeatedPtrField<DescriptorProto>* message_type = + file_proto->mutable_message_type(); + for (RepeatedPtrField<DescriptorProto>::iterator it = message_type->begin(); + it != message_type->end(); ++it) { + it->clear_extension(); + } + string files_data; files.SerializeToString(&files_data); |