AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Attempt to fix AppVeyor build by exporting GetEnumValueName

Browse Source
This commit is contained in:
Jon Skeet 2016-04-12 09:32:08 +01:00
parent 790f4c8e37
commit d90d615f71
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/google/protobuf/compiler/csharp/csharp_helpers.cc
View File

@ -260,6 +260,11 @@ std::string TryRemovePrefix(const std::string& prefix, const std::string& value)
return value.substr(value_index); return value.substr(value_index);
} }
// Format the enum value name in a pleasant way for C#:
// - Strip the enum name as a prefix if possible
// - Convert to PascalCase.
// For example, an enum called Color with a value of COLOR_BLUE should
// result in an enum value in C# called just Blue
std::string GetEnumValueName(const std::string& enum_name, const std::string& enum_value_name) { std::string GetEnumValueName(const std::string& enum_name, const std::string& enum_value_name) {
std::string stripped = TryRemovePrefix(enum_name, enum_value_name); std::string stripped = TryRemovePrefix(enum_name, enum_value_name);
std::string result = ShoutyToPascalCase(stripped); std::string result = ShoutyToPascalCase(stripped);

5
src/google/protobuf/compiler/csharp/csharp_helpers.h
View File

@ -36,6 +36,7 @@
#define GOOGLE_PROTOBUF_COMPILER_CSHARP_HELPERS_H__ #define GOOGLE_PROTOBUF_COMPILER_CSHARP_HELPERS_H__
#include <string> #include <string>
#include <google/protobuf/stubs/port.h>
#include <google/protobuf/descriptor.pb.h> #include <google/protobuf/descriptor.pb.h>
#include <google/protobuf/descriptor.h> #include <google/protobuf/descriptor.h>
#include <google/protobuf/compiler/code_generator.h> #include <google/protobuf/compiler/code_generator.h>
@ -93,7 +94,9 @@ inline std::string UnderscoresToCamelCase(const std::string& input, bool cap_nex
std::string UnderscoresToPascalCase(const std::string& input); std::string UnderscoresToPascalCase(const std::string& input);
std::string GetEnumValueName(const std::string& enum_name, const std::string& enum_value_name); // Note that we wouldn't normally want to export this (we're not expecting
// it to be used outside libprotoc itself) but this exposes it for testing.
std::string LIBPROTOBUF_EXPORT GetEnumValueName(const std::string& enum_name, const std::string& enum_value_name);
// TODO(jtattermusch): perhaps we could move this to strutil // TODO(jtattermusch): perhaps we could move this to strutil
std::string StringToBase64(const std::string& input); std::string StringToBase64(const std::string& input);