diff options
author | Krishna <krishna.nm86@gmail.com> | 2014-12-11 07:45:32 +0100 |
---|---|---|
committer | Krishna <krishna.nm86@gmail.com> | 2014-12-11 07:45:32 +0100 |
commit | 060a2096a3f3d7c66a64a1a41a1d2e1e18aea82d (patch) | |
tree | 8a4536427113ce6127313c687bf69b64e332abcb | |
parent | 7654f78029030238c6dff3826671393f4e6db359 (diff) | |
download | protobuf-060a2096a3f3d7c66a64a1a41a1d2e1e18aea82d.tar.gz protobuf-060a2096a3f3d7c66a64a1a41a1d2e1e18aea82d.tar.bz2 protobuf-060a2096a3f3d7c66a64a1a41a1d2e1e18aea82d.zip |
Reverted changes to cpp_helpers.cc and made code reviews to python_geenerator.cc
-rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_helpers.cc | 24 | ||||
-rw-r--r-- | src/google/protobuf/compiler/python/python_generator.cc | 16 | ||||
-rw-r--r-- | src/google/protobuf/compiler/python/python_generator.h | 2 |
3 files changed, 20 insertions, 22 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_helpers.cc b/src/google/protobuf/compiler/cpp/cpp_helpers.cc index cd8364f5..f8ed7b1c 100644 --- a/src/google/protobuf/compiler/cpp/cpp_helpers.cc +++ b/src/google/protobuf/compiler/cpp/cpp_helpers.cc @@ -360,31 +360,21 @@ string FilenameIdentifier(const string& filename) { return result; } - -string GlobalSymbolName(const string& filename, string prefix) -{ - return prefix + FilenameIdentifier(filename); -} - // Return the name of the AddDescriptors() function for a given file. -string GlobalAddDescriptorsName(const string& filename) -{ - return GlobalSymbolName(filename,"protobuf_AddDesc_"); +string GlobalAddDescriptorsName(const string& filename) { + return "protobuf_AddDesc_" + FilenameIdentifier(filename); } // Return the name of the AssignDescriptors() function for a given file. -string GlobalAssignDescriptorsName(const string& filename) -{ - return GlobalSymbolName(filename,"protobuf_AssignDesc_"); +string GlobalAssignDescriptorsName(const string& filename) { + return "protobuf_AssignDesc_" + FilenameIdentifier(filename); } // Return the name of the ShutdownFile() function for a given file. -string GlobalShutdownFileName(const string& filename) -{ - return GlobalSymbolName(filename,"protobuf_ShutdownFile_"); +string GlobalShutdownFileName(const string& filename) { + return "protobuf_ShutdownFile_" + FilenameIdentifier(filename); } - // Return the qualified C++ name for a file level symbol. string QualifiedFileLevelSymbol(const string& package, const string& name) { if (package.empty()) { @@ -521,4 +511,4 @@ bool IsStringOrMessage(const FieldDescriptor* field) { } // namespace cpp } // namespace compiler } // namespace protobuf -} // namespace google +} // namespace google
\ No newline at end of file diff --git a/src/google/protobuf/compiler/python/python_generator.cc b/src/google/protobuf/compiler/python/python_generator.cc index e4b73f94..fca94a31 100644 --- a/src/google/protobuf/compiler/python/python_generator.cc +++ b/src/google/protobuf/compiler/python/python_generator.cc @@ -581,8 +581,7 @@ void Generator::PrintServiceDescriptor( } -void Generator::PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descriptor, const char* keyandmodule) const { - printer_->Print(keyandmodule,"class_name", descriptor.name()); +void Generator::PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descriptor) const { printer_->Indent(); printer_->Print( "$descriptor_key$ = $descriptor_name$,\n", @@ -596,11 +595,20 @@ void Generator::PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descrip } void Generator::PrintServiceClass(const ServiceDescriptor& descriptor) const { - Generator::PrintDescriptorKeyAndModuleName(descriptor, "$class_name$_Stub = service_reflection.GeneratedServiceStubType('$class_name$_Stub', ($class_name$,), dict(\n"); + // Print the service. + printer_->Print("$class_name$ = service_reflection.GeneratedServiceType(" + "'$class_name$', (_service.Service,), dict(\n", + "class_name", descriptor.name()); + Generator::PrintDescriptorKeyAndModuleName(descriptor); } void Generator::PrintServiceStub(const ServiceDescriptor& descriptor) const { - Generator::PrintDescriptorKeyAndModuleName(descriptor, "$class_name$ = service_reflection.GeneratedServiceType('$class_name$', (_service.Service,), dict(\n"); + // Print the service stub. + printer_->Print("$class_name$_Stub = " + "service_reflection.GeneratedServiceStubType(" + "'$class_name$_Stub', ($class_name$,), dict(\n", + "class_name", descriptor.name()); + Generator::PrintDescriptorKeyAndModuleName(descriptor); } // Prints statement assigning ModuleLevelDescriptorName(message_descriptor) diff --git a/src/google/protobuf/compiler/python/python_generator.h b/src/google/protobuf/compiler/python/python_generator.h index 6b8b76f3..ee68ad72 100644 --- a/src/google/protobuf/compiler/python/python_generator.h +++ b/src/google/protobuf/compiler/python/python_generator.h @@ -127,7 +127,7 @@ class LIBPROTOC_EXPORT Generator : public CodeGenerator { void PrintServiceDescriptor(const ServiceDescriptor& descriptor) const; void PrintServiceClass(const ServiceDescriptor& descriptor) const; void PrintServiceStub(const ServiceDescriptor& descriptor) const; - void PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descriptor, const char* keyandmodule) const ; + void PrintDescriptorKeyAndModuleName(const ServiceDescriptor& descriptor) const ; void PrintEnumValueDescriptor(const EnumValueDescriptor& descriptor) const; string OptionsValue(const string& class_name, |