Upgrade linux protobuf
This commit is contained in:
1 parent
79f2f356d5
commit
0f3130fb47
689 files changed
+141922
-132057
No files matched your search
@@ -48,11 +48,10 @@ namespace java {
|
||||
|
||||
ImmutableExtensionGenerator::ImmutableExtensionGenerator(
|
||||
const FieldDescriptor* descriptor, Context* context)
|
||||
: descriptor_(descriptor), context_(context),
|
||||
name_resolver_(context->GetNameResolver()) {
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
if (descriptor_->extension_scope() != NULL) {
|
||||
scope_ = name_resolver_->GetImmutableClassName(
|
||||
descriptor_->extension_scope());
|
||||
scope_ =
|
||||
name_resolver_->GetImmutableClassName(descriptor_->extension_scope());
|
||||
} else {
|
||||
scope_ = name_resolver_->GetImmutableClassName(descriptor_->file());
|
||||
}
|
||||
@@ -62,34 +61,36 @@ ImmutableExtensionGenerator::~ImmutableExtensionGenerator() {}
|
||||
|
||||
// Initializes the vars referenced in the generated code templates.
|
||||
void ExtensionGenerator::InitTemplateVars(
|
||||
const FieldDescriptor* descriptor, const string& scope, bool immutable,
|
||||
ClassNameResolver* name_resolver, std::map<string, string>* vars_pointer) {
|
||||
std::map<string, string> &vars = *vars_pointer;
|
||||
const FieldDescriptor* descriptor, const std::string& scope, bool immutable,
|
||||
ClassNameResolver* name_resolver,
|
||||
std::map<std::string, std::string>* vars_pointer) {
|
||||
std::map<std::string, std::string>& vars = *vars_pointer;
|
||||
vars["scope"] = scope;
|
||||
vars["name"] = UnderscoresToCamelCase(descriptor);
|
||||
vars["name"] = UnderscoresToCamelCaseCheckReserved(descriptor);
|
||||
vars["containing_type"] =
|
||||
name_resolver->GetClassName(descriptor->containing_type(), immutable);
|
||||
vars["number"] = SimpleItoa(descriptor->number());
|
||||
vars["number"] = StrCat(descriptor->number());
|
||||
vars["constant_name"] = FieldConstantName(descriptor);
|
||||
vars["index"] = SimpleItoa(descriptor->index());
|
||||
vars["default"] = descriptor->is_repeated() ?
|
||||
"" : DefaultValue(descriptor, immutable, name_resolver);
|
||||
vars["index"] = StrCat(descriptor->index());
|
||||
vars["default"] = descriptor->is_repeated()
|
||||
? ""
|
||||
: DefaultValue(descriptor, immutable, name_resolver);
|
||||
vars["type_constant"] = FieldTypeName(GetType(descriptor));
|
||||
vars["packed"] = descriptor->is_packed() ? "true" : "false";
|
||||
vars["enum_map"] = "null";
|
||||
vars["prototype"] = "null";
|
||||
|
||||
JavaType java_type = GetJavaType(descriptor);
|
||||
string singular_type;
|
||||
std::string singular_type;
|
||||
switch (java_type) {
|
||||
case JAVATYPE_MESSAGE:
|
||||
singular_type = name_resolver->GetClassName(descriptor->message_type(),
|
||||
immutable);
|
||||
singular_type =
|
||||
name_resolver->GetClassName(descriptor->message_type(), immutable);
|
||||
vars["prototype"] = singular_type + ".getDefaultInstance()";
|
||||
break;
|
||||
case JAVATYPE_ENUM:
|
||||
singular_type = name_resolver->GetClassName(descriptor->enum_type(),
|
||||
immutable);
|
||||
singular_type =
|
||||
name_resolver->GetClassName(descriptor->enum_type(), immutable);
|
||||
vars["enum_map"] = singular_type + ".internalGetValueMap()";
|
||||
break;
|
||||
case JAVATYPE_STRING:
|
||||
@@ -102,18 +103,18 @@ void ExtensionGenerator::InitTemplateVars(
|
||||
singular_type = BoxedPrimitiveTypeName(java_type);
|
||||
break;
|
||||
}
|
||||
vars["type"] = descriptor->is_repeated() ?
|
||||
"java.util.List<" + singular_type + ">" : singular_type;
|
||||
vars["type"] = descriptor->is_repeated()
|
||||
? "java.util.List<" + singular_type + ">"
|
||||
: singular_type;
|
||||
vars["singular_type"] = singular_type;
|
||||
}
|
||||
|
||||
void ImmutableExtensionGenerator::Generate(io::Printer* printer) {
|
||||
std::map<string, string> vars;
|
||||
std::map<std::string, std::string> vars;
|
||||
const bool kUseImmutableNames = true;
|
||||
InitTemplateVars(descriptor_, scope_, kUseImmutableNames, name_resolver_,
|
||||
&vars);
|
||||
printer->Print(vars,
|
||||
"public static final int $constant_name$ = $number$;\n");
|
||||
printer->Print(vars, "public static final int $constant_name$ = $number$;\n");
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
if (descriptor_->extension_scope() == NULL) {
|
||||
@@ -151,8 +152,8 @@ int ImmutableExtensionGenerator::GenerateNonNestedInitializationCode(
|
||||
// Only applies to non-nested extensions.
|
||||
printer->Print(
|
||||
"$name$.internalInit(descriptor.getExtensions().get($index$));\n",
|
||||
"name", UnderscoresToCamelCase(descriptor_),
|
||||
"index", SimpleItoa(descriptor_->index()));
|
||||
"name", UnderscoresToCamelCaseCheckReserved(descriptor_), "index",
|
||||
StrCat(descriptor_->index()));
|
||||
bytecode_estimate += 21;
|
||||
}
|
||||
return bytecode_estimate;
|
||||
@@ -160,10 +161,8 @@ int ImmutableExtensionGenerator::GenerateNonNestedInitializationCode(
|
||||
|
||||
int ImmutableExtensionGenerator::GenerateRegistrationCode(
|
||||
io::Printer* printer) {
|
||||
printer->Print(
|
||||
"registry.add($scope$.$name$);\n",
|
||||
"scope", scope_,
|
||||
"name", UnderscoresToCamelCase(descriptor_));
|
||||
printer->Print("registry.add($scope$.$name$);\n", "scope", scope_, "name",
|
||||
UnderscoresToCamelCaseCheckReserved(descriptor_));
|
||||
return 7;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user