organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Add prefix to enum value with reserved name. (#3020)

Browse source
This commit is contained in:
Paul Yang 2017-04-26 16:32:21 -07:00 • committed by GitHub
parent 3c0855e94a
commit a6189acd18
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
php/tests/proto/test.proto
View file

@ -119,6 +119,7 @@ enum TestEnum {
ZERO = 0;
ONE = 1;
TWO = 2;
ECHO = 3; // Test reserved name.
}
// Test prefix for reserved words.

8
src/google/protobuf/compiler/php/php_generator.cc
View file

@ -49,8 +49,8 @@ const std::string kDescriptorMetadataFile =
"GPBMetadata/Google/Protobuf/Internal/Descriptor.php";
const std::string kDescriptorDirName = "Google/Protobuf/Internal";
const std::string kDescriptorPackageName = "Google\\Protobuf\\Internal";
const char* const kReservedNames[] = {"Empty"};
const int kReservedNamesSize = 1;
const char* const kReservedNames[] = {"Empty", "ECHO"};
const int kReservedNamesSize = 2;
namespace google {
namespace protobuf {
@ -559,7 +559,7 @@ void GenerateEnumToPool(const EnumDescriptor* en, io::Printer* printer) {
const EnumValueDescriptor* value = en->value(i);
printer->Print(
"->value(\"^name^\", ^number^)\n",
"name", value->name(),
"name", ClassNamePrefix(value->name(), en) + value->name(),
"number", IntToString(value->number()));
}
printer->Print("->finalizeToPool();\n\n");
@ -845,7 +845,7 @@ void GenerateEnumFile(const FileDescriptor* file, const EnumDescriptor* en,
const EnumValueDescriptor* value = en->value(i);
GenerateEnumValueDocComment(&printer, value);
printer.Print("const ^name^ = ^number^;\n",
"name", value->name(),
"name", ClassNamePrefix(value->name(), en) + value->name(),
"number", IntToString(value->number()));
}