| Index: third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc
|
| index f6179bfa9518bba840cd1e88a2956be450f9126d..addb881906e5a100b8f6e31d81ef9a8376a67360 100644
|
| --- a/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_primitive_field.cc
|
| @@ -154,15 +154,24 @@ int FixedSize(FieldDescriptor::Type type) {
|
| }
|
|
|
| void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
| + int messageBitIndex,
|
| + int builderBitIndex,
|
| map<string, string>* variables) {
|
| (*variables)["name"] =
|
| UnderscoresToCamelCase(descriptor);
|
| (*variables)["capitalized_name"] =
|
| UnderscoresToCapitalizedCamelCase(descriptor);
|
| + (*variables)["constant_name"] = FieldConstantName(descriptor);
|
| (*variables)["number"] = SimpleItoa(descriptor->number());
|
| (*variables)["type"] = PrimitiveTypeName(GetJavaType(descriptor));
|
| (*variables)["boxed_type"] = BoxedPrimitiveTypeName(GetJavaType(descriptor));
|
| + (*variables)["field_type"] = (*variables)["type"];
|
| + (*variables)["field_list_type"] = "java.util.List<" +
|
| + (*variables)["boxed_type"] + ">";
|
| + (*variables)["empty_list"] = "java.util.Collections.emptyList();";
|
| (*variables)["default"] = DefaultValue(descriptor);
|
| + (*variables)["default_init"] = IsDefaultValueJavaDefault(descriptor) ?
|
| + "" : ("= " + DefaultValue(descriptor));
|
| (*variables)["capitalized_type"] = GetCapitalizedType(descriptor);
|
| (*variables)["tag"] = SimpleItoa(WireFormat::MakeTag(descriptor));
|
| (*variables)["tag_size"] = SimpleItoa(
|
| @@ -175,67 +184,135 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
| } else {
|
| (*variables)["null_check"] = "";
|
| }
|
| + // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
|
| + // by the proto compiler
|
| + (*variables)["deprecation"] = descriptor->options().deprecated()
|
| + ? "@java.lang.Deprecated " : "";
|
| int fixed_size = FixedSize(GetType(descriptor));
|
| if (fixed_size != -1) {
|
| (*variables)["fixed_size"] = SimpleItoa(fixed_size);
|
| }
|
| + (*variables)["on_changed"] =
|
| + HasDescriptorMethods(descriptor->containing_type()) ? "onChanged();" : "";
|
| +
|
| + // For singular messages and builders, one bit is used for the hasField bit.
|
| + (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);
|
| +
|
| + (*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
|
| + (*variables)["set_has_field_bit_builder"] = GenerateSetBit(builderBitIndex);
|
| + (*variables)["clear_has_field_bit_builder"] =
|
| + GenerateClearBit(builderBitIndex);
|
| +
|
| + // For repated builders, one bit is used for whether the array is immutable.
|
| + (*variables)["get_mutable_bit_builder"] = GenerateGetBit(builderBitIndex);
|
| + (*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);
|
| + (*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);
|
| +
|
| + (*variables)["get_has_field_bit_from_local"] =
|
| + GenerateGetBitFromLocal(builderBitIndex);
|
| + (*variables)["set_has_field_bit_to_local"] =
|
| + GenerateSetBitToLocal(messageBitIndex);
|
| }
|
| +
|
| } // namespace
|
|
|
| // ===================================================================
|
|
|
| PrimitiveFieldGenerator::
|
| -PrimitiveFieldGenerator(const FieldDescriptor* descriptor)
|
| - : descriptor_(descriptor) {
|
| - SetPrimitiveVariables(descriptor, &variables_);
|
| +PrimitiveFieldGenerator(const FieldDescriptor* descriptor,
|
| + int messageBitIndex,
|
| + int builderBitIndex)
|
| + : descriptor_(descriptor), messageBitIndex_(messageBitIndex),
|
| + builderBitIndex_(builderBitIndex) {
|
| + SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,
|
| + &variables_);
|
| }
|
|
|
| PrimitiveFieldGenerator::~PrimitiveFieldGenerator() {}
|
|
|
| +int PrimitiveFieldGenerator::GetNumBitsForMessage() const {
|
| + return 1;
|
| +}
|
| +
|
| +int PrimitiveFieldGenerator::GetNumBitsForBuilder() const {
|
| + return 1;
|
| +}
|
| +
|
| +void PrimitiveFieldGenerator::
|
| +GenerateInterfaceMembers(io::Printer* printer) const {
|
| + printer->Print(variables_,
|
| + "$deprecation$boolean has$capitalized_name$();\n"
|
| + "$deprecation$$type$ get$capitalized_name$();\n");
|
| +}
|
| +
|
| void PrimitiveFieldGenerator::
|
| GenerateMembers(io::Printer* printer) const {
|
| printer->Print(variables_,
|
| - "private boolean has$capitalized_name$;\n"
|
| - "private $type$ $name$_ = $default$;\n"
|
| - "public boolean has$capitalized_name$() { return has$capitalized_name$; }\n"
|
| - "public $type$ get$capitalized_name$() { return $name$_; }\n");
|
| + "private $field_type$ $name$_;\n"
|
| + "$deprecation$public boolean has$capitalized_name$() {\n"
|
| + " return $get_has_field_bit_message$;\n"
|
| + "}\n");
|
| +
|
| + printer->Print(variables_,
|
| + "$deprecation$public $type$ get$capitalized_name$() {\n"
|
| + " return $name$_;\n"
|
| + "}\n");
|
| }
|
|
|
| void PrimitiveFieldGenerator::
|
| GenerateBuilderMembers(io::Printer* printer) const {
|
| printer->Print(variables_,
|
| - "public boolean has$capitalized_name$() {\n"
|
| - " return result.has$capitalized_name$();\n"
|
| - "}\n"
|
| - "public $type$ get$capitalized_name$() {\n"
|
| - " return result.get$capitalized_name$();\n"
|
| - "}\n"
|
| - "public Builder set$capitalized_name$($type$ value) {\n"
|
| + "private $field_type$ $name$_ $default_init$;\n"
|
| + "$deprecation$public boolean has$capitalized_name$() {\n"
|
| + " return $get_has_field_bit_builder$;\n"
|
| + "}\n");
|
| +
|
| + printer->Print(variables_,
|
| + "$deprecation$public $type$ get$capitalized_name$() {\n"
|
| + " return $name$_;\n"
|
| + "}\n");
|
| +
|
| + printer->Print(variables_,
|
| + "$deprecation$public Builder set$capitalized_name$($type$ value) {\n"
|
| "$null_check$"
|
| - " result.has$capitalized_name$ = true;\n"
|
| - " result.$name$_ = value;\n"
|
| + " $set_has_field_bit_builder$;\n"
|
| + " $name$_ = value;\n"
|
| + " $on_changed$\n"
|
| " return this;\n"
|
| "}\n"
|
| - "public Builder clear$capitalized_name$() {\n"
|
| - " result.has$capitalized_name$ = false;\n");
|
| + "$deprecation$public Builder clear$capitalized_name$() {\n"
|
| + " $clear_has_field_bit_builder$;\n");
|
| JavaType type = GetJavaType(descriptor_);
|
| if (type == JAVATYPE_STRING || type == JAVATYPE_BYTES) {
|
| // The default value is not a simple literal so we want to avoid executing
|
| // it multiple times. Instead, get the default out of the default instance.
|
| printer->Print(variables_,
|
| - " result.$name$_ = getDefaultInstance().get$capitalized_name$();\n");
|
| + " $name$_ = getDefaultInstance().get$capitalized_name$();\n");
|
| } else {
|
| printer->Print(variables_,
|
| - " result.$name$_ = $default$;\n");
|
| + " $name$_ = $default$;\n");
|
| }
|
| printer->Print(variables_,
|
| + " $on_changed$\n"
|
| " return this;\n"
|
| "}\n");
|
| }
|
|
|
| void PrimitiveFieldGenerator::
|
| +GenerateFieldBuilderInitializationCode(io::Printer* printer) const {
|
| + // noop for primitives
|
| +}
|
| +
|
| +void PrimitiveFieldGenerator::
|
| GenerateInitializationCode(io::Printer* printer) const {
|
| - // Initialized inline.
|
| + printer->Print(variables_, "$name$_ = $default$;\n");
|
| +}
|
| +
|
| +void PrimitiveFieldGenerator::
|
| +GenerateBuilderClearCode(io::Printer* printer) const {
|
| + printer->Print(variables_,
|
| + "$name$_ = $default$;\n"
|
| + "$clear_has_field_bit_builder$;\n");
|
| }
|
|
|
| void PrimitiveFieldGenerator::
|
| @@ -248,32 +325,121 @@ GenerateMergingCode(io::Printer* printer) const {
|
|
|
| void PrimitiveFieldGenerator::
|
| GenerateBuildingCode(io::Printer* printer) const {
|
| - // Nothing to do here for primitive types.
|
| + printer->Print(variables_,
|
| + "if ($get_has_field_bit_from_local$) {\n"
|
| + " $set_has_field_bit_to_local$;\n"
|
| + "}\n"
|
| + "result.$name$_ = $name$_;\n");
|
| }
|
|
|
| void PrimitiveFieldGenerator::
|
| GenerateParsingCode(io::Printer* printer) const {
|
| printer->Print(variables_,
|
| - "set$capitalized_name$(input.read$capitalized_type$());\n");
|
| + "$set_has_field_bit_builder$;\n"
|
| + "$name$_ = input.read$capitalized_type$();\n");
|
| }
|
|
|
| void PrimitiveFieldGenerator::
|
| GenerateSerializationCode(io::Printer* printer) const {
|
| printer->Print(variables_,
|
| - "if (has$capitalized_name$()) {\n"
|
| - " output.write$capitalized_type$($number$, get$capitalized_name$());\n"
|
| + "if ($get_has_field_bit_message$) {\n"
|
| + " output.write$capitalized_type$($number$, $name$_);\n"
|
| "}\n");
|
| }
|
|
|
| void PrimitiveFieldGenerator::
|
| GenerateSerializedSizeCode(io::Printer* printer) const {
|
| printer->Print(variables_,
|
| - "if (has$capitalized_name$()) {\n"
|
| + "if ($get_has_field_bit_message$) {\n"
|
| " size += com.google.protobuf.CodedOutputStream\n"
|
| - " .compute$capitalized_type$Size($number$, get$capitalized_name$());\n"
|
| + " .compute$capitalized_type$Size($number$, $name$_);\n"
|
| "}\n");
|
| }
|
|
|
| +void PrimitiveFieldGenerator::
|
| +GenerateEqualsCode(io::Printer* printer) const {
|
| + switch (GetJavaType(descriptor_)) {
|
| + case JAVATYPE_INT:
|
| + case JAVATYPE_LONG:
|
| + case JAVATYPE_BOOLEAN:
|
| + printer->Print(variables_,
|
| + "result = result && (get$capitalized_name$()\n"
|
| + " == other.get$capitalized_name$());\n");
|
| + break;
|
| +
|
| + case JAVATYPE_FLOAT:
|
| + printer->Print(variables_,
|
| + "result = result && (Float.floatToIntBits(get$capitalized_name$())"
|
| + " == Float.floatToIntBits(other.get$capitalized_name$()));\n");
|
| + break;
|
| +
|
| + case JAVATYPE_DOUBLE:
|
| + printer->Print(variables_,
|
| + "result = result && (Double.doubleToLongBits(get$capitalized_name$())"
|
| + " == Double.doubleToLongBits(other.get$capitalized_name$()));\n");
|
| + break;
|
| +
|
| + case JAVATYPE_STRING:
|
| + case JAVATYPE_BYTES:
|
| + printer->Print(variables_,
|
| + "result = result && get$capitalized_name$()\n"
|
| + " .equals(other.get$capitalized_name$());\n");
|
| + break;
|
| +
|
| + case JAVATYPE_ENUM:
|
| + case JAVATYPE_MESSAGE:
|
| + default:
|
| + GOOGLE_LOG(FATAL) << "Can't get here.";
|
| + break;
|
| + }
|
| +}
|
| +
|
| +void PrimitiveFieldGenerator::
|
| +GenerateHashCode(io::Printer* printer) const {
|
| + printer->Print(variables_,
|
| + "hash = (37 * hash) + $constant_name$;\n");
|
| + switch (GetJavaType(descriptor_)) {
|
| + case JAVATYPE_INT:
|
| + printer->Print(variables_,
|
| + "hash = (53 * hash) + get$capitalized_name$();\n");
|
| + break;
|
| +
|
| + case JAVATYPE_LONG:
|
| + printer->Print(variables_,
|
| + "hash = (53 * hash) + hashLong(get$capitalized_name$());\n");
|
| + break;
|
| +
|
| + case JAVATYPE_BOOLEAN:
|
| + printer->Print(variables_,
|
| + "hash = (53 * hash) + hashBoolean(get$capitalized_name$());\n");
|
| + break;
|
| +
|
| + case JAVATYPE_FLOAT:
|
| + printer->Print(variables_,
|
| + "hash = (53 * hash) + Float.floatToIntBits(\n"
|
| + " get$capitalized_name$());\n");
|
| + break;
|
| +
|
| + case JAVATYPE_DOUBLE:
|
| + printer->Print(variables_,
|
| + "hash = (53 * hash) + hashLong(\n"
|
| + " Double.doubleToLongBits(get$capitalized_name$()));\n");
|
| + break;
|
| +
|
| + case JAVATYPE_STRING:
|
| + case JAVATYPE_BYTES:
|
| + printer->Print(variables_,
|
| + "hash = (53 * hash) + get$capitalized_name$().hashCode();\n");
|
| + break;
|
| +
|
| + case JAVATYPE_ENUM:
|
| + case JAVATYPE_MESSAGE:
|
| + default:
|
| + GOOGLE_LOG(FATAL) << "Can't get here.";
|
| + break;
|
| + }
|
| +}
|
| +
|
| string PrimitiveFieldGenerator::GetBoxedType() const {
|
| return BoxedPrimitiveTypeName(GetJavaType(descriptor_));
|
| }
|
| @@ -281,23 +447,46 @@ string PrimitiveFieldGenerator::GetBoxedType() const {
|
| // ===================================================================
|
|
|
| RepeatedPrimitiveFieldGenerator::
|
| -RepeatedPrimitiveFieldGenerator(const FieldDescriptor* descriptor)
|
| - : descriptor_(descriptor) {
|
| - SetPrimitiveVariables(descriptor, &variables_);
|
| +RepeatedPrimitiveFieldGenerator(const FieldDescriptor* descriptor,
|
| + int messageBitIndex,
|
| + int builderBitIndex)
|
| + : descriptor_(descriptor), messageBitIndex_(messageBitIndex),
|
| + builderBitIndex_(builderBitIndex) {
|
| + SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,
|
| + &variables_);
|
| }
|
|
|
| RepeatedPrimitiveFieldGenerator::~RepeatedPrimitiveFieldGenerator() {}
|
|
|
| +int RepeatedPrimitiveFieldGenerator::GetNumBitsForMessage() const {
|
| + return 0;
|
| +}
|
| +
|
| +int RepeatedPrimitiveFieldGenerator::GetNumBitsForBuilder() const {
|
| + return 1;
|
| +}
|
| +
|
| +void RepeatedPrimitiveFieldGenerator::
|
| +GenerateInterfaceMembers(io::Printer* printer) const {
|
| + printer->Print(variables_,
|
| + "$deprecation$java.util.List<$boxed_type$> get$capitalized_name$List();\n"
|
| + "$deprecation$int get$capitalized_name$Count();\n"
|
| + "$deprecation$$type$ get$capitalized_name$(int index);\n");
|
| +}
|
| +
|
| +
|
| void RepeatedPrimitiveFieldGenerator::
|
| GenerateMembers(io::Printer* printer) const {
|
| printer->Print(variables_,
|
| - "private java.util.List<$boxed_type$> $name$_ =\n"
|
| - " java.util.Collections.emptyList();\n"
|
| - "public java.util.List<$boxed_type$> get$capitalized_name$List() {\n"
|
| + "private $field_list_type$ $name$_;\n"
|
| + "$deprecation$public java.util.List<$boxed_type$>\n"
|
| + " get$capitalized_name$List() {\n"
|
| " return $name$_;\n" // note: unmodifiable list
|
| "}\n"
|
| - "public int get$capitalized_name$Count() { return $name$_.size(); }\n"
|
| - "public $type$ get$capitalized_name$(int index) {\n"
|
| + "$deprecation$public int get$capitalized_name$Count() {\n"
|
| + " return $name$_.size();\n"
|
| + "}\n"
|
| + "$deprecation$public $type$ get$capitalized_name$(int index) {\n"
|
| " return $name$_.get(index);\n"
|
| "}\n");
|
|
|
| @@ -310,76 +499,125 @@ GenerateMembers(io::Printer* printer) const {
|
|
|
| void RepeatedPrimitiveFieldGenerator::
|
| GenerateBuilderMembers(io::Printer* printer) const {
|
| + // One field is the list and the bit field keeps track of whether the
|
| + // list is immutable. If it's immutable, the invariant is that it must
|
| + // either an instance of Collections.emptyList() or it's an ArrayList
|
| + // wrapped in a Collections.unmodifiableList() wrapper and nobody else has
|
| + // a refererence to the underlying ArrayList. This invariant allows us to
|
| + // share instances of lists between protocol buffers avoiding expensive
|
| + // memory allocations. Note, immutable is a strong guarantee here -- not
|
| + // just that the list cannot be modified via the reference but that the
|
| + // list can never be modified.
|
| + printer->Print(variables_,
|
| + "private $field_list_type$ $name$_ = $empty_list$;\n");
|
| +
|
| printer->Print(variables_,
|
| + "private void ensure$capitalized_name$IsMutable() {\n"
|
| + " if (!$get_mutable_bit_builder$) {\n"
|
| + " $name$_ = new java.util.ArrayList<$boxed_type$>($name$_);\n"
|
| + " $set_mutable_bit_builder$;\n"
|
| + " }\n"
|
| + "}\n");
|
| +
|
| // Note: We return an unmodifiable list because otherwise the caller
|
| // could hold on to the returned list and modify it after the message
|
| // has been built, thus mutating the message which is supposed to be
|
| // immutable.
|
| - "public java.util.List<$boxed_type$> get$capitalized_name$List() {\n"
|
| - " return java.util.Collections.unmodifiableList(result.$name$_);\n"
|
| + printer->Print(variables_,
|
| + "$deprecation$public java.util.List<$boxed_type$>\n"
|
| + " get$capitalized_name$List() {\n"
|
| + " return java.util.Collections.unmodifiableList($name$_);\n"
|
| "}\n"
|
| - "public int get$capitalized_name$Count() {\n"
|
| - " return result.get$capitalized_name$Count();\n"
|
| + "$deprecation$public int get$capitalized_name$Count() {\n"
|
| + " return $name$_.size();\n"
|
| "}\n"
|
| - "public $type$ get$capitalized_name$(int index) {\n"
|
| - " return result.get$capitalized_name$(index);\n"
|
| + "$deprecation$public $type$ get$capitalized_name$(int index) {\n"
|
| + " return $name$_.get(index);\n"
|
| "}\n"
|
| - "public Builder set$capitalized_name$(int index, $type$ value) {\n"
|
| + "$deprecation$public Builder set$capitalized_name$(\n"
|
| + " int index, $type$ value) {\n"
|
| "$null_check$"
|
| - " result.$name$_.set(index, value);\n"
|
| + " ensure$capitalized_name$IsMutable();\n"
|
| + " $name$_.set(index, value);\n"
|
| + " $on_changed$\n"
|
| " return this;\n"
|
| "}\n"
|
| - "public Builder add$capitalized_name$($type$ value) {\n"
|
| + "$deprecation$public Builder add$capitalized_name$($type$ value) {\n"
|
| "$null_check$"
|
| - " if (result.$name$_.isEmpty()) {\n"
|
| - " result.$name$_ = new java.util.ArrayList<$boxed_type$>();\n"
|
| - " }\n"
|
| - " result.$name$_.add(value);\n"
|
| + " ensure$capitalized_name$IsMutable();\n"
|
| + " $name$_.add(value);\n"
|
| + " $on_changed$\n"
|
| " return this;\n"
|
| "}\n"
|
| - "public Builder addAll$capitalized_name$(\n"
|
| + "$deprecation$public Builder addAll$capitalized_name$(\n"
|
| " java.lang.Iterable<? extends $boxed_type$> values) {\n"
|
| - " if (result.$name$_.isEmpty()) {\n"
|
| - " result.$name$_ = new java.util.ArrayList<$boxed_type$>();\n"
|
| - " }\n"
|
| - " super.addAll(values, result.$name$_);\n"
|
| + " ensure$capitalized_name$IsMutable();\n"
|
| + " super.addAll(values, $name$_);\n"
|
| + " $on_changed$\n"
|
| " return this;\n"
|
| "}\n"
|
| - "public Builder clear$capitalized_name$() {\n"
|
| - " result.$name$_ = java.util.Collections.emptyList();\n"
|
| + "$deprecation$public Builder clear$capitalized_name$() {\n"
|
| + " $name$_ = $empty_list$;\n"
|
| + " $clear_mutable_bit_builder$;\n"
|
| + " $on_changed$\n"
|
| " return this;\n"
|
| "}\n");
|
| }
|
|
|
| void RepeatedPrimitiveFieldGenerator::
|
| +GenerateFieldBuilderInitializationCode(io::Printer* printer) const {
|
| + // noop for primitives
|
| +}
|
| +
|
| +void RepeatedPrimitiveFieldGenerator::
|
| GenerateInitializationCode(io::Printer* printer) const {
|
| - // Initialized inline.
|
| + printer->Print(variables_, "$name$_ = $empty_list$;\n");
|
| +}
|
| +
|
| +void RepeatedPrimitiveFieldGenerator::
|
| +GenerateBuilderClearCode(io::Printer* printer) const {
|
| + printer->Print(variables_,
|
| + "$name$_ = $empty_list$;\n"
|
| + "$clear_mutable_bit_builder$;\n");
|
| }
|
|
|
| void RepeatedPrimitiveFieldGenerator::
|
| GenerateMergingCode(io::Printer* printer) const {
|
| + // The code below does two optimizations:
|
| + // 1. If the other list is empty, there's nothing to do. This ensures we
|
| + // don't allocate a new array if we already have an immutable one.
|
| + // 2. If the other list is non-empty and our current list is empty, we can
|
| + // reuse the other list which is guaranteed to be immutable.
|
| printer->Print(variables_,
|
| "if (!other.$name$_.isEmpty()) {\n"
|
| - " if (result.$name$_.isEmpty()) {\n"
|
| - " result.$name$_ = new java.util.ArrayList<$boxed_type$>();\n"
|
| + " if ($name$_.isEmpty()) {\n"
|
| + " $name$_ = other.$name$_;\n"
|
| + " $clear_mutable_bit_builder$;\n"
|
| + " } else {\n"
|
| + " ensure$capitalized_name$IsMutable();\n"
|
| + " $name$_.addAll(other.$name$_);\n"
|
| " }\n"
|
| - " result.$name$_.addAll(other.$name$_);\n"
|
| + " $on_changed$\n"
|
| "}\n");
|
| }
|
|
|
| void RepeatedPrimitiveFieldGenerator::
|
| GenerateBuildingCode(io::Printer* printer) const {
|
| + // The code below ensures that the result has an immutable list. If our
|
| + // list is immutable, we can just reuse it. If not, we make it immutable.
|
| printer->Print(variables_,
|
| - "if (result.$name$_ != java.util.Collections.EMPTY_LIST) {\n"
|
| - " result.$name$_ =\n"
|
| - " java.util.Collections.unmodifiableList(result.$name$_);\n"
|
| - "}\n");
|
| + "if ($get_mutable_bit_builder$) {\n"
|
| + " $name$_ = java.util.Collections.unmodifiableList($name$_);\n"
|
| + " $clear_mutable_bit_builder$;\n"
|
| + "}\n"
|
| + "result.$name$_ = $name$_;\n");
|
| }
|
|
|
| void RepeatedPrimitiveFieldGenerator::
|
| GenerateParsingCode(io::Printer* printer) const {
|
| printer->Print(variables_,
|
| - "add$capitalized_name$(input.read$capitalized_type$());\n");
|
| + "ensure$capitalized_name$IsMutable();\n"
|
| + "$name$_.add(input.read$capitalized_type$());\n");
|
| }
|
|
|
| void RepeatedPrimitiveFieldGenerator::
|
| @@ -401,13 +639,13 @@ GenerateSerializationCode(io::Printer* printer) const {
|
| " output.writeRawVarint32($tag$);\n"
|
| " output.writeRawVarint32($name$MemoizedSerializedSize);\n"
|
| "}\n"
|
| - "for ($type$ element : get$capitalized_name$List()) {\n"
|
| - " output.write$capitalized_type$NoTag(element);\n"
|
| + "for (int i = 0; i < $name$_.size(); i++) {\n"
|
| + " output.write$capitalized_type$NoTag($name$_.get(i));\n"
|
| "}\n");
|
| } else {
|
| printer->Print(variables_,
|
| - "for ($type$ element : get$capitalized_name$List()) {\n"
|
| - " output.write$capitalized_type$($number$, element);\n"
|
| + "for (int i = 0; i < $name$_.size(); i++) {\n"
|
| + " output.write$capitalized_type$($number$, $name$_.get(i));\n"
|
| "}\n");
|
| }
|
| }
|
| @@ -421,9 +659,9 @@ GenerateSerializedSizeCode(io::Printer* printer) const {
|
|
|
| if (FixedSize(GetType(descriptor_)) == -1) {
|
| printer->Print(variables_,
|
| - "for ($type$ element : get$capitalized_name$List()) {\n"
|
| + "for (int i = 0; i < $name$_.size(); i++) {\n"
|
| " dataSize += com.google.protobuf.CodedOutputStream\n"
|
| - " .compute$capitalized_type$SizeNoTag(element);\n"
|
| + " .compute$capitalized_type$SizeNoTag($name$_.get(i));\n"
|
| "}\n");
|
| } else {
|
| printer->Print(variables_,
|
| @@ -455,6 +693,22 @@ GenerateSerializedSizeCode(io::Printer* printer) const {
|
| printer->Print("}\n");
|
| }
|
|
|
| +void RepeatedPrimitiveFieldGenerator::
|
| +GenerateEqualsCode(io::Printer* printer) const {
|
| + printer->Print(variables_,
|
| + "result = result && get$capitalized_name$List()\n"
|
| + " .equals(other.get$capitalized_name$List());\n");
|
| +}
|
| +
|
| +void RepeatedPrimitiveFieldGenerator::
|
| +GenerateHashCode(io::Printer* printer) const {
|
| + printer->Print(variables_,
|
| + "if (get$capitalized_name$Count() > 0) {\n"
|
| + " hash = (37 * hash) + $constant_name$;\n"
|
| + " hash = (53 * hash) + get$capitalized_name$List().hashCode();\n"
|
| + "}\n");
|
| +}
|
| +
|
| string RepeatedPrimitiveFieldGenerator::GetBoxedType() const {
|
| return BoxedPrimitiveTypeName(GetJavaType(descriptor_));
|
| }
|
|
|