Upgrade linux protobuf
This commit is contained in:
1 parent
79f2f356d5
commit
0f3130fb47
689 files changed
+141922
-132057
No files matched your search
@@ -33,8 +33,9 @@
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_names.h>
|
||||
#include <google/protobuf/compiler/code_generator.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
|
||||
namespace google {
|
||||
@@ -52,8 +53,8 @@ const char* kOuterClassNameSuffix = "OuterClass";
|
||||
// Full name : foo.Bar.Baz
|
||||
// Package name: foo
|
||||
// After strip : Bar.Baz
|
||||
string StripPackageName(const string& full_name,
|
||||
const FileDescriptor* file) {
|
||||
std::string StripPackageName(const std::string& full_name,
|
||||
const FileDescriptor* file) {
|
||||
if (file->package().empty()) {
|
||||
return full_name;
|
||||
} else {
|
||||
@@ -63,46 +64,72 @@ string StripPackageName(const string& full_name,
|
||||
}
|
||||
|
||||
// Get the name of a message's Java class without package name prefix.
|
||||
string ClassNameWithoutPackage(const Descriptor* descriptor,
|
||||
bool immutable) {
|
||||
return StripPackageName(descriptor->full_name(),
|
||||
descriptor->file());
|
||||
std::string ClassNameWithoutPackage(const Descriptor* descriptor,
|
||||
bool immutable) {
|
||||
return StripPackageName(descriptor->full_name(), descriptor->file());
|
||||
}
|
||||
|
||||
std::string ClassNameWithoutPackageKotlin(const Descriptor* descriptor) {
|
||||
std::string result = descriptor->name();
|
||||
const Descriptor* temp = descriptor->containing_type();
|
||||
|
||||
while (temp) {
|
||||
result = temp->name() + "Kt." + result;
|
||||
temp = temp->containing_type();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
// Get the name of an enum's Java class without package name prefix.
|
||||
string ClassNameWithoutPackage(const EnumDescriptor* descriptor,
|
||||
bool immutable) {
|
||||
std::string ClassNameWithoutPackage(const EnumDescriptor* descriptor,
|
||||
bool immutable) {
|
||||
// Doesn't append "Mutable" for enum type's name.
|
||||
const Descriptor* message_descriptor = descriptor->containing_type();
|
||||
if (message_descriptor == NULL) {
|
||||
return descriptor->name();
|
||||
} else {
|
||||
return ClassNameWithoutPackage(message_descriptor, immutable) +
|
||||
"." + descriptor->name();
|
||||
return ClassNameWithoutPackage(message_descriptor, immutable) + "." +
|
||||
descriptor->name();
|
||||
}
|
||||
}
|
||||
|
||||
// Get the name of a service's Java class without package name prefix.
|
||||
string ClassNameWithoutPackage(const ServiceDescriptor* descriptor,
|
||||
bool immutable) {
|
||||
string full_name = StripPackageName(descriptor->full_name(),
|
||||
descriptor->file());
|
||||
std::string ClassNameWithoutPackage(const ServiceDescriptor* descriptor,
|
||||
bool immutable) {
|
||||
std::string full_name =
|
||||
StripPackageName(descriptor->full_name(), descriptor->file());
|
||||
// We don't allow nested service definitions.
|
||||
GOOGLE_CHECK(full_name.find('.') == string::npos);
|
||||
GOOGLE_CHECK(full_name.find('.') == std::string::npos);
|
||||
return full_name;
|
||||
}
|
||||
|
||||
// Return true if a and b are equals (case insensitive).
|
||||
NameEquality CheckNameEquality(const std::string& a, const std::string& b) {
|
||||
if (ToUpper(a) == ToUpper(b)) {
|
||||
if (a == b) {
|
||||
return NameEquality::EXACT_EQUAL;
|
||||
}
|
||||
return NameEquality::EQUAL_IGNORE_CASE;
|
||||
}
|
||||
return NameEquality::NO_MATCH;
|
||||
}
|
||||
|
||||
// Check whether a given message or its nested types has the given class name.
|
||||
bool MessageHasConflictingClassName(const Descriptor* message,
|
||||
const string& classname) {
|
||||
if (message->name() == classname) return true;
|
||||
const std::string& classname,
|
||||
NameEquality equality_mode) {
|
||||
if (CheckNameEquality(message->name(), classname) == equality_mode) {
|
||||
return true;
|
||||
}
|
||||
for (int i = 0; i < message->nested_type_count(); ++i) {
|
||||
if (MessageHasConflictingClassName(message->nested_type(i), classname)) {
|
||||
if (MessageHasConflictingClassName(message->nested_type(i), classname,
|
||||
equality_mode)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < message->enum_type_count(); ++i) {
|
||||
if (message->enum_type(i)->name() == classname) {
|
||||
if (CheckNameEquality(message->enum_type(i)->name(), classname) ==
|
||||
equality_mode) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -111,17 +138,15 @@ bool MessageHasConflictingClassName(const Descriptor* message,
|
||||
|
||||
} // namespace
|
||||
|
||||
ClassNameResolver::ClassNameResolver() {
|
||||
}
|
||||
ClassNameResolver::ClassNameResolver() {}
|
||||
|
||||
ClassNameResolver::~ClassNameResolver() {
|
||||
}
|
||||
ClassNameResolver::~ClassNameResolver() {}
|
||||
|
||||
string ClassNameResolver::GetFileDefaultImmutableClassName(
|
||||
std::string ClassNameResolver::GetFileDefaultImmutableClassName(
|
||||
const FileDescriptor* file) {
|
||||
string basename;
|
||||
string::size_type last_slash = file->name().find_last_of('/');
|
||||
if (last_slash == string::npos) {
|
||||
std::string basename;
|
||||
std::string::size_type last_slash = file->name().find_last_of('/');
|
||||
if (last_slash == std::string::npos) {
|
||||
basename = file->name();
|
||||
} else {
|
||||
basename = file->name().substr(last_slash + 1);
|
||||
@@ -129,15 +154,16 @@ string ClassNameResolver::GetFileDefaultImmutableClassName(
|
||||
return UnderscoresToCamelCase(StripProto(basename), true);
|
||||
}
|
||||
|
||||
string ClassNameResolver::GetFileImmutableClassName(
|
||||
std::string ClassNameResolver::GetFileImmutableClassName(
|
||||
const FileDescriptor* file) {
|
||||
string& class_name = file_immutable_outer_class_names_[file];
|
||||
std::string& class_name = file_immutable_outer_class_names_[file];
|
||||
if (class_name.empty()) {
|
||||
if (file->options().has_java_outer_classname()) {
|
||||
class_name = file->options().java_outer_classname();
|
||||
} else {
|
||||
class_name = GetFileDefaultImmutableClassName(file);
|
||||
if (HasConflictingClassName(file, class_name)) {
|
||||
if (HasConflictingClassName(file, class_name,
|
||||
NameEquality::EXACT_EQUAL)) {
|
||||
class_name += kOuterClassNameSuffix;
|
||||
}
|
||||
}
|
||||
@@ -145,9 +171,16 @@ string ClassNameResolver::GetFileImmutableClassName(
|
||||
return class_name;
|
||||
}
|
||||
|
||||
string ClassNameResolver::GetFileClassName(const FileDescriptor* file,
|
||||
bool immutable) {
|
||||
if (immutable) {
|
||||
std::string ClassNameResolver::GetFileClassName(const FileDescriptor* file,
|
||||
bool immutable) {
|
||||
return GetFileClassName(file, immutable, false);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetFileClassName(const FileDescriptor* file,
|
||||
bool immutable, bool kotlin) {
|
||||
if (kotlin) {
|
||||
return GetFileImmutableClassName(file) + "Kt";
|
||||
} else if (immutable) {
|
||||
return GetFileImmutableClassName(file);
|
||||
} else {
|
||||
return "Mutable" + GetFileImmutableClassName(file);
|
||||
@@ -156,117 +189,190 @@ string ClassNameResolver::GetFileClassName(const FileDescriptor* file,
|
||||
|
||||
// Check whether there is any type defined in the proto file that has
|
||||
// the given class name.
|
||||
bool ClassNameResolver::HasConflictingClassName(
|
||||
const FileDescriptor* file, const string& classname) {
|
||||
bool ClassNameResolver::HasConflictingClassName(const FileDescriptor* file,
|
||||
const std::string& classname,
|
||||
NameEquality equality_mode) {
|
||||
for (int i = 0; i < file->enum_type_count(); i++) {
|
||||
if (file->enum_type(i)->name() == classname) {
|
||||
if (CheckNameEquality(file->enum_type(i)->name(), classname) ==
|
||||
equality_mode) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < file->service_count(); i++) {
|
||||
if (file->service(i)->name() == classname) {
|
||||
if (CheckNameEquality(file->service(i)->name(), classname) ==
|
||||
equality_mode) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < file->message_type_count(); i++) {
|
||||
if (MessageHasConflictingClassName(file->message_type(i), classname)) {
|
||||
if (MessageHasConflictingClassName(file->message_type(i), classname,
|
||||
equality_mode)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
string ClassNameResolver::GetDescriptorClassName(
|
||||
std::string ClassNameResolver::GetDescriptorClassName(
|
||||
const FileDescriptor* descriptor) {
|
||||
return GetFileImmutableClassName(descriptor);
|
||||
}
|
||||
|
||||
string ClassNameResolver::GetClassName(const FileDescriptor* descriptor,
|
||||
bool immutable) {
|
||||
string result = FileJavaPackage(descriptor, immutable);
|
||||
std::string ClassNameResolver::GetClassName(const FileDescriptor* descriptor,
|
||||
bool immutable) {
|
||||
return GetClassName(descriptor, immutable, false);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetClassName(const FileDescriptor* descriptor,
|
||||
bool immutable, bool kotlin) {
|
||||
std::string result = FileJavaPackage(descriptor, immutable);
|
||||
if (!result.empty()) result += '.';
|
||||
result += GetFileClassName(descriptor, immutable);
|
||||
result += GetFileClassName(descriptor, immutable, kotlin);
|
||||
return result;
|
||||
}
|
||||
|
||||
// Get the full name of a Java class by prepending the Java package name
|
||||
// or outer class name.
|
||||
string ClassNameResolver::GetClassFullName(const string& name_without_package,
|
||||
const FileDescriptor* file,
|
||||
bool immutable,
|
||||
bool multiple_files) {
|
||||
string result;
|
||||
if (multiple_files) {
|
||||
std::string ClassNameResolver::GetClassFullName(
|
||||
const std::string& name_without_package, const FileDescriptor* file,
|
||||
bool immutable, bool is_own_file) {
|
||||
return GetClassFullName(name_without_package, file, immutable, is_own_file,
|
||||
false);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetClassFullName(
|
||||
const std::string& name_without_package, const FileDescriptor* file,
|
||||
bool immutable, bool is_own_file, bool kotlin) {
|
||||
std::string result;
|
||||
if (is_own_file) {
|
||||
result = FileJavaPackage(file, immutable);
|
||||
} else {
|
||||
result = GetClassName(file, immutable);
|
||||
result = GetClassName(file, immutable, kotlin);
|
||||
}
|
||||
if (!result.empty()) {
|
||||
result += '.';
|
||||
}
|
||||
result += name_without_package;
|
||||
if (kotlin) result += "Kt";
|
||||
return result;
|
||||
}
|
||||
|
||||
string ClassNameResolver::GetClassName(const Descriptor* descriptor,
|
||||
bool immutable) {
|
||||
return GetClassFullName(ClassNameWithoutPackage(descriptor, immutable),
|
||||
descriptor->file(), immutable,
|
||||
MultipleJavaFiles(descriptor->file(), immutable));
|
||||
std::string ClassNameResolver::GetClassName(const Descriptor* descriptor,
|
||||
bool immutable) {
|
||||
return GetClassName(descriptor, immutable, false);
|
||||
}
|
||||
|
||||
string ClassNameResolver::GetClassName(const EnumDescriptor* descriptor,
|
||||
bool immutable) {
|
||||
return GetClassFullName(ClassNameWithoutPackage(descriptor, immutable),
|
||||
descriptor->file(), immutable,
|
||||
MultipleJavaFiles(descriptor->file(), immutable));
|
||||
std::string ClassNameResolver::GetClassName(const Descriptor* descriptor,
|
||||
bool immutable, bool kotlin) {
|
||||
return GetClassFullName(
|
||||
ClassNameWithoutPackage(descriptor, immutable), descriptor->file(),
|
||||
immutable, MultipleJavaFiles(descriptor->file(), immutable), kotlin);
|
||||
}
|
||||
|
||||
string ClassNameResolver::GetClassName(const ServiceDescriptor* descriptor,
|
||||
bool immutable) {
|
||||
std::string ClassNameResolver::GetClassName(const EnumDescriptor* descriptor,
|
||||
bool immutable) {
|
||||
return GetClassName(descriptor, immutable, false);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetClassName(const EnumDescriptor* descriptor,
|
||||
bool immutable, bool kotlin) {
|
||||
return GetClassFullName(
|
||||
ClassNameWithoutPackage(descriptor, immutable), descriptor->file(),
|
||||
immutable, MultipleJavaFiles(descriptor->file(), immutable), kotlin);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetClassName(const ServiceDescriptor* descriptor,
|
||||
bool immutable) {
|
||||
return GetClassName(descriptor, immutable, false);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetClassName(const ServiceDescriptor* descriptor,
|
||||
bool immutable, bool kotlin) {
|
||||
return GetClassFullName(ClassNameWithoutPackage(descriptor, immutable),
|
||||
descriptor->file(), immutable,
|
||||
MultipleJavaFiles(descriptor->file(), immutable));
|
||||
IsOwnFile(descriptor, immutable), kotlin);
|
||||
}
|
||||
|
||||
// Get the Java Class style full name of a message.
|
||||
string ClassNameResolver::GetJavaClassFullName(
|
||||
const string& name_without_package,
|
||||
const FileDescriptor* file,
|
||||
std::string ClassNameResolver::GetJavaClassFullName(
|
||||
const std::string& name_without_package, const FileDescriptor* file,
|
||||
bool immutable) {
|
||||
string result;
|
||||
return GetJavaClassFullName(name_without_package, file, immutable, false);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetJavaClassFullName(
|
||||
const std::string& name_without_package, const FileDescriptor* file,
|
||||
bool immutable, bool kotlin) {
|
||||
std::string result;
|
||||
if (MultipleJavaFiles(file, immutable)) {
|
||||
result = FileJavaPackage(file, immutable);
|
||||
if (!result.empty()) result += '.';
|
||||
} else {
|
||||
result = GetClassName(file, immutable);
|
||||
result = GetClassName(file, immutable, kotlin);
|
||||
if (!result.empty()) result += '$';
|
||||
}
|
||||
result += StringReplace(name_without_package, ".", "$", true);
|
||||
return result;
|
||||
}
|
||||
|
||||
string ClassNameResolver::GetExtensionIdentifierName(
|
||||
std::string ClassNameResolver::GetExtensionIdentifierName(
|
||||
const FieldDescriptor* descriptor, bool immutable) {
|
||||
return GetClassName(descriptor->containing_type(), immutable) + "." +
|
||||
return GetExtensionIdentifierName(descriptor, immutable, false);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetExtensionIdentifierName(
|
||||
const FieldDescriptor* descriptor, bool immutable, bool kotlin) {
|
||||
return GetClassName(descriptor->containing_type(), immutable, kotlin) + "." +
|
||||
descriptor->name();
|
||||
}
|
||||
|
||||
|
||||
string ClassNameResolver::GetJavaImmutableClassName(
|
||||
std::string ClassNameResolver::GetKotlinFactoryName(
|
||||
const Descriptor* descriptor) {
|
||||
return GetJavaClassFullName(
|
||||
ClassNameWithoutPackage(descriptor, true),
|
||||
descriptor->file(), true);
|
||||
std::string name = ToCamelCase(descriptor->name(), /* lower_first = */ true);
|
||||
return IsForbiddenKotlin(name) ? name + "_" : name;
|
||||
}
|
||||
|
||||
string ClassNameResolver::GetJavaImmutableClassName(
|
||||
std::string ClassNameResolver::GetJavaImmutableClassName(
|
||||
const Descriptor* descriptor) {
|
||||
return GetJavaClassFullName(ClassNameWithoutPackage(descriptor, true),
|
||||
descriptor->file(), true);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetJavaImmutableClassName(
|
||||
const EnumDescriptor* descriptor) {
|
||||
return GetJavaClassFullName(
|
||||
ClassNameWithoutPackage(descriptor, true),
|
||||
descriptor->file(), true);
|
||||
return GetJavaClassFullName(ClassNameWithoutPackage(descriptor, true),
|
||||
descriptor->file(), true);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetKotlinExtensionsClassName(
|
||||
const Descriptor* descriptor) {
|
||||
return GetClassFullName(ClassNameWithoutPackageKotlin(descriptor),
|
||||
descriptor->file(), true, true, true);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetJavaMutableClassName(
|
||||
const Descriptor* descriptor) {
|
||||
return GetJavaClassFullName(ClassNameWithoutPackage(descriptor, false),
|
||||
descriptor->file(), false);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetJavaMutableClassName(
|
||||
const EnumDescriptor* descriptor) {
|
||||
return GetJavaClassFullName(ClassNameWithoutPackage(descriptor, false),
|
||||
descriptor->file(), false);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetDowngradedFileClassName(
|
||||
const FileDescriptor* file) {
|
||||
return "Downgraded" + GetFileClassName(file, false);
|
||||
}
|
||||
|
||||
std::string ClassNameResolver::GetDowngradedClassName(
|
||||
const Descriptor* descriptor) {
|
||||
return FileJavaPackage(descriptor->file()) + "." +
|
||||
GetDowngradedFileClassName(descriptor->file()) + "." +
|
||||
ClassNameWithoutPackage(descriptor, false);
|
||||
}
|
||||
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
|
||||
Reference in new issue
Block a user