proto36
This commit is contained in:
1 parent
a28e541be0
commit
e2dd18b3fa
421 files changed
+23599
-30913
No files matched your search
@@ -38,9 +38,6 @@
|
||||
#include <google/protobuf/stubs/hash.h>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
@@ -52,9 +49,9 @@
|
||||
#include <google/protobuf/compiler/java/java_message_builder.h>
|
||||
#include <google/protobuf/compiler/java/java_message_builder_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/coded_stream.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
@@ -437,11 +434,11 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
|
||||
for (int j = 0; j < descriptor_->oneof_decl(i)->field_count(); j++) {
|
||||
const FieldDescriptor* field = descriptor_->oneof_decl(i)->field(j);
|
||||
printer->Print(
|
||||
"$field_name$($field_number$),\n",
|
||||
"field_name",
|
||||
ToUpper(field->name()),
|
||||
"field_number",
|
||||
SimpleItoa(field->number()));
|
||||
"$deprecation$$field_name$($field_number$),\n",
|
||||
"deprecation",
|
||||
field->options().deprecated() ? "@java.lang.Deprecated " : "",
|
||||
"field_name", ToUpper(field->name()),
|
||||
"field_number", SimpleItoa(field->number()));
|
||||
}
|
||||
printer->Print(
|
||||
"$cap_oneof_name$_NOT_SET(0);\n",
|
||||
@@ -555,6 +552,7 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
|
||||
GenerateParser(printer);
|
||||
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public $classname$ getDefaultInstanceForType() {\n"
|
||||
" return DEFAULT_INSTANCE;\n"
|
||||
"}\n"
|
||||
@@ -578,7 +576,7 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
|
||||
|
||||
void ImmutableMessageGenerator::
|
||||
GenerateMessageSerializationMethods(io::Printer* printer) {
|
||||
google::protobuf::scoped_array<const FieldDescriptor * > sorted_fields(
|
||||
std::unique_ptr<const FieldDescriptor * []> sorted_fields(
|
||||
SortFieldsByNumber(descriptor_));
|
||||
|
||||
std::vector<const Descriptor::ExtensionRange*> sorted_extensions;
|
||||
@@ -588,6 +586,7 @@ GenerateMessageSerializationMethods(io::Printer* printer) {
|
||||
std::sort(sorted_extensions.begin(), sorted_extensions.end(),
|
||||
ExtensionRangeOrdering());
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public void writeTo(com.google.protobuf.CodedOutputStream output)\n"
|
||||
" throws java.io.IOException {\n");
|
||||
printer->Indent();
|
||||
@@ -648,6 +647,7 @@ GenerateMessageSerializationMethods(io::Printer* printer) {
|
||||
printer->Print(
|
||||
"}\n"
|
||||
"\n"
|
||||
"@java.lang.Override\n"
|
||||
"public int getSerializedSize() {\n"
|
||||
" int size = memoizedSize;\n"
|
||||
" if (size != -1) return size;\n"
|
||||
@@ -789,6 +789,7 @@ void ImmutableMessageGenerator::GenerateSerializeOneExtensionRange(
|
||||
void ImmutableMessageGenerator::GenerateBuilder(io::Printer* printer) {
|
||||
// LITE_RUNTIME implements this at the GeneratedMessageLite level.
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public Builder newBuilderForType() { return newBuilder(); }\n");
|
||||
|
||||
printer->Print(
|
||||
@@ -798,6 +799,7 @@ void ImmutableMessageGenerator::GenerateBuilder(io::Printer* printer) {
|
||||
"public static Builder newBuilder($classname$ prototype) {\n"
|
||||
" return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public Builder toBuilder() {\n"
|
||||
" return this == DEFAULT_INSTANCE\n"
|
||||
" ? new Builder() : new Builder().mergeFrom(this);\n"
|
||||
@@ -841,6 +843,7 @@ GenerateDescriptorMethods(io::Printer* printer) {
|
||||
if (!map_fields.empty()) {
|
||||
printer->Print(
|
||||
"@SuppressWarnings({\"rawtypes\"})\n"
|
||||
"@java.lang.Override\n"
|
||||
"protected com.google.protobuf.MapField internalGetMapField(\n"
|
||||
" int number) {\n"
|
||||
" switch (number) {\n");
|
||||
@@ -866,6 +869,7 @@ GenerateDescriptorMethods(io::Printer* printer) {
|
||||
"}\n");
|
||||
}
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"protected com.google.protobuf.GeneratedMessage$ver$.FieldAccessorTable\n"
|
||||
" internalGetFieldAccessorTable() {\n"
|
||||
" return $fileclass$.internal_$identifier$_fieldAccessorTable\n"
|
||||
@@ -889,6 +893,7 @@ void ImmutableMessageGenerator::GenerateIsInitialized(
|
||||
printer->Print(
|
||||
"private byte memoizedIsInitialized = -1;\n");
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public final boolean isInitialized() {\n");
|
||||
printer->Indent();
|
||||
|
||||
@@ -1209,7 +1214,7 @@ GenerateExtensionRegistrationCode(io::Printer* printer) {
|
||||
// ===================================================================
|
||||
void ImmutableMessageGenerator::
|
||||
GenerateParsingConstructor(io::Printer* printer) {
|
||||
google::protobuf::scoped_array<const FieldDescriptor * > sorted_fields(
|
||||
std::unique_ptr<const FieldDescriptor * []> sorted_fields(
|
||||
SortFieldsByNumber(descriptor_));
|
||||
|
||||
printer->Print(
|
||||
@@ -1259,19 +1264,9 @@ GenerateParsingConstructor(io::Printer* printer) {
|
||||
printer->Indent();
|
||||
|
||||
printer->Print(
|
||||
"case 0:\n" // zero signals EOF / limit reached
|
||||
" done = true;\n"
|
||||
" break;\n"
|
||||
"default: {\n"
|
||||
" if (!parseUnknownField$suffix$(\n"
|
||||
" input, unknownFields, extensionRegistry, tag)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n",
|
||||
"suffix",
|
||||
descriptor_->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? "Proto3"
|
||||
: "");
|
||||
"case 0:\n" // zero signals EOF / limit reached
|
||||
" done = true;\n"
|
||||
" break;\n");
|
||||
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
const FieldDescriptor* field = sorted_fields[i];
|
||||
@@ -1309,6 +1304,18 @@ GenerateParsingConstructor(io::Printer* printer) {
|
||||
}
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
"default: {\n"
|
||||
" if (!parseUnknownField$suffix$(\n"
|
||||
" input, unknownFields, extensionRegistry, tag)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n",
|
||||
"suffix",
|
||||
descriptor_->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? "Proto3"
|
||||
: "");
|
||||
|
||||
printer->Outdent();
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
@@ -1356,6 +1363,7 @@ void ImmutableMessageGenerator::GenerateParser(io::Printer* printer) {
|
||||
"classname", descriptor_->name());
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public $classname$ parsePartialFrom(\n"
|
||||
" com.google.protobuf.CodedInputStream input,\n"
|
||||
" com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
|
||||
|
||||
Reference in new issue
Block a user