Skip to content

P
protobuf
Commit a425dd97 authored by Bo Yang's avatar Bo Yang
Browse files
Options

Rename ClassNamePrefix to ConstantNamePrefix

parent f46a01d0
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
src/google/protobuf/compiler/php/php_generator.cc
View file @ a425dd97
......@@ -166,8 +166,7 @@ std::string ClassNamePrefix(const string& classname,
return "";
}
std::string ClassNamePrefix(const string& classname,
const EnumValueDescriptor* desc) {
std::string ConstantNamePrefix(const string& classname) {
bool is_reserved = false;
string lower = classname;
......@@ -729,7 +728,7 @@ void GenerateEnumToPool(const EnumDescriptor* en, io::Printer* printer) {
const EnumValueDescriptor* value = en->value(i);
printer->Print(
"->value(\"^name^\", ^number^)\n",
"name", ClassNamePrefix(value->name(), value) + value->name(),
"name", ConstantNamePrefix(value->name()) + value->name(),
"number", IntToString(value->number()));
}
printer->Print("->finalizeToPool();\n\n");
......@@ -1032,7 +1031,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", ClassNamePrefix(value->name(), value) + value->name(),
"name", ConstantNamePrefix(value->name()) + value->name(),
"number", IntToString(value->number()));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment