From 40d7816575ac5c64a130a32a3784f076549bfd41 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 25 Feb 2015 16:07:09 +0300 Subject: [PATCH] Regenerate protobuf classes After secondary constructors serialization --- .../kotlin/serialization/DebugProtoBuf.java | 439 ++++++++++++++++-- .../kotlin/serialization/ProtoBuf.java | 224 +++++++++ 2 files changed, 631 insertions(+), 32 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java index 50072cf2390..c439103e9b9 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java @@ -9448,6 +9448,31 @@ public final class DebugProtoBuf { * */ org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder(); + + // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + java.util.List + getSecondaryConstructorList(); + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getSecondaryConstructor(int index); + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + int getSecondaryConstructorCount(); + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + java.util.List + getSecondaryConstructorOrBuilderList(); + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getSecondaryConstructorOrBuilder( + int index); } /** * Protobuf type {@code org.jetbrains.kotlin.serialization.Class} @@ -9594,6 +9619,14 @@ public final class DebugProtoBuf { bitField0_ |= 0x00000008; break; } + case 114: { + if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + secondaryConstructor_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000200; + } + secondaryConstructor_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry)); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -9617,6 +9650,9 @@ public final class DebugProtoBuf { if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_); } + if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + secondaryConstructor_ = java.util.Collections.unmodifiableList(secondaryConstructor_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -10655,6 +10691,42 @@ public final class DebugProtoBuf { return primaryConstructor_; } + // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + public static final int SECONDARY_CONSTRUCTOR_FIELD_NUMBER = 14; + private java.util.List secondaryConstructor_; + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public java.util.List getSecondaryConstructorList() { + return secondaryConstructor_; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public java.util.List + getSecondaryConstructorOrBuilderList() { + return secondaryConstructor_; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public int getSecondaryConstructorCount() { + return secondaryConstructor_.size(); + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getSecondaryConstructor(int index) { + return secondaryConstructor_.get(index); + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getSecondaryConstructorOrBuilder( + int index) { + return secondaryConstructor_.get(index); + } + private void initFields() { flags_ = 0; fqName_ = 0; @@ -10665,6 +10737,7 @@ public final class DebugProtoBuf { member_ = java.util.Collections.emptyList(); enumEntry_ = java.util.Collections.emptyList(); primaryConstructor_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); + secondaryConstructor_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -10699,6 +10772,12 @@ public final class DebugProtoBuf { return false; } } + for (int i = 0; i < getSecondaryConstructorCount(); i++) { + if (!getSecondaryConstructor(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } if (!extensionsAreInitialized()) { memoizedIsInitialized = 0; return false; @@ -10740,6 +10819,9 @@ public final class DebugProtoBuf { if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeMessage(13, primaryConstructor_); } + for (int i = 0; i < secondaryConstructor_.size(); i++) { + output.writeMessage(14, secondaryConstructor_.get(i)); + } extensionWriter.writeUntil(200, output); getUnknownFields().writeTo(output); } @@ -10796,6 +10878,10 @@ public final class DebugProtoBuf { size += com.google.protobuf.CodedOutputStream .computeMessageSize(13, primaryConstructor_); } + for (int i = 0; i < secondaryConstructor_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(14, secondaryConstructor_.get(i)); + } size += extensionsSerializedSize(); size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -10909,6 +10995,7 @@ public final class DebugProtoBuf { getSupertypeFieldBuilder(); getMemberFieldBuilder(); getPrimaryConstructorFieldBuilder(); + getSecondaryConstructorFieldBuilder(); } } private static Builder create() { @@ -10951,6 +11038,12 @@ public final class DebugProtoBuf { primaryConstructorBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000100); + if (secondaryConstructorBuilder_ == null) { + secondaryConstructor_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000200); + } else { + secondaryConstructorBuilder_.clear(); + } return this; } @@ -11036,6 +11129,15 @@ public final class DebugProtoBuf { } else { result.primaryConstructor_ = primaryConstructorBuilder_.build(); } + if (secondaryConstructorBuilder_ == null) { + if (((bitField0_ & 0x00000200) == 0x00000200)) { + secondaryConstructor_ = java.util.Collections.unmodifiableList(secondaryConstructor_); + bitField0_ = (bitField0_ & ~0x00000200); + } + result.secondaryConstructor_ = secondaryConstructor_; + } else { + result.secondaryConstructor_ = secondaryConstructorBuilder_.build(); + } result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -11162,6 +11264,32 @@ public final class DebugProtoBuf { if (other.hasPrimaryConstructor()) { mergePrimaryConstructor(other.getPrimaryConstructor()); } + if (secondaryConstructorBuilder_ == null) { + if (!other.secondaryConstructor_.isEmpty()) { + if (secondaryConstructor_.isEmpty()) { + secondaryConstructor_ = other.secondaryConstructor_; + bitField0_ = (bitField0_ & ~0x00000200); + } else { + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.addAll(other.secondaryConstructor_); + } + onChanged(); + } + } else { + if (!other.secondaryConstructor_.isEmpty()) { + if (secondaryConstructorBuilder_.isEmpty()) { + secondaryConstructorBuilder_.dispose(); + secondaryConstructorBuilder_ = null; + secondaryConstructor_ = other.secondaryConstructor_; + bitField0_ = (bitField0_ & ~0x00000200); + secondaryConstructorBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getSecondaryConstructorFieldBuilder() : null; + } else { + secondaryConstructorBuilder_.addAllMessages(other.secondaryConstructor_); + } + } + } this.mergeExtensionFields(other); this.mergeUnknownFields(other.getUnknownFields()); return this; @@ -11196,6 +11324,12 @@ public final class DebugProtoBuf { return false; } } + for (int i = 0; i < getSecondaryConstructorCount(); i++) { + if (!getSecondaryConstructor(i).isInitialized()) { + + return false; + } + } if (!extensionsAreInitialized()) { return false; @@ -12413,6 +12547,246 @@ public final class DebugProtoBuf { return primaryConstructorBuilder_; } + // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + private java.util.List secondaryConstructor_ = + java.util.Collections.emptyList(); + private void ensureSecondaryConstructorIsMutable() { + if (!((bitField0_ & 0x00000200) == 0x00000200)) { + secondaryConstructor_ = new java.util.ArrayList(secondaryConstructor_); + bitField0_ |= 0x00000200; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> secondaryConstructorBuilder_; + + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public java.util.List getSecondaryConstructorList() { + if (secondaryConstructorBuilder_ == null) { + return java.util.Collections.unmodifiableList(secondaryConstructor_); + } else { + return secondaryConstructorBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public int getSecondaryConstructorCount() { + if (secondaryConstructorBuilder_ == null) { + return secondaryConstructor_.size(); + } else { + return secondaryConstructorBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable getSecondaryConstructor(int index) { + if (secondaryConstructorBuilder_ == null) { + return secondaryConstructor_.get(index); + } else { + return secondaryConstructorBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder setSecondaryConstructor( + int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) { + if (secondaryConstructorBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.set(index, value); + onChanged(); + } else { + secondaryConstructorBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder setSecondaryConstructor( + int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) { + if (secondaryConstructorBuilder_ == null) { + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.set(index, builderForValue.build()); + onChanged(); + } else { + secondaryConstructorBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder addSecondaryConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) { + if (secondaryConstructorBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.add(value); + onChanged(); + } else { + secondaryConstructorBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder addSecondaryConstructor( + int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable value) { + if (secondaryConstructorBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.add(index, value); + onChanged(); + } else { + secondaryConstructorBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder addSecondaryConstructor( + org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) { + if (secondaryConstructorBuilder_ == null) { + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.add(builderForValue.build()); + onChanged(); + } else { + secondaryConstructorBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder addSecondaryConstructor( + int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder builderForValue) { + if (secondaryConstructorBuilder_ == null) { + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.add(index, builderForValue.build()); + onChanged(); + } else { + secondaryConstructorBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder addAllSecondaryConstructor( + java.lang.Iterable values) { + if (secondaryConstructorBuilder_ == null) { + ensureSecondaryConstructorIsMutable(); + super.addAll(values, secondaryConstructor_); + onChanged(); + } else { + secondaryConstructorBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder clearSecondaryConstructor() { + if (secondaryConstructorBuilder_ == null) { + secondaryConstructor_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000200); + onChanged(); + } else { + secondaryConstructorBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder removeSecondaryConstructor(int index) { + if (secondaryConstructorBuilder_ == null) { + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.remove(index); + onChanged(); + } else { + secondaryConstructorBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder getSecondaryConstructorBuilder( + int index) { + return getSecondaryConstructorFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder getSecondaryConstructorOrBuilder( + int index) { + if (secondaryConstructorBuilder_ == null) { + return secondaryConstructor_.get(index); } else { + return secondaryConstructorBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public java.util.List + getSecondaryConstructorOrBuilderList() { + if (secondaryConstructorBuilder_ != null) { + return secondaryConstructorBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(secondaryConstructor_); + } + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addSecondaryConstructorBuilder() { + return getSecondaryConstructorFieldBuilder().addBuilder( + org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder addSecondaryConstructorBuilder( + int index) { + return getSecondaryConstructorFieldBuilder().addBuilder( + index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public java.util.List + getSecondaryConstructorBuilderList() { + return getSecondaryConstructorFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder> + getSecondaryConstructorFieldBuilder() { + if (secondaryConstructorBuilder_ == null) { + secondaryConstructorBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.CallableOrBuilder>( + secondaryConstructor_, + ((bitField0_ & 0x00000200) == 0x00000200), + getParentForChildren(), + isClean()); + secondaryConstructor_ = null; + } + return secondaryConstructorBuilder_; + } + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class) } @@ -16594,7 +16968,7 @@ public final class DebugProtoBuf { "brains.kotlin.serialization.TypeParamete" + "r.Variance:\003INV\022=\n\013upper_bound\030\005 \003(\0132(.o", "rg.jetbrains.kotlin.serialization.Type\"$" + - "\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\342\004\n" + + "\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\257\005\n" + "\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\017\n\007fq_name\030\003 \002(" + "\005\022\033\n\023default_object_name\030\004 \001(\005\022I\n\016type_p" + "arameter\030\005 \003(\01321.org.jetbrains.kotlin.se" + @@ -16605,36 +16979,37 @@ public final class DebugProtoBuf { "zation.Callable\022\022\n\nenum_entry\030\014 \003(\005\022Y\n\023p", "rimary_constructor\030\r \001(\0132<.org.jetbrains" + ".kotlin.serialization.Class.PrimaryConst" + - "ructor\032P\n\022PrimaryConstructor\022:\n\004data\030\001 \001" + - "(\0132,.org.jetbrains.kotlin.serialization." + - "Callable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016" + - "\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTA" + - "TION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT" + - "\020\006*\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\0132,.o" + - "rg.jetbrains.kotlin.serialization.Callab" + - "le*\005\010d\020\310\001\"\300\005\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024\n", - "\014getter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(" + - "\005\022I\n\016type_parameter\030\004 \003(\01321.org.jetbrain" + - "s.kotlin.serialization.TypeParameter\022?\n\r" + - "receiver_type\030\005 \001(\0132(.org.jetbrains.kotl" + - "in.serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017v" + - "alue_parameter\030\007 \003(\0132;.org.jetbrains.kot" + - "lin.serialization.Callable.ValueParamete" + - "r\022=\n\013return_type\030\010 \002(\0132(.org.jetbrains.k" + - "otlin.serialization.Type\032\263\001\n\016ValueParame" + - "ter\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type", - "\030\003 \002(\0132(.org.jetbrains.kotlin.serializat" + - "ion.Type\022E\n\023vararg_element_type\030\004 \001(\0132(." + - "org.jetbrains.kotlin.serialization.Type*" + - "\005\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n" + - "\rFAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNT" + - "HESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VA" + - "L\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010" + - "Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRAC" + - "T\020\002*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVA" + - "TE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVA", - "TE_TO_THIS\020\004\022\t\n\005LOCAL\020\005B\022B\rDebugProtoBuf" + - "\210\001\000" + "ructor\022K\n\025secondary_constructor\030\016 \003(\0132,." + + "org.jetbrains.kotlin.serialization.Calla" + + "ble\032P\n\022PrimaryConstructor\022:\n\004data\030\001 \001(\0132" + + ",.org.jetbrains.kotlin.serialization.Cal" + + "lable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016\n\nE" + + "NUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATIO" + + "N_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT\020\006*" + + "\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\0132,.org.", + "jetbrains.kotlin.serialization.Callable*" + + "\005\010d\020\310\001\"\300\005\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024\n\014ge" + + "tter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005\022I" + + "\n\016type_parameter\030\004 \003(\01321.org.jetbrains.k" + + "otlin.serialization.TypeParameter\022?\n\rrec" + + "eiver_type\030\005 \001(\0132(.org.jetbrains.kotlin." + + "serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017valu" + + "e_parameter\030\007 \003(\0132;.org.jetbrains.kotlin" + + ".serialization.Callable.ValueParameter\022=" + + "\n\013return_type\030\010 \002(\0132(.org.jetbrains.kotl", + "in.serialization.Type\032\263\001\n\016ValueParameter" + + "\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type\030\003 " + + "\002(\0132(.org.jetbrains.kotlin.serialization" + + ".Type\022E\n\023vararg_element_type\030\004 \001(\0132(.org" + + ".jetbrains.kotlin.serialization.Type*\005\010d" + + "\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFA" + + "KE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHES" + + "IZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL\020\001" + + "\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010Mod" + + "ality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002", + "*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020" + + "\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVATE_" + + "TO_THIS\020\004\022\t\n\005LOCAL\020\005B\022B\rDebugProtoBuf\210\001\000" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -16706,7 +17081,7 @@ public final class DebugProtoBuf { internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_org_jetbrains_kotlin_serialization_Class_descriptor, - new java.lang.String[] { "Flags", "FqName", "DefaultObjectName", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", }); + new java.lang.String[] { "Flags", "FqName", "DefaultObjectName", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", "SecondaryConstructor", }); internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor = internal_static_org_jetbrains_kotlin_serialization_Class_descriptor.getNestedTypes().get(0); internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable = new diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java index 518e7c50410..e06edd1243a 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java @@ -7433,6 +7433,21 @@ public final class ProtoBuf { * */ org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor getPrimaryConstructor(); + + // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + java.util.List + getSecondaryConstructorList(); + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + org.jetbrains.kotlin.serialization.ProtoBuf.Callable getSecondaryConstructor(int index); + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + int getSecondaryConstructorCount(); } /** * Protobuf type {@code org.jetbrains.kotlin.serialization.Class} @@ -7571,6 +7586,14 @@ public final class ProtoBuf { bitField0_ |= 0x00000008; break; } + case 114: { + if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + secondaryConstructor_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000200; + } + secondaryConstructor_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.PARSER, extensionRegistry)); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -7594,6 +7617,9 @@ public final class ProtoBuf { if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_); } + if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + secondaryConstructor_ = java.util.Collections.unmodifiableList(secondaryConstructor_); + } makeExtensionsImmutable(); } } @@ -8420,6 +8446,42 @@ public final class ProtoBuf { return primaryConstructor_; } + // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + public static final int SECONDARY_CONSTRUCTOR_FIELD_NUMBER = 14; + private java.util.List secondaryConstructor_; + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public java.util.List getSecondaryConstructorList() { + return secondaryConstructor_; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public java.util.List + getSecondaryConstructorOrBuilderList() { + return secondaryConstructor_; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public int getSecondaryConstructorCount() { + return secondaryConstructor_.size(); + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getSecondaryConstructor(int index) { + return secondaryConstructor_.get(index); + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public org.jetbrains.kotlin.serialization.ProtoBuf.CallableOrBuilder getSecondaryConstructorOrBuilder( + int index) { + return secondaryConstructor_.get(index); + } + private void initFields() { flags_ = 0; fqName_ = 0; @@ -8430,6 +8492,7 @@ public final class ProtoBuf { member_ = java.util.Collections.emptyList(); enumEntry_ = java.util.Collections.emptyList(); primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); + secondaryConstructor_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -8464,6 +8527,12 @@ public final class ProtoBuf { return false; } } + for (int i = 0; i < getSecondaryConstructorCount(); i++) { + if (!getSecondaryConstructor(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } if (!extensionsAreInitialized()) { memoizedIsInitialized = 0; return false; @@ -8505,6 +8574,9 @@ public final class ProtoBuf { if (((bitField0_ & 0x00000008) == 0x00000008)) { output.writeMessage(13, primaryConstructor_); } + for (int i = 0; i < secondaryConstructor_.size(); i++) { + output.writeMessage(14, secondaryConstructor_.get(i)); + } extensionWriter.writeUntil(200, output); } @@ -8560,6 +8632,10 @@ public final class ProtoBuf { size += com.google.protobuf.CodedOutputStream .computeMessageSize(13, primaryConstructor_); } + for (int i = 0; i < secondaryConstructor_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(14, secondaryConstructor_.get(i)); + } size += extensionsSerializedSize(); memoizedSerializedSize = size; return size; @@ -8669,6 +8745,8 @@ public final class ProtoBuf { bitField0_ = (bitField0_ & ~0x00000080); primaryConstructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000100); + secondaryConstructor_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000200); return this; } @@ -8733,6 +8811,11 @@ public final class ProtoBuf { to_bitField0_ |= 0x00000008; } result.primaryConstructor_ = primaryConstructor_; + if (((bitField0_ & 0x00000200) == 0x00000200)) { + secondaryConstructor_ = java.util.Collections.unmodifiableList(secondaryConstructor_); + bitField0_ = (bitField0_ & ~0x00000200); + } + result.secondaryConstructor_ = secondaryConstructor_; result.bitField0_ = to_bitField0_; return result; } @@ -8801,6 +8884,16 @@ public final class ProtoBuf { if (other.hasPrimaryConstructor()) { mergePrimaryConstructor(other.getPrimaryConstructor()); } + if (!other.secondaryConstructor_.isEmpty()) { + if (secondaryConstructor_.isEmpty()) { + secondaryConstructor_ = other.secondaryConstructor_; + bitField0_ = (bitField0_ & ~0x00000200); + } else { + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.addAll(other.secondaryConstructor_); + } + + } this.mergeExtensionFields(other); return this; } @@ -8834,6 +8927,12 @@ public final class ProtoBuf { return false; } } + for (int i = 0; i < getSecondaryConstructorCount(); i++) { + if (!getSecondaryConstructor(i).isInitialized()) { + + return false; + } + } if (!extensionsAreInitialized()) { return false; @@ -9638,6 +9737,131 @@ public final class ProtoBuf { return this; } + // repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + private java.util.List secondaryConstructor_ = + java.util.Collections.emptyList(); + private void ensureSecondaryConstructorIsMutable() { + if (!((bitField0_ & 0x00000200) == 0x00000200)) { + secondaryConstructor_ = new java.util.ArrayList(secondaryConstructor_); + bitField0_ |= 0x00000200; + } + } + + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public java.util.List getSecondaryConstructorList() { + return java.util.Collections.unmodifiableList(secondaryConstructor_); + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public int getSecondaryConstructorCount() { + return secondaryConstructor_.size(); + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public org.jetbrains.kotlin.serialization.ProtoBuf.Callable getSecondaryConstructor(int index) { + return secondaryConstructor_.get(index); + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder setSecondaryConstructor( + int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) { + if (value == null) { + throw new NullPointerException(); + } + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.set(index, value); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder setSecondaryConstructor( + int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) { + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.set(index, builderForValue.build()); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder addSecondaryConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) { + if (value == null) { + throw new NullPointerException(); + } + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.add(value); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder addSecondaryConstructor( + int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable value) { + if (value == null) { + throw new NullPointerException(); + } + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.add(index, value); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder addSecondaryConstructor( + org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) { + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.add(builderForValue.build()); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder addSecondaryConstructor( + int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.Builder builderForValue) { + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.add(index, builderForValue.build()); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder addAllSecondaryConstructor( + java.lang.Iterable values) { + ensureSecondaryConstructorIsMutable(); + super.addAll(values, secondaryConstructor_); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder clearSecondaryConstructor() { + secondaryConstructor_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000200); + + return this; + } + /** + * repeated .org.jetbrains.kotlin.serialization.Callable secondary_constructor = 14; + */ + public Builder removeSecondaryConstructor(int index) { + ensureSecondaryConstructorIsMutable(); + secondaryConstructor_.remove(index); + + return this; + } + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class) }