getValueParameterList() {
if (valueParameterBuilder_ == null) {
return java.util.Collections.unmodifiableList(valueParameter_);
} else {
@@ -15970,7 +14567,7 @@ public final class DebugProtoBuf {
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
@@ -15984,13 +14581,13 @@ public final class DebugProtoBuf {
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index) {
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getValueParameter(int index) {
if (valueParameterBuilder_ == null) {
return valueParameter_.get(index);
} else {
@@ -15998,14 +14595,14 @@ public final class DebugProtoBuf {
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder setValueParameter(
- int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter value) {
+ int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
if (valueParameterBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -16019,14 +14616,14 @@ public final class DebugProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder setValueParameter(
- int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+ int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
if (valueParameterBuilder_ == null) {
ensureValueParameterIsMutable();
valueParameter_.set(index, builderForValue.build());
@@ -16037,13 +14634,13 @@ public final class DebugProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public Builder addValueParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter value) {
+ public Builder addValueParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
if (valueParameterBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -16057,14 +14654,14 @@ public final class DebugProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder addValueParameter(
- int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter value) {
+ int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
if (valueParameterBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -16078,14 +14675,14 @@ public final class DebugProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder addValueParameter(
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
if (valueParameterBuilder_ == null) {
ensureValueParameterIsMutable();
valueParameter_.add(builderForValue.build());
@@ -16096,14 +14693,14 @@ public final class DebugProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder addValueParameter(
- int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+ int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
if (valueParameterBuilder_ == null) {
ensureValueParameterIsMutable();
valueParameter_.add(index, builderForValue.build());
@@ -16114,14 +14711,14 @@ public final class DebugProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder addAllValueParameter(
- java.lang.Iterable values) {
+ java.lang.Iterable values) {
if (valueParameterBuilder_ == null) {
ensureValueParameterIsMutable();
super.addAll(values, valueParameter_);
@@ -16132,7 +14729,7 @@ public final class DebugProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
@@ -16149,7 +14746,7 @@ public final class DebugProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
@@ -16166,24 +14763,24 @@ public final class DebugProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder getValueParameterBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder getValueParameterBuilder(
int index) {
return getValueParameterFieldBuilder().getBuilder(index);
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
int index) {
if (valueParameterBuilder_ == null) {
return valueParameter_.get(index); } else {
@@ -16191,13 +14788,13 @@ public final class DebugProtoBuf {
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public java.util.List
+ public java.util.List
getValueParameterOrBuilderList() {
if (valueParameterBuilder_ != null) {
return valueParameterBuilder_.getMessageOrBuilderList();
@@ -16206,45 +14803,45 @@ public final class DebugProtoBuf {
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder addValueParameterBuilder() {
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder() {
return getValueParameterFieldBuilder().addBuilder(
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance());
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance());
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder addValueParameterBuilder(
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder(
int index) {
return getValueParameterFieldBuilder().addBuilder(
- index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance());
+ index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance());
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public java.util.List
+ public java.util.List
getValueParameterBuilderList() {
return getValueParameterFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder>
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder>
getValueParameterFieldBuilder() {
if (valueParameterBuilder_ == null) {
valueParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder>(
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder>(
valueParameter_,
((bitField0_ & 0x00000040) == 0x00000040),
getParentForChildren(),
@@ -16382,6 +14979,966 @@ public final class DebugProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Callable)
}
+ public interface ValueParameterOrBuilder extends
+ com.google.protobuf.GeneratedMessage.
+ ExtendableMessageOrBuilder {
+
+ // optional int32 flags = 1;
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ boolean hasFlags();
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ int getFlags();
+
+ // required int32 name = 2;
+ /**
+ * required int32 name = 2;
+ */
+ boolean hasName();
+ /**
+ * required int32 name = 2;
+ */
+ int getName();
+
+ // required .org.jetbrains.kotlin.serialization.Type type = 3;
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ boolean hasType();
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType();
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
+
+ // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ boolean hasVarargElementType();
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getVarargElementType();
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder();
+ }
+ /**
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.ValueParameter}
+ */
+ public static final class ValueParameter extends
+ com.google.protobuf.GeneratedMessage.ExtendableMessage<
+ ValueParameter> implements ValueParameterOrBuilder {
+ // Use ValueParameter.newBuilder() to construct.
+ private ValueParameter(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+ super(builder);
+ this.unknownFields = builder.getUnknownFields();
+ }
+ private ValueParameter(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+ private static final ValueParameter defaultInstance;
+ public static ValueParameter getDefaultInstance() {
+ return defaultInstance;
+ }
+
+ public ValueParameter getDefaultInstanceForType() {
+ return defaultInstance;
+ }
+
+ private final com.google.protobuf.UnknownFieldSet unknownFields;
+ @java.lang.Override
+ public final com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private ValueParameter(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ initFields();
+ int mutable_bitField0_ = 0;
+ com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ default: {
+ if (!parseUnknownField(input, unknownFields,
+ extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ case 8: {
+ bitField0_ |= 0x00000001;
+ flags_ = input.readInt32();
+ break;
+ }
+ case 16: {
+ bitField0_ |= 0x00000002;
+ name_ = input.readInt32();
+ break;
+ }
+ case 26: {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ subBuilder = type_.toBuilder();
+ }
+ type_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(type_);
+ type_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000004;
+ break;
+ }
+ case 34: {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ subBuilder = varargElementType_.toBuilder();
+ }
+ varargElementType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(varargElementType_);
+ varargElementType_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000008;
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e.getMessage()).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder.class);
+ }
+
+ public static com.google.protobuf.Parser PARSER =
+ new com.google.protobuf.AbstractParser() {
+ public ValueParameter parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new ValueParameter(input, extensionRegistry);
+ }
+ };
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ private int bitField0_;
+ // optional int32 flags = 1;
+ public static final int FLAGS_FIELD_NUMBER = 1;
+ private int flags_;
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public boolean hasFlags() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public int getFlags() {
+ return flags_;
+ }
+
+ // required int32 name = 2;
+ public static final int NAME_FIELD_NUMBER = 2;
+ private int name_;
+ /**
+ * required int32 name = 2;
+ */
+ public boolean hasName() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * required int32 name = 2;
+ */
+ public int getName() {
+ return name_;
+ }
+
+ // required .org.jetbrains.kotlin.serialization.Type type = 3;
+ public static final int TYPE_FIELD_NUMBER = 3;
+ private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_;
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
+ return type_;
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
+ return type_;
+ }
+
+ // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4;
+ private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type varargElementType_;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public boolean hasVarargElementType() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getVarargElementType() {
+ return varargElementType_;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() {
+ return varargElementType_;
+ }
+
+ private void initFields() {
+ flags_ = 0;
+ name_ = 0;
+ type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+ varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+ }
+ private byte memoizedIsInitialized = -1;
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasName()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!hasType()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!getType().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (hasVarargElementType()) {
+ if (!getVarargElementType().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
+ if (!extensionsAreInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ getSerializedSize();
+ com.google.protobuf.GeneratedMessage
+ .ExtendableMessage.ExtensionWriter extensionWriter =
+ newExtensionWriter();
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeInt32(1, flags_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeInt32(2, name_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeMessage(3, type_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeMessage(4, varargElementType_);
+ }
+ extensionWriter.writeUntil(200, output);
+ getUnknownFields().writeTo(output);
+ }
+
+ private int memoizedSerializedSize = -1;
+ public int getSerializedSize() {
+ int size = memoizedSerializedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(1, flags_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(2, name_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(3, type_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(4, varargElementType_);
+ }
+ size += extensionsSerializedSize();
+ size += getUnknownFields().getSerializedSize();
+ memoizedSerializedSize = size;
+ return size;
+ }
+
+ private static final long serialVersionUID = 0L;
+ @java.lang.Override
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
+ return super.writeReplace();
+ }
+
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input);
+ }
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+
+ public static Builder newBuilder() { return Builder.create(); }
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter prototype) {
+ return newBuilder().mergeFrom(prototype);
+ }
+ public Builder toBuilder() { return newBuilder(this); }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.ValueParameter}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessage.ExtendableBuilder<
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, Builder> implements org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
+ }
+
+ protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder.class);
+ }
+
+ // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+ getTypeFieldBuilder();
+ getVarargElementTypeFieldBuilder();
+ }
+ }
+ private static Builder create() {
+ return new Builder();
+ }
+
+ public Builder clear() {
+ super.clear();
+ flags_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ name_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ if (typeBuilder_ == null) {
+ type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+ } else {
+ typeBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000004);
+ if (varargElementTypeBuilder_ == null) {
+ varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+ } else {
+ varargElementTypeBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
+ return this;
+ }
+
+ public Builder clone() {
+ return create().mergeFrom(buildPartial());
+ }
+
+ public com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
+ }
+
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getDefaultInstanceForType() {
+ return org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance();
+ }
+
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter build() {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter buildPartial() {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.flags_ = flags_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.name_ = name_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ if (typeBuilder_ == null) {
+ result.type_ = type_;
+ } else {
+ result.type_ = typeBuilder_.build();
+ }
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ if (varargElementTypeBuilder_ == null) {
+ result.varargElementType_ = varargElementType_;
+ } else {
+ result.varargElementType_ = varargElementTypeBuilder_.build();
+ }
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
+ }
+
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter) {
+ return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter other) {
+ if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance()) return this;
+ if (other.hasFlags()) {
+ setFlags(other.getFlags());
+ }
+ if (other.hasName()) {
+ setName(other.getName());
+ }
+ if (other.hasType()) {
+ mergeType(other.getType());
+ }
+ if (other.hasVarargElementType()) {
+ mergeVarargElementType(other.getVarargElementType());
+ }
+ this.mergeExtensionFields(other);
+ this.mergeUnknownFields(other.getUnknownFields());
+ return this;
+ }
+
+ public final boolean isInitialized() {
+ if (!hasName()) {
+
+ return false;
+ }
+ if (!hasType()) {
+
+ return false;
+ }
+ if (!getType().isInitialized()) {
+
+ return false;
+ }
+ if (hasVarargElementType()) {
+ if (!getVarargElementType().isInitialized()) {
+
+ return false;
+ }
+ }
+ if (!extensionsAreInitialized()) {
+
+ return false;
+ }
+ return true;
+ }
+
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter) e.getUnfinishedMessage();
+ throw e;
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int bitField0_;
+
+ // optional int32 flags = 1;
+ private int flags_ ;
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public boolean hasFlags() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public int getFlags() {
+ return flags_;
+ }
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public Builder setFlags(int value) {
+ bitField0_ |= 0x00000001;
+ flags_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public Builder clearFlags() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ flags_ = 0;
+ onChanged();
+ return this;
+ }
+
+ // required int32 name = 2;
+ private int name_ ;
+ /**
+ * required int32 name = 2;
+ */
+ public boolean hasName() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * required int32 name = 2;
+ */
+ public int getName() {
+ return name_;
+ }
+ /**
+ * required int32 name = 2;
+ */
+ public Builder setName(int value) {
+ bitField0_ |= 0x00000002;
+ name_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * required int32 name = 2;
+ */
+ public Builder clearName() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ name_ = 0;
+ onChanged();
+ return this;
+ }
+
+ // required .org.jetbrains.kotlin.serialization.Type type = 3;
+ private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
+ if (typeBuilder_ == null) {
+ return type_;
+ } else {
+ return typeBuilder_.getMessage();
+ }
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public Builder setType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+ if (typeBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ type_ = value;
+ onChanged();
+ } else {
+ typeBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000004;
+ return this;
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public Builder setType(
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+ if (typeBuilder_ == null) {
+ type_ = builderForValue.build();
+ onChanged();
+ } else {
+ typeBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000004;
+ return this;
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public Builder mergeType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+ if (typeBuilder_ == null) {
+ if (((bitField0_ & 0x00000004) == 0x00000004) &&
+ type_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+ type_ =
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+ } else {
+ type_ = value;
+ }
+ onChanged();
+ } else {
+ typeBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000004;
+ return this;
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public Builder clearType() {
+ if (typeBuilder_ == null) {
+ type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+ onChanged();
+ } else {
+ typeBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000004);
+ return this;
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() {
+ bitField0_ |= 0x00000004;
+ onChanged();
+ return getTypeFieldBuilder().getBuilder();
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
+ if (typeBuilder_ != null) {
+ return typeBuilder_.getMessageOrBuilder();
+ } else {
+ return type_;
+ }
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ private com.google.protobuf.SingleFieldBuilder<
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>
+ getTypeFieldBuilder() {
+ if (typeBuilder_ == null) {
+ typeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+ type_,
+ getParentForChildren(),
+ isClean());
+ type_ = null;
+ }
+ return typeBuilder_;
+ }
+
+ // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+ private com.google.protobuf.SingleFieldBuilder<
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> varargElementTypeBuilder_;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public boolean hasVarargElementType() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getVarargElementType() {
+ if (varargElementTypeBuilder_ == null) {
+ return varargElementType_;
+ } else {
+ return varargElementTypeBuilder_.getMessage();
+ }
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public Builder setVarargElementType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+ if (varargElementTypeBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ varargElementType_ = value;
+ onChanged();
+ } else {
+ varargElementTypeBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public Builder setVarargElementType(
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+ if (varargElementTypeBuilder_ == null) {
+ varargElementType_ = builderForValue.build();
+ onChanged();
+ } else {
+ varargElementTypeBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public Builder mergeVarargElementType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+ if (varargElementTypeBuilder_ == null) {
+ if (((bitField0_ & 0x00000008) == 0x00000008) &&
+ varargElementType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+ varargElementType_ =
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
+ } else {
+ varargElementType_ = value;
+ }
+ onChanged();
+ } else {
+ varargElementTypeBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public Builder clearVarargElementType() {
+ if (varargElementTypeBuilder_ == null) {
+ varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+ onChanged();
+ } else {
+ varargElementTypeBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getVarargElementTypeBuilder() {
+ bitField0_ |= 0x00000008;
+ onChanged();
+ return getVarargElementTypeFieldBuilder().getBuilder();
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() {
+ if (varargElementTypeBuilder_ != null) {
+ return varargElementTypeBuilder_.getMessageOrBuilder();
+ } else {
+ return varargElementType_;
+ }
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ private com.google.protobuf.SingleFieldBuilder<
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>
+ getVarargElementTypeFieldBuilder() {
+ if (varargElementTypeBuilder_ == null) {
+ varargElementTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+ varargElementType_,
+ getParentForChildren(),
+ isClean());
+ varargElementType_ = null;
+ }
+ return varargElementTypeBuilder_;
+ }
+
+ // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.ValueParameter)
+ }
+
+ static {
+ defaultInstance = new ValueParameter(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.ValueParameter)
+ }
+
private static com.google.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor;
private static
@@ -16448,10 +16005,10 @@ public final class DebugProtoBuf {
com.google.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_Callable_fieldAccessorTable;
private static com.google.protobuf.Descriptors.Descriptor
- internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_descriptor;
+ internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
private static
com.google.protobuf.GeneratedMessage.FieldAccessorTable
- internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_fieldAccessorTable;
+ internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
@@ -16531,29 +16088,29 @@ public final class DebugProtoBuf {
"TION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\024\n\020COMPANION_OB" +
"JECT\020\006*\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\013" +
"2,.org.jetbrains.kotlin.serialization.Ca",
- "llable*\005\010d\020\310\001\"\314\005\n\010Callable\022\r\n\005flags\030\001 \001(" +
+ "llable*\005\010d\020\310\001\"\370\002\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.jetb" +
"rains.kotlin.serialization.TypeParameter" +
"\022?\n\rreceiver_type\030\005 \001(\0132(.org.jetbrains." +
"kotlin.serialization.Type\022\022\n\004name\030\006 \002(\005B" +
- "\004\210\265\030\001\022T\n\017value_parameter\030\007 \003(\0132;.org.jet" +
- "brains.kotlin.serialization.Callable.Val" +
- "ueParameter\022=\n\013return_type\030\010 \002(\0132(.org.j" +
- "etbrains.kotlin.serialization.Type\032\271\001\n\016V",
- "alueParameter\022\r\n\005flags\030\001 \001(\005\022\022\n\004name\030\002 \002" +
- "(\005B\004\210\265\030\001\0226\n\004type\030\003 \002(\0132(.org.jetbrains.k" +
- "otlin.serialization.Type\022E\n\023vararg_eleme" +
- "nt_type\030\004 \001(\0132(.org.jetbrains.kotlin.ser" +
- "ialization.Type*\005\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013" +
- "DECLARATION\020\000\022\021\n\rFAKE_OVERRIDE\020\001\022\016\n\nDELE" +
- "GATION\020\002\022\017\n\013SYNTHESIZED\020\003\":\n\014CallableKin" +
- "d\022\007\n\003FUN\020\000\022\007\n\003VAL\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUC" +
- "TOR\020\003*\005\010d\020\310\001*9\n\010Modality\022\t\n\005FINAL\020\000\022\010\n\004O" +
- "PEN\020\001\022\014\n\010ABSTRACT\020\002\022\n\n\006SEALED\020\003*b\n\nVisib",
- "ility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE\020\001\022\r\n\tPROT" +
- "ECTED\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"
+ "\004\210\265\030\001\022K\n\017value_parameter\030\007 \003(\01322.org.jet" +
+ "brains.kotlin.serialization.ValueParamet" +
+ "er\022=\n\013return_type\030\010 \002(\0132(.org.jetbrains." +
+ "kotlin.serialization.Type*\005\010d\020\310\001\"\271\001\n\016Val",
+ "ueParameter\022\r\n\005flags\030\001 \001(\005\022\022\n\004name\030\002 \002(\005" +
+ "B\004\210\265\030\001\0226\n\004type\030\003 \002(\0132(.org.jetbrains.kot" +
+ "lin.serialization.Type\022E\n\023vararg_element" +
+ "_type\030\004 \001(\0132(.org.jetbrains.kotlin.seria" +
+ "lization.Type*\005\010d\020\310\001*9\n\010Modality\022\t\n\005FINA" +
+ "L\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020\002\022\n\n\006SEALED\020\003*" +
+ "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_T" +
+ "O_THIS\020\004\022\t\n\005LOCAL\020\005*:\n\014CallableKind\022\007\n\003F" +
+ "UN\020\000\022\007\n\003VAL\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*",
+ "Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\rFAKE_O" +
+ "VERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHESIZED" +
+ "\020\003B\022B\rDebugProtoBuf\210\001\000"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -16638,11 +16195,11 @@ public final class DebugProtoBuf {
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor,
new java.lang.String[] { "Flags", "GetterFlags", "SetterFlags", "TypeParameter", "ReceiverType", "Name", "ValueParameter", "ReturnType", });
- internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_descriptor =
- internal_static_org_jetbrains_kotlin_serialization_Callable_descriptor.getNestedTypes().get(0);
- internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_fieldAccessorTable = new
+ internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor =
+ getDescriptor().getMessageTypes().get(8);
+ internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_org_jetbrains_kotlin_serialization_Callable_ValueParameter_descriptor,
+ internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor,
new java.lang.String[] { "Flags", "Name", "Type", "VarargElementType", });
com.google.protobuf.ExtensionRegistry registry =
com.google.protobuf.ExtensionRegistry.newInstance();
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
index f2a2163d826..e9e06130ac1 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
@@ -59,11 +59,11 @@ public final class DebugBuiltInsProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
/**
- * extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }
+ * extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }
*/
public static final
com.google.protobuf.GeneratedMessage.GeneratedExtension<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter,
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter,
java.util.List> parameterAnnotation = com.google.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
@@ -91,11 +91,11 @@ public final class DebugBuiltInsProtoBuf {
"ion.Annotation:\210\001\n\022compile_time_value\022,." +
"org.jetbrains.kotlin.serialization.Calla" +
"ble\030\227\001 \001(\0132=.org.jetbrains.kotlin.serial" +
- "ization.Annotation.Argument.Value:\212\001\n\024pa" +
- "rameter_annotation\022;.org.jetbrains.kotli" +
- "n.serialization.Callable.ValueParameter\030" +
- "\226\001 \003(\0132..org.jetbrains.kotlin.serializat" +
- "ion.AnnotationB\027B\025DebugBuiltInsProtoBuf"
+ "ization.Annotation.Argument.Value:\201\001\n\024pa" +
+ "rameter_annotation\0222.org.jetbrains.kotli" +
+ "n.serialization.ValueParameter\030\226\001 \003(\0132.." +
+ "org.jetbrains.kotlin.serialization.Annot" +
+ "ationB\027B\025DebugBuiltInsProtoBuf"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
index f726479765c..883602e8b4a 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
@@ -1836,11 +1836,11 @@ public final class DebugJsProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
/**
- * extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }
+ * extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }
*/
public static final
com.google.protobuf.GeneratedMessage.GeneratedExtension<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter,
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter,
java.util.List> parameterAnnotation = com.google.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
@@ -1896,14 +1896,14 @@ public final class DebugJsProtoBuf {
".Annotation:\210\001\n\022compile_time_value\022,.org" +
".jetbrains.kotlin.serialization.Callable" +
"\030\203\001 \001(\0132=.org.jetbrains.kotlin.serializa" +
- "tion.Annotation.Argument.Value:\212\001\n\024param" +
- "eter_annotation\022;.org.jetbrains.kotlin.s" +
- "erialization.Callable.ValueParameter\030\202\001 " +
- "\003(\0132..org.jetbrains.kotlin.serialization",
- ".Annotation:r\n\017type_annotation\022(.org.jet" +
- "brains.kotlin.serialization.Type\030\202\001 \003(\0132" +
- "..org.jetbrains.kotlin.serialization.Ann" +
- "otationB\021B\017DebugJsProtoBuf"
+ "tion.Annotation.Argument.Value:\201\001\n\024param" +
+ "eter_annotation\0222.org.jetbrains.kotlin.s" +
+ "erialization.ValueParameter\030\202\001 \003(\0132..org" +
+ ".jetbrains.kotlin.serialization.Annotati",
+ "on:r\n\017type_annotation\022(.org.jetbrains.ko" +
+ "tlin.serialization.Type\030\202\001 \003(\0132..org.jet" +
+ "brains.kotlin.serialization.AnnotationB\021" +
+ "B\017DebugJsProtoBuf"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
index 7816ac33e71..6ea0fc8f861 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
@@ -4578,11 +4578,11 @@ public final class DebugJvmProtoBuf {
null);
public static final int INDEX_FIELD_NUMBER = 100;
/**
- * extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }
+ * extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }
*/
public static final
com.google.protobuf.GeneratedMessage.GeneratedExtension<
- org.jetbrains.kotlin.serialization.DebugProtoBuf.Callable.ValueParameter,
+ org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter,
java.lang.Integer> index = com.google.protobuf.GeneratedMessage
.newFileScopedGeneratedExtension(
java.lang.Integer.class,
@@ -4672,12 +4672,12 @@ public final class DebugJvmProtoBuf {
"rains.kotlin.serialization.Type\030d \003(\0132.." +
"org.jetbrains.kotlin.serialization.Annot" +
"ation:8\n\006is_raw\022(.org.jetbrains.kotlin.s",
- "erialization.Type\030e \001(\010:J\n\005index\022;.org.j" +
- "etbrains.kotlin.serialization.Callable.V" +
- "alueParameter\030d \001(\005:s\n\020class_annotation\022" +
- ").org.jetbrains.kotlin.serialization.Cla" +
- "ss\030d \003(\0132..org.jetbrains.kotlin.serializ" +
- "ation.AnnotationB\022B\020DebugJvmProtoBuf"
+ "erialization.Type\030e \001(\010:A\n\005index\0222.org.j" +
+ "etbrains.kotlin.serialization.ValueParam" +
+ "eter\030d \001(\005:s\n\020class_annotation\022).org.jet" +
+ "brains.kotlin.serialization.Class\030d \003(\0132" +
+ "..org.jetbrains.kotlin.serialization.Ann" +
+ "otationB\022B\020DebugJvmProtoBuf"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/core/descriptor.loader.java/src/jvm_descriptors.proto b/core/descriptor.loader.java/src/jvm_descriptors.proto
index 99c0341f18a..772d553af90 100644
--- a/core/descriptor.loader.java/src/jvm_descriptors.proto
+++ b/core/descriptor.loader.java/src/jvm_descriptors.proto
@@ -107,7 +107,7 @@ extend org.jetbrains.kotlin.serialization.Type {
optional bool is_raw = 101;
}
-extend org.jetbrains.kotlin.serialization.Callable.ValueParameter {
+extend org.jetbrains.kotlin.serialization.ValueParameter {
// Index of the corresponding parameter of this method in JVM (counting receiver parameters, enum constructor synthetic parameters, etc.)
optional int32 index = 100;
}
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
index b25a8b189a6..76f77305f19 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
@@ -138,7 +138,7 @@ public abstract class AbstractBinaryClassAnnotationAndConstantLoader {
val methodSignature = getCallableSignature(callable, nameResolver, kind)
if (methodSignature != null) {
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
index bd469cc7f47..c6049c144ba 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
@@ -3785,14 +3785,14 @@ public final class JvmProtoBuf {
com.google.protobuf.WireFormat.FieldType.BOOL);
public static final int INDEX_FIELD_NUMBER = 100;
/**
- * extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }
+ * extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }
*/
public static final
com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter,
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter,
java.lang.Integer> index = com.google.protobuf.GeneratedMessageLite
.newSingularGeneratedExtension(
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance(),
0,
null,
null,
diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt
index fdc36916bd6..cb40ee6278d 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt
@@ -54,7 +54,7 @@ class BuiltInsAnnotationAndConstantLoader(
nameResolver: NameResolver,
kind: AnnotatedCallableKind,
parameterIndex: Int,
- proto: ProtoBuf.Callable.ValueParameter
+ proto: ProtoBuf.ValueParameter
): List {
val annotations = proto.getExtension(BuiltInsProtoBuf.parameterAnnotation).orEmpty()
return annotations.map { proto -> deserializer.deserializeAnnotation(proto, nameResolver) }
diff --git a/core/deserialization/src/builtins.proto b/core/deserialization/src/builtins.proto
index db9d7ec8e24..b4c11da5ce6 100644
--- a/core/deserialization/src/builtins.proto
+++ b/core/deserialization/src/builtins.proto
@@ -35,6 +35,6 @@ extend Callable {
optional Annotation.Argument.Value compile_time_value = 151;
}
-extend Callable.ValueParameter {
+extend ValueParameter {
repeated Annotation parameter_annotation = 150;
}
diff --git a/core/deserialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto
index b8d16393e01..2dad9a1f082 100644
--- a/core/deserialization/src/descriptors.proto
+++ b/core/deserialization/src/descriptors.proto
@@ -27,10 +27,9 @@ message StringTable {
}
message QualifiedNameTable {
-
message QualifiedName {
optional int32 parent_qualified_name = 1 [default = -1];
- // Id in the StringTable
+ // id in the StringTable
required int32 short_name = 2;
optional Kind kind = 3 [default = PACKAGE];
@@ -69,19 +68,17 @@ message Annotation {
// However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
optional Type type = 1;
- // Only one of the following values should be present. Consider using `oneof` instead when we upgrade to protobuf 2.6.0+
+ // Only one of the following values should be present
optional sint64 int_value = 2;
optional float float_value = 3;
optional double double_value = 4;
- // id in StringTable
optional int32 string_value = 5 [(string_id_in_table) = true];
- // If type = CLASS, FQ name id of the referenced class; if type = ENUM, FQ name id of the enum class
+ // If type = CLASS, FQ name of the referenced class; if type = ENUM, FQ name of the enum class
optional int32 class_id = 6 [(fq_name_id_in_table) = true];
- // id in StringTable
optional int32 enum_value_id = 7 [(name_id_in_table) = true];
optional Annotation annotation = 8;
@@ -89,12 +86,10 @@ message Annotation {
repeated Value array_element = 9;
}
- // id in StringTable
required int32 name_id = 1 [(name_id_in_table) = true];
required Value value = 2;
}
- // Class FQ name id
required int32 id = 1 [(fq_name_id_in_table) = true];
repeated Argument argument = 2;
@@ -117,27 +112,23 @@ message Type {
optional bool nullable = 3 [default = false];
- // Id in the StringTable
// If this field is set, the type is flexible.
// All the other fields and extensions represent its lower bound, and flexible_upper_bound must be set and represents its upper bound.
optional int32 flexible_type_capabilities_id = 4 [(string_id_in_table) = true];
- // While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- // we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- // to represent flexible types is too many wasted bytes.
optional Type flexible_upper_bound = 5;
- // Only one of the following values should be present. Consider using `oneof` instead when we upgrade to protobuf 2.6.0+
+ // Only one of the following values should be present
- optional int32 class_name = 6 [(fq_name_id_in_table) = true]; // fqName id
- optional int32 type_parameter = 7; // type parameter id
+ optional int32 class_name = 6 [(fq_name_id_in_table) = true];
+ optional int32 type_parameter = 7; // id of the type parameter
extensions 100 to 199;
}
message TypeParameter {
required int32 id = 1;
- // Id in the StringTable
+
required int32 name = 2 [(name_id_in_table) = true];
optional bool reified = 3 [default = false];
@@ -165,24 +156,21 @@ message Class {
}
/*
- Visibility
- Modality
- has_annotation
- ClassKind
- is_inner
- */
+ Visibility
+ Modality
+ hasAnnotations
+ ClassKind
+ isInner
+ */
optional int32 flags = 1 [default = 0 /*internal final class, no annotations*/];
required int32 fq_name = 3 [(fq_name_id_in_table) = true];
- // If this field is present, it contains the name of companion object.
optional int32 companion_object_name = 4 [(name_id_in_table) = true];
repeated TypeParameter type_parameter = 5;
repeated Type supertype = 6;
- // we store only names, because the actual information must reside in the corresponding .class files,
- // to be obtainable through reflection at runtime
repeated int32 nested_class_name = 7 [packed = true, (name_id_in_table) = true];
repeated Callable member = 11;
@@ -210,44 +198,28 @@ message Package {
}
message Callable {
- enum MemberKind {
- // 2 bits
- DECLARATION = 0;
- FAKE_OVERRIDE = 1;
- DELEGATION = 2;
- SYNTHESIZED = 3;
- }
-
- enum CallableKind {
- // 2 bits
- FUN = 0;
- VAL = 1;
- VAR = 2;
- CONSTRUCTOR = 3;
- }
-
/*
- Visibility
- Modality
- has_annotations
- CallableKind
- MemberKind
- hasGetter
- hasSetter
- hasConstant
- isConst
- lateinit
- isOperator
- isInfix
- */
+ Visibility
+ Modality
+ hasAnnotations
+ CallableKind
+ MemberKind
+ hasGetter
+ hasSetter
+ hasConstant
+ isConst
+ lateinit
+ isOperator
+ isInfix
+ */
optional int32 flags = 1;
/*
- isNotDefault
- Visibility
- Modality
- has_annotations
- */
+ isNotDefault
+ Visibility
+ Modality
+ hasAnnotations
+ */
optional int32 getter_flags = 9 /* absent => same as property */;
optional int32 setter_flags = 10 /* absent => same as property */;
@@ -255,24 +227,8 @@ message Callable {
optional Type receiver_type = 5;
- // Id in the StringTable
required int32 name = 6 [(name_id_in_table) = true];
- message ValueParameter {
- /*
- declaresDefault
- has_annotations
- */
- optional int32 flags = 1;
-
- // Id in the StringTable
- required int32 name = 2 [(name_id_in_table) = true];
- required Type type = 3;
- optional Type vararg_element_type = 4;
-
- extensions 100 to 199;
- }
-
// Value parameters for functions and constructors, or setter value parameter for properties
repeated ValueParameter value_parameter = 7;
@@ -281,6 +237,22 @@ message Callable {
extensions 100 to 199;
}
+message ValueParameter {
+ /*
+ declaresDefault
+ hasAnnotations
+ */
+ optional int32 flags = 1;
+
+ required int32 name = 2 [(name_id_in_table) = true];
+
+ required Type type = 3;
+
+ optional Type vararg_element_type = 4;
+
+ extensions 100 to 199;
+}
+
enum Modality {
// 2 bits
FINAL = 0x00;
@@ -298,3 +270,19 @@ enum Visibility {
PRIVATE_TO_THIS = 0x04;
LOCAL = 0x05;
}
+
+enum CallableKind {
+ // 2 bits
+ FUN = 0;
+ VAL = 1;
+ VAR = 2;
+ CONSTRUCTOR = 3;
+}
+
+enum MemberKind {
+ // 2 bits
+ DECLARATION = 0;
+ FAKE_OVERRIDE = 1;
+ DELEGATION = 2;
+ SYNTHESIZED = 3;
+}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
index 1337411b1e8..df1e78dbf7d 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
@@ -39,11 +39,9 @@ public class Flags {
// Callables
- public static final FlagField CALLABLE_KIND = FlagField.after(MODALITY,
- ProtoBuf.Callable.CallableKind.values());
+ public static final FlagField CALLABLE_KIND = FlagField.after(MODALITY, ProtoBuf.CallableKind.values());
- public static final FlagField MEMBER_KIND = FlagField.after(CALLABLE_KIND,
- ProtoBuf.Callable.MemberKind.values());
+ public static final FlagField MEMBER_KIND = FlagField.after(CALLABLE_KIND, ProtoBuf.MemberKind.values());
public static final FlagField HAS_GETTER = FlagField.booleanAfter(MEMBER_KIND);
public static final FlagField HAS_SETTER = FlagField.booleanAfter(HAS_GETTER);
public static final FlagField HAS_CONSTANT = FlagField.booleanAfter(HAS_SETTER);
@@ -117,7 +115,7 @@ public class Flags {
@NotNull Visibility visibility,
@NotNull Modality modality,
@NotNull CallableMemberDescriptor.Kind memberKind,
- @NotNull ProtoBuf.Callable.CallableKind callableKind,
+ @NotNull ProtoBuf.CallableKind callableKind,
boolean hasGetter,
boolean hasSetter,
boolean hasConstant,
@@ -193,16 +191,16 @@ public class Flags {
}
@NotNull
- private static ProtoBuf.Callable.MemberKind memberKind(@NotNull CallableMemberDescriptor.Kind kind) {
+ private static ProtoBuf.MemberKind memberKind(@NotNull CallableMemberDescriptor.Kind kind) {
switch (kind) {
case DECLARATION:
- return ProtoBuf.Callable.MemberKind.DECLARATION;
+ return ProtoBuf.MemberKind.DECLARATION;
case FAKE_OVERRIDE:
- return ProtoBuf.Callable.MemberKind.FAKE_OVERRIDE;
+ return ProtoBuf.MemberKind.FAKE_OVERRIDE;
case DELEGATION:
- return ProtoBuf.Callable.MemberKind.DELEGATION;
+ return ProtoBuf.MemberKind.DELEGATION;
case SYNTHESIZED:
- return ProtoBuf.Callable.MemberKind.SYNTHESIZED;
+ return ProtoBuf.MemberKind.SYNTHESIZED;
}
throw new IllegalArgumentException("Unknown member kind: " + kind);
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
index f98e178c727..d21257b92cd 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
@@ -190,6 +190,170 @@ public final class ProtoBuf {
// @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Visibility)
}
+ /**
+ * Protobuf enum {@code org.jetbrains.kotlin.serialization.CallableKind}
+ */
+ public enum CallableKind
+ implements com.google.protobuf.Internal.EnumLite {
+ /**
+ * FUN = 0;
+ *
+ *
+ * 2 bits
+ *
+ */
+ FUN(0, 0),
+ /**
+ * VAL = 1;
+ */
+ VAL(1, 1),
+ /**
+ * VAR = 2;
+ */
+ VAR(2, 2),
+ /**
+ * CONSTRUCTOR = 3;
+ */
+ CONSTRUCTOR(3, 3),
+ ;
+
+ /**
+ * FUN = 0;
+ *
+ *
+ * 2 bits
+ *
+ */
+ public static final int FUN_VALUE = 0;
+ /**
+ * VAL = 1;
+ */
+ public static final int VAL_VALUE = 1;
+ /**
+ * VAR = 2;
+ */
+ public static final int VAR_VALUE = 2;
+ /**
+ * CONSTRUCTOR = 3;
+ */
+ public static final int CONSTRUCTOR_VALUE = 3;
+
+
+ public final int getNumber() { return value; }
+
+ public static CallableKind valueOf(int value) {
+ switch (value) {
+ case 0: return FUN;
+ case 1: return VAL;
+ case 2: return VAR;
+ case 3: return CONSTRUCTOR;
+ default: return null;
+ }
+ }
+
+ public static com.google.protobuf.Internal.EnumLiteMap
+ internalGetValueMap() {
+ return internalValueMap;
+ }
+ private static com.google.protobuf.Internal.EnumLiteMap
+ internalValueMap =
+ new com.google.protobuf.Internal.EnumLiteMap() {
+ public CallableKind findValueByNumber(int number) {
+ return CallableKind.valueOf(number);
+ }
+ };
+
+ private final int value;
+
+ private CallableKind(int index, int value) {
+ this.value = value;
+ }
+
+ // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.CallableKind)
+ }
+
+ /**
+ * Protobuf enum {@code org.jetbrains.kotlin.serialization.MemberKind}
+ */
+ public enum MemberKind
+ implements com.google.protobuf.Internal.EnumLite {
+ /**
+ * DECLARATION = 0;
+ *
+ *
+ * 2 bits
+ *
+ */
+ DECLARATION(0, 0),
+ /**
+ * FAKE_OVERRIDE = 1;
+ */
+ FAKE_OVERRIDE(1, 1),
+ /**
+ * DELEGATION = 2;
+ */
+ DELEGATION(2, 2),
+ /**
+ * SYNTHESIZED = 3;
+ */
+ SYNTHESIZED(3, 3),
+ ;
+
+ /**
+ * DECLARATION = 0;
+ *
+ *
+ * 2 bits
+ *
+ */
+ public static final int DECLARATION_VALUE = 0;
+ /**
+ * FAKE_OVERRIDE = 1;
+ */
+ public static final int FAKE_OVERRIDE_VALUE = 1;
+ /**
+ * DELEGATION = 2;
+ */
+ public static final int DELEGATION_VALUE = 2;
+ /**
+ * SYNTHESIZED = 3;
+ */
+ public static final int SYNTHESIZED_VALUE = 3;
+
+
+ public final int getNumber() { return value; }
+
+ public static MemberKind valueOf(int value) {
+ switch (value) {
+ case 0: return DECLARATION;
+ case 1: return FAKE_OVERRIDE;
+ case 2: return DELEGATION;
+ case 3: return SYNTHESIZED;
+ default: return null;
+ }
+ }
+
+ public static com.google.protobuf.Internal.EnumLiteMap
+ internalGetValueMap() {
+ return internalValueMap;
+ }
+ private static com.google.protobuf.Internal.EnumLiteMap
+ internalValueMap =
+ new com.google.protobuf.Internal.EnumLiteMap() {
+ public MemberKind findValueByNumber(int number) {
+ return MemberKind.valueOf(number);
+ }
+ };
+
+ private final int value;
+
+ private MemberKind(int index, int value) {
+ this.value = value;
+ }
+
+ // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.MemberKind)
+ }
+
public interface StringTableOrBuilder
extends com.google.protobuf.MessageLiteOrBuilder {
@@ -740,7 +904,7 @@ public final class ProtoBuf {
* required int32 short_name = 2;
*
*
- * Id in the StringTable
+ * id in the StringTable
*
*/
boolean hasShortName();
@@ -748,7 +912,7 @@ public final class ProtoBuf {
* required int32 short_name = 2;
*
*
- * Id in the StringTable
+ * id in the StringTable
*
*/
int getShortName();
@@ -940,7 +1104,7 @@ public final class ProtoBuf {
* required int32 short_name = 2;
*
*
- * Id in the StringTable
+ * id in the StringTable
*
*/
public boolean hasShortName() {
@@ -950,7 +1114,7 @@ public final class ProtoBuf {
* required int32 short_name = 2;
*
*
- * Id in the StringTable
+ * id in the StringTable
*
*/
public int getShortName() {
@@ -1239,7 +1403,7 @@ public final class ProtoBuf {
* required int32 short_name = 2;
*
*
- * Id in the StringTable
+ * id in the StringTable
*
*/
public boolean hasShortName() {
@@ -1249,7 +1413,7 @@ public final class ProtoBuf {
* required int32 short_name = 2;
*
*
- * Id in the StringTable
+ * id in the StringTable
*
*/
public int getShortName() {
@@ -1259,7 +1423,7 @@ public final class ProtoBuf {
* required int32 short_name = 2;
*
*
- * Id in the StringTable
+ * id in the StringTable
*
*/
public Builder setShortName(int value) {
@@ -1272,7 +1436,7 @@ public final class ProtoBuf {
* required int32 short_name = 2;
*
*
- * Id in the StringTable
+ * id in the StringTable
*
*/
public Builder clearShortName() {
@@ -1710,18 +1874,10 @@ public final class ProtoBuf {
// required int32 id = 1;
/**
* required int32 id = 1;
- *
- *
- * Class FQ name id
- *
*/
boolean hasId();
/**
* required int32 id = 1;
- *
- *
- * Class FQ name id
- *
*/
int getId();
@@ -1831,18 +1987,10 @@ public final class ProtoBuf {
// required int32 name_id = 1;
/**
* required int32 name_id = 1;
- *
- *
- * id in StringTable
- *
*/
boolean hasNameId();
/**
* required int32 name_id = 1;
- *
- *
- * id in StringTable
- *
*/
int getNameId();
@@ -2001,18 +2149,10 @@ public final class ProtoBuf {
// optional int32 string_value = 5;
/**
* optional int32 string_value = 5;
- *
- *
- * id in StringTable
- *
*/
boolean hasStringValue();
/**
* optional int32 string_value = 5;
- *
- *
- * id in StringTable
- *
*/
int getStringValue();
@@ -2021,7 +2161,7 @@ public final class ProtoBuf {
* optional int32 class_id = 6;
*
*
- * If type = CLASS, FQ name id of the referenced class; if type = ENUM, FQ name id of the enum class
+ * If type = CLASS, FQ name of the referenced class; if type = ENUM, FQ name of the enum class
*
*/
boolean hasClassId();
@@ -2029,7 +2169,7 @@ public final class ProtoBuf {
* optional int32 class_id = 6;
*
*
- * If type = CLASS, FQ name id of the referenced class; if type = ENUM, FQ name id of the enum class
+ * If type = CLASS, FQ name of the referenced class; if type = ENUM, FQ name of the enum class
*
*/
int getClassId();
@@ -2037,18 +2177,10 @@ public final class ProtoBuf {
// optional int32 enum_value_id = 7;
/**
* optional int32 enum_value_id = 7;
- *
- *
- * id in StringTable
- *
*/
boolean hasEnumValueId();
/**
* optional int32 enum_value_id = 7;
- *
- *
- * id in StringTable
- *
*/
int getEnumValueId();
@@ -2446,20 +2578,12 @@ public final class ProtoBuf {
private int stringValue_;
/**
* optional int32 string_value = 5;
- *
- *
- * id in StringTable
- *
*/
public boolean hasStringValue() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* optional int32 string_value = 5;
- *
- *
- * id in StringTable
- *
*/
public int getStringValue() {
return stringValue_;
@@ -2472,7 +2596,7 @@ public final class ProtoBuf {
* optional int32 class_id = 6;
*
*
- * If type = CLASS, FQ name id of the referenced class; if type = ENUM, FQ name id of the enum class
+ * If type = CLASS, FQ name of the referenced class; if type = ENUM, FQ name of the enum class
*
*/
public boolean hasClassId() {
@@ -2482,7 +2606,7 @@ public final class ProtoBuf {
* optional int32 class_id = 6;
*
*
- * If type = CLASS, FQ name id of the referenced class; if type = ENUM, FQ name id of the enum class
+ * If type = CLASS, FQ name of the referenced class; if type = ENUM, FQ name of the enum class
*
*/
public int getClassId() {
@@ -2494,20 +2618,12 @@ public final class ProtoBuf {
private int enumValueId_;
/**
* optional int32 enum_value_id = 7;
- *
- *
- * id in StringTable
- *
*/
public boolean hasEnumValueId() {
return ((bitField0_ & 0x00000040) == 0x00000040);
}
/**
* optional int32 enum_value_id = 7;
- *
- *
- * id in StringTable
- *
*/
public int getEnumValueId() {
return enumValueId_;
@@ -3081,30 +3197,18 @@ public final class ProtoBuf {
private int stringValue_ ;
/**
* optional int32 string_value = 5;
- *
- *
- * id in StringTable
- *
*/
public boolean hasStringValue() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* optional int32 string_value = 5;
- *
- *
- * id in StringTable
- *
*/
public int getStringValue() {
return stringValue_;
}
/**
* optional int32 string_value = 5;
- *
- *
- * id in StringTable
- *
*/
public Builder setStringValue(int value) {
bitField0_ |= 0x00000010;
@@ -3114,10 +3218,6 @@ public final class ProtoBuf {
}
/**
* optional int32 string_value = 5;
- *
- *
- * id in StringTable
- *
*/
public Builder clearStringValue() {
bitField0_ = (bitField0_ & ~0x00000010);
@@ -3132,7 +3232,7 @@ public final class ProtoBuf {
* optional int32 class_id = 6;
*
*
- * If type = CLASS, FQ name id of the referenced class; if type = ENUM, FQ name id of the enum class
+ * If type = CLASS, FQ name of the referenced class; if type = ENUM, FQ name of the enum class
*
*/
public boolean hasClassId() {
@@ -3142,7 +3242,7 @@ public final class ProtoBuf {
* optional int32 class_id = 6;
*
*
- * If type = CLASS, FQ name id of the referenced class; if type = ENUM, FQ name id of the enum class
+ * If type = CLASS, FQ name of the referenced class; if type = ENUM, FQ name of the enum class
*
*/
public int getClassId() {
@@ -3152,7 +3252,7 @@ public final class ProtoBuf {
* optional int32 class_id = 6;
*
*
- * If type = CLASS, FQ name id of the referenced class; if type = ENUM, FQ name id of the enum class
+ * If type = CLASS, FQ name of the referenced class; if type = ENUM, FQ name of the enum class
*
*/
public Builder setClassId(int value) {
@@ -3165,7 +3265,7 @@ public final class ProtoBuf {
* optional int32 class_id = 6;
*
*
- * If type = CLASS, FQ name id of the referenced class; if type = ENUM, FQ name id of the enum class
+ * If type = CLASS, FQ name of the referenced class; if type = ENUM, FQ name of the enum class
*
*/
public Builder clearClassId() {
@@ -3179,30 +3279,18 @@ public final class ProtoBuf {
private int enumValueId_ ;
/**
* optional int32 enum_value_id = 7;
- *
- *
- * id in StringTable
- *
*/
public boolean hasEnumValueId() {
return ((bitField0_ & 0x00000040) == 0x00000040);
}
/**
* optional int32 enum_value_id = 7;
- *
- *
- * id in StringTable
- *
*/
public int getEnumValueId() {
return enumValueId_;
}
/**
* optional int32 enum_value_id = 7;
- *
- *
- * id in StringTable
- *
*/
public Builder setEnumValueId(int value) {
bitField0_ |= 0x00000040;
@@ -3212,10 +3300,6 @@ public final class ProtoBuf {
}
/**
* optional int32 enum_value_id = 7;
- *
- *
- * id in StringTable
- *
*/
public Builder clearEnumValueId() {
bitField0_ = (bitField0_ & ~0x00000040);
@@ -3427,20 +3511,12 @@ public final class ProtoBuf {
private int nameId_;
/**
* required int32 name_id = 1;
- *
- *
- * id in StringTable
- *
*/
public boolean hasNameId() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* required int32 name_id = 1;
- *
- *
- * id in StringTable
- *
*/
public int getNameId() {
return nameId_;
@@ -3692,30 +3768,18 @@ public final class ProtoBuf {
private int nameId_ ;
/**
* required int32 name_id = 1;
- *
- *
- * id in StringTable
- *
*/
public boolean hasNameId() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* required int32 name_id = 1;
- *
- *
- * id in StringTable
- *
*/
public int getNameId() {
return nameId_;
}
/**
* required int32 name_id = 1;
- *
- *
- * id in StringTable
- *
*/
public Builder setNameId(int value) {
bitField0_ |= 0x00000001;
@@ -3725,10 +3789,6 @@ public final class ProtoBuf {
}
/**
* required int32 name_id = 1;
- *
- *
- * id in StringTable
- *
*/
public Builder clearNameId() {
bitField0_ = (bitField0_ & ~0x00000001);
@@ -3815,20 +3875,12 @@ public final class ProtoBuf {
private int id_;
/**
* required int32 id = 1;
- *
- *
- * Class FQ name id
- *
*/
public boolean hasId() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* required int32 id = 1;
- *
- *
- * Class FQ name id
- *
*/
public int getId() {
return id_;
@@ -4104,30 +4156,18 @@ public final class ProtoBuf {
private int id_ ;
/**
* required int32 id = 1;
- *
- *
- * Class FQ name id
- *
*/
public boolean hasId() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* required int32 id = 1;
- *
- *
- * Class FQ name id
- *
*/
public int getId() {
return id_;
}
/**
* required int32 id = 1;
- *
- *
- * Class FQ name id
- *
*/
public Builder setId(int value) {
bitField0_ |= 0x00000001;
@@ -4137,10 +4177,6 @@ public final class ProtoBuf {
}
/**
* required int32 id = 1;
- *
- *
- * Class FQ name id
- *
*/
public Builder clearId() {
bitField0_ = (bitField0_ & ~0x00000001);
@@ -4319,7 +4355,6 @@ public final class ProtoBuf {
* optional int32 flexible_type_capabilities_id = 4;
*
*
- * Id in the StringTable
* If this field is set, the type is flexible.
* All the other fields and extensions represent its lower bound, and flexible_upper_bound must be set and represents its upper bound.
*
@@ -4329,7 +4364,6 @@ public final class ProtoBuf {
* optional int32 flexible_type_capabilities_id = 4;
*
*
- * Id in the StringTable
* If this field is set, the type is flexible.
* All the other fields and extensions represent its lower bound, and flexible_upper_bound must be set and represents its upper bound.
*
@@ -4339,40 +4373,20 @@ public final class ProtoBuf {
// optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
- *
- *
- * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- * we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- * to represent flexible types is too many wasted bytes.
- *
*/
boolean hasFlexibleUpperBound();
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
- *
- *
- * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- * we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- * to represent flexible types is too many wasted bytes.
- *
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound();
// optional int32 class_name = 6;
/**
* optional int32 class_name = 6;
- *
- *
- * fqName id
- *
*/
boolean hasClassName();
/**
* optional int32 class_name = 6;
- *
- *
- * fqName id
- *
*/
int getClassName();
@@ -4381,7 +4395,7 @@ public final class ProtoBuf {
* optional int32 type_parameter = 7;
*
*
- * type parameter id
+ * id of the type parameter
*
*/
boolean hasTypeParameter();
@@ -4389,7 +4403,7 @@ public final class ProtoBuf {
* optional int32 type_parameter = 7;
*
*
- * type parameter id
+ * id of the type parameter
*
*/
int getTypeParameter();
@@ -5150,7 +5164,6 @@ public final class ProtoBuf {
* optional int32 flexible_type_capabilities_id = 4;
*
*
- * Id in the StringTable
* If this field is set, the type is flexible.
* All the other fields and extensions represent its lower bound, and flexible_upper_bound must be set and represents its upper bound.
*
@@ -5162,7 +5175,6 @@ public final class ProtoBuf {
* optional int32 flexible_type_capabilities_id = 4;
*
*
- * Id in the StringTable
* If this field is set, the type is flexible.
* All the other fields and extensions represent its lower bound, and flexible_upper_bound must be set and represents its upper bound.
*
@@ -5176,24 +5188,12 @@ public final class ProtoBuf {
private org.jetbrains.kotlin.serialization.ProtoBuf.Type flexibleUpperBound_;
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
- *
- *
- * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- * we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- * to represent flexible types is too many wasted bytes.
- *
*/
public boolean hasFlexibleUpperBound() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
- *
- *
- * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- * we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- * to represent flexible types is too many wasted bytes.
- *
*/
public org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound() {
return flexibleUpperBound_;
@@ -5204,20 +5204,12 @@ public final class ProtoBuf {
private int className_;
/**
* optional int32 class_name = 6;
- *
- *
- * fqName id
- *
*/
public boolean hasClassName() {
return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* optional int32 class_name = 6;
- *
- *
- * fqName id
- *
*/
public int getClassName() {
return className_;
@@ -5230,7 +5222,7 @@ public final class ProtoBuf {
* optional int32 type_parameter = 7;
*
*
- * type parameter id
+ * id of the type parameter
*
*/
public boolean hasTypeParameter() {
@@ -5240,7 +5232,7 @@ public final class ProtoBuf {
* optional int32 type_parameter = 7;
*
*
- * type parameter id
+ * id of the type parameter
*
*/
public int getTypeParameter() {
@@ -5726,7 +5718,6 @@ public final class ProtoBuf {
* optional int32 flexible_type_capabilities_id = 4;
*
*
- * Id in the StringTable
* If this field is set, the type is flexible.
* All the other fields and extensions represent its lower bound, and flexible_upper_bound must be set and represents its upper bound.
*
@@ -5738,7 +5729,6 @@ public final class ProtoBuf {
* optional int32 flexible_type_capabilities_id = 4;
*
*
- * Id in the StringTable
* If this field is set, the type is flexible.
* All the other fields and extensions represent its lower bound, and flexible_upper_bound must be set and represents its upper bound.
*
@@ -5750,7 +5740,6 @@ public final class ProtoBuf {
* optional int32 flexible_type_capabilities_id = 4;
*
*
- * Id in the StringTable
* If this field is set, the type is flexible.
* All the other fields and extensions represent its lower bound, and flexible_upper_bound must be set and represents its upper bound.
*
@@ -5765,7 +5754,6 @@ public final class ProtoBuf {
* optional int32 flexible_type_capabilities_id = 4;
*
*
- * Id in the StringTable
* If this field is set, the type is flexible.
* All the other fields and extensions represent its lower bound, and flexible_upper_bound must be set and represents its upper bound.
*
@@ -5781,36 +5769,18 @@ public final class ProtoBuf {
private org.jetbrains.kotlin.serialization.ProtoBuf.Type flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
- *
- *
- * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- * we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- * to represent flexible types is too many wasted bytes.
- *
*/
public boolean hasFlexibleUpperBound() {
return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
- *
- *
- * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- * we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- * to represent flexible types is too many wasted bytes.
- *
*/
public org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound() {
return flexibleUpperBound_;
}
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
- *
- *
- * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- * we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- * to represent flexible types is too many wasted bytes.
- *
*/
public Builder setFlexibleUpperBound(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
if (value == null) {
@@ -5823,12 +5793,6 @@ public final class ProtoBuf {
}
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
- *
- *
- * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- * we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- * to represent flexible types is too many wasted bytes.
- *
*/
public Builder setFlexibleUpperBound(
org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
@@ -5839,12 +5803,6 @@ public final class ProtoBuf {
}
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
- *
- *
- * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- * we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- * to represent flexible types is too many wasted bytes.
- *
*/
public Builder mergeFlexibleUpperBound(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
if (((bitField0_ & 0x00000008) == 0x00000008) &&
@@ -5860,12 +5818,6 @@ public final class ProtoBuf {
}
/**
* optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
- *
- *
- * While such an "indirect" encoding helps backwards compatibility with pre-flexible-types versions of this format,
- * we use it mainly to save space: having a special mandatory tag on each an every type just to have an option
- * to represent flexible types is too many wasted bytes.
- *
*/
public Builder clearFlexibleUpperBound() {
flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
@@ -5878,30 +5830,18 @@ public final class ProtoBuf {
private int className_ ;
/**
* optional int32 class_name = 6;
- *
- *
- * fqName id
- *
*/
public boolean hasClassName() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* optional int32 class_name = 6;
- *
- *
- * fqName id
- *
*/
public int getClassName() {
return className_;
}
/**
* optional int32 class_name = 6;
- *
- *
- * fqName id
- *
*/
public Builder setClassName(int value) {
bitField0_ |= 0x00000010;
@@ -5911,10 +5851,6 @@ public final class ProtoBuf {
}
/**
* optional int32 class_name = 6;
- *
- *
- * fqName id
- *
*/
public Builder clearClassName() {
bitField0_ = (bitField0_ & ~0x00000010);
@@ -5929,7 +5865,7 @@ public final class ProtoBuf {
* optional int32 type_parameter = 7;
*
*
- * type parameter id
+ * id of the type parameter
*
*/
public boolean hasTypeParameter() {
@@ -5939,7 +5875,7 @@ public final class ProtoBuf {
* optional int32 type_parameter = 7;
*
*
- * type parameter id
+ * id of the type parameter
*
*/
public int getTypeParameter() {
@@ -5949,7 +5885,7 @@ public final class ProtoBuf {
* optional int32 type_parameter = 7;
*
*
- * type parameter id
+ * id of the type parameter
*
*/
public Builder setTypeParameter(int value) {
@@ -5962,7 +5898,7 @@ public final class ProtoBuf {
* optional int32 type_parameter = 7;
*
*
- * type parameter id
+ * id of the type parameter
*
*/
public Builder clearTypeParameter() {
@@ -5999,18 +5935,10 @@ public final class ProtoBuf {
// required int32 name = 2;
/**
* required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
*/
boolean hasName();
/**
* required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
*/
int getName();
@@ -6240,20 +6168,12 @@ public final class ProtoBuf {
private int name_;
/**
* required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
*/
public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
*/
public int getName() {
return name_;
@@ -6653,30 +6573,18 @@ public final class ProtoBuf {
private int name_ ;
/**
* required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
*/
public boolean hasName() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
*/
public int getName() {
return name_;
}
/**
* required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
*/
public Builder setName(int value) {
bitField0_ |= 0x00000002;
@@ -6686,10 +6594,6 @@ public final class ProtoBuf {
}
/**
* required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
*/
public Builder clearName() {
bitField0_ = (bitField0_ & ~0x00000002);
@@ -6915,9 +6819,9 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotation
+ *hasAnnotations
*ClassKind
- *is_inner
+ *isInner
*
*/
boolean hasFlags();
@@ -6928,9 +6832,9 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotation
+ *hasAnnotations
*ClassKind
- *is_inner
+ *isInner
*
*/
int getFlags();
@@ -6948,18 +6852,10 @@ public final class ProtoBuf {
// optional int32 companion_object_name = 4;
/**
* optional int32 companion_object_name = 4;
- *
- *
- * If this field is present, it contains the name of companion object.
- *
*/
boolean hasCompanionObjectName();
/**
* optional int32 companion_object_name = 4;
- *
- *
- * If this field is present, it contains the name of companion object.
- *
*/
int getCompanionObjectName();
@@ -6996,29 +6892,14 @@ public final class ProtoBuf {
// repeated int32 nested_class_name = 7 [packed = true];
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
java.util.List getNestedClassNameList();
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
int getNestedClassNameCount();
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
int getNestedClassName(int index);
@@ -7834,9 +7715,9 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotation
+ *hasAnnotations
*ClassKind
- *is_inner
+ *isInner
*
*/
public boolean hasFlags() {
@@ -7849,9 +7730,9 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotation
+ *hasAnnotations
*ClassKind
- *is_inner
+ *isInner
*
*/
public int getFlags() {
@@ -7879,20 +7760,12 @@ public final class ProtoBuf {
private int companionObjectName_;
/**
* optional int32 companion_object_name = 4;
- *
- *
- * If this field is present, it contains the name of companion object.
- *
*/
public boolean hasCompanionObjectName() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional int32 companion_object_name = 4;
- *
- *
- * If this field is present, it contains the name of companion object.
- *
*/
public int getCompanionObjectName() {
return companionObjectName_;
@@ -7975,11 +7848,6 @@ public final class ProtoBuf {
private java.util.List nestedClassName_;
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
public java.util.List
getNestedClassNameList() {
@@ -7987,22 +7855,12 @@ public final class ProtoBuf {
}
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
public int getNestedClassNameCount() {
return nestedClassName_.size();
}
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
public int getNestedClassName(int index) {
return nestedClassName_.get(index);
@@ -8633,9 +8491,9 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotation
+ *hasAnnotations
*ClassKind
- *is_inner
+ *isInner
*
*/
public boolean hasFlags() {
@@ -8648,9 +8506,9 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotation
+ *hasAnnotations
*ClassKind
- *is_inner
+ *isInner
*
*/
public int getFlags() {
@@ -8663,9 +8521,9 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotation
+ *hasAnnotations
*ClassKind
- *is_inner
+ *isInner
*
*/
public Builder setFlags(int value) {
@@ -8681,9 +8539,9 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotation
+ *hasAnnotations
*ClassKind
- *is_inner
+ *isInner
*
*/
public Builder clearFlags() {
@@ -8730,30 +8588,18 @@ public final class ProtoBuf {
private int companionObjectName_ ;
/**
* optional int32 companion_object_name = 4;
- *
- *
- * If this field is present, it contains the name of companion object.
- *
*/
public boolean hasCompanionObjectName() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* optional int32 companion_object_name = 4;
- *
- *
- * If this field is present, it contains the name of companion object.
- *
*/
public int getCompanionObjectName() {
return companionObjectName_;
}
/**
* optional int32 companion_object_name = 4;
- *
- *
- * If this field is present, it contains the name of companion object.
- *
*/
public Builder setCompanionObjectName(int value) {
bitField0_ |= 0x00000004;
@@ -8763,10 +8609,6 @@ public final class ProtoBuf {
}
/**
* optional int32 companion_object_name = 4;
- *
- *
- * If this field is present, it contains the name of companion object.
- *
*/
public Builder clearCompanionObjectName() {
bitField0_ = (bitField0_ & ~0x00000004);
@@ -9035,11 +8877,6 @@ public final class ProtoBuf {
}
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
public java.util.List
getNestedClassNameList() {
@@ -9047,33 +8884,18 @@ public final class ProtoBuf {
}
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
public int getNestedClassNameCount() {
return nestedClassName_.size();
}
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
public int getNestedClassName(int index) {
return nestedClassName_.get(index);
}
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
public Builder setNestedClassName(
int index, int value) {
@@ -9084,11 +8906,6 @@ public final class ProtoBuf {
}
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
public Builder addNestedClassName(int value) {
ensureNestedClassNameIsMutable();
@@ -9098,11 +8915,6 @@ public final class ProtoBuf {
}
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
public Builder addAllNestedClassName(
java.lang.Iterable values) {
@@ -9113,11 +8925,6 @@ public final class ProtoBuf {
}
/**
* repeated int32 nested_class_name = 7 [packed = true];
- *
- *
- * we store only names, because the actual information must reside in the corresponding .class files,
- * to be obtainable through reflection at runtime
- *
*/
public Builder clearNestedClassName() {
nestedClassName_ = java.util.Collections.emptyList();
@@ -10037,7 +9844,7 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*CallableKind
*MemberKind
*hasGetter
@@ -10046,6 +9853,7 @@ public final class ProtoBuf {
*isConst
*lateinit
*isOperator
+ *isInfix
*
*/
boolean hasFlags();
@@ -10056,7 +9864,7 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*CallableKind
*MemberKind
*hasGetter
@@ -10065,6 +9873,7 @@ public final class ProtoBuf {
*isConst
*lateinit
*isOperator
+ *isInfix
*
*/
int getFlags();
@@ -10078,7 +9887,7 @@ public final class ProtoBuf {
*isNotDefault
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*
*/
boolean hasGetterFlags();
@@ -10090,7 +9899,7 @@ public final class ProtoBuf {
*isNotDefault
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*
*/
int getGetterFlags();
@@ -10133,41 +9942,33 @@ public final class ProtoBuf {
// required int32 name = 6;
/**
* required int32 name = 6;
- *
- *
- * Id in the StringTable
- *
*/
boolean hasName();
/**
* required int32 name = 6;
- *
- *
- * Id in the StringTable
- *
*/
int getName();
- // repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- java.util.List
+ java.util.List
getValueParameterList();
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter getValueParameter(int index);
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index);
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
@@ -10261,10 +10062,10 @@ public final class ProtoBuf {
}
case 58: {
if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
- valueParameter_ = new java.util.ArrayList();
+ valueParameter_ = new java.util.ArrayList();
mutable_bitField0_ |= 0x00000040;
}
- valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.PARSER, extensionRegistry));
+ valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.PARSER, extensionRegistry));
break;
}
case 66: {
@@ -10322,948 +10123,6 @@ public final class ProtoBuf {
return PARSER;
}
- /**
- * Protobuf enum {@code org.jetbrains.kotlin.serialization.Callable.MemberKind}
- */
- public enum MemberKind
- implements com.google.protobuf.Internal.EnumLite {
- /**
- * DECLARATION = 0;
- *
- *
- * 2 bits
- *
- */
- DECLARATION(0, 0),
- /**
- * FAKE_OVERRIDE = 1;
- */
- FAKE_OVERRIDE(1, 1),
- /**
- * DELEGATION = 2;
- */
- DELEGATION(2, 2),
- /**
- * SYNTHESIZED = 3;
- */
- SYNTHESIZED(3, 3),
- ;
-
- /**
- * DECLARATION = 0;
- *
- *
- * 2 bits
- *
- */
- public static final int DECLARATION_VALUE = 0;
- /**
- * FAKE_OVERRIDE = 1;
- */
- public static final int FAKE_OVERRIDE_VALUE = 1;
- /**
- * DELEGATION = 2;
- */
- public static final int DELEGATION_VALUE = 2;
- /**
- * SYNTHESIZED = 3;
- */
- public static final int SYNTHESIZED_VALUE = 3;
-
-
- public final int getNumber() { return value; }
-
- public static MemberKind valueOf(int value) {
- switch (value) {
- case 0: return DECLARATION;
- case 1: return FAKE_OVERRIDE;
- case 2: return DELEGATION;
- case 3: return SYNTHESIZED;
- default: return null;
- }
- }
-
- public static com.google.protobuf.Internal.EnumLiteMap
- internalGetValueMap() {
- return internalValueMap;
- }
- private static com.google.protobuf.Internal.EnumLiteMap
- internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap() {
- public MemberKind findValueByNumber(int number) {
- return MemberKind.valueOf(number);
- }
- };
-
- private final int value;
-
- private MemberKind(int index, int value) {
- this.value = value;
- }
-
- // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Callable.MemberKind)
- }
-
- /**
- * Protobuf enum {@code org.jetbrains.kotlin.serialization.Callable.CallableKind}
- */
- public enum CallableKind
- implements com.google.protobuf.Internal.EnumLite {
- /**
- * FUN = 0;
- *
- *
- * 2 bits
- *
- */
- FUN(0, 0),
- /**
- * VAL = 1;
- */
- VAL(1, 1),
- /**
- * VAR = 2;
- */
- VAR(2, 2),
- /**
- * CONSTRUCTOR = 3;
- */
- CONSTRUCTOR(3, 3),
- ;
-
- /**
- * FUN = 0;
- *
- *
- * 2 bits
- *
- */
- public static final int FUN_VALUE = 0;
- /**
- * VAL = 1;
- */
- public static final int VAL_VALUE = 1;
- /**
- * VAR = 2;
- */
- public static final int VAR_VALUE = 2;
- /**
- * CONSTRUCTOR = 3;
- */
- public static final int CONSTRUCTOR_VALUE = 3;
-
-
- public final int getNumber() { return value; }
-
- public static CallableKind valueOf(int value) {
- switch (value) {
- case 0: return FUN;
- case 1: return VAL;
- case 2: return VAR;
- case 3: return CONSTRUCTOR;
- default: return null;
- }
- }
-
- public static com.google.protobuf.Internal.EnumLiteMap
- internalGetValueMap() {
- return internalValueMap;
- }
- private static com.google.protobuf.Internal.EnumLiteMap
- internalValueMap =
- new com.google.protobuf.Internal.EnumLiteMap() {
- public CallableKind findValueByNumber(int number) {
- return CallableKind.valueOf(number);
- }
- };
-
- private final int value;
-
- private CallableKind(int index, int value) {
- this.value = value;
- }
-
- // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Callable.CallableKind)
- }
-
- public interface ValueParameterOrBuilder extends
- com.google.protobuf.GeneratedMessageLite.
- ExtendableMessageOrBuilder {
-
- // optional int32 flags = 1;
- /**
- * optional int32 flags = 1;
- *
- *
- *
- *declaresDefault
- *has_annotations
- *
- */
- boolean hasFlags();
- /**
- * optional int32 flags = 1;
- *
- *
- *
- *declaresDefault
- *has_annotations
- *
- */
- int getFlags();
-
- // required int32 name = 2;
- /**
- * required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
- */
- boolean hasName();
- /**
- * required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
- */
- int getName();
-
- // required .org.jetbrains.kotlin.serialization.Type type = 3;
- /**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
- */
- boolean hasType();
- /**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
- */
- org.jetbrains.kotlin.serialization.ProtoBuf.Type getType();
-
- // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- /**
- * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- */
- boolean hasVarargElementType();
- /**
- * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- */
- org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType();
- }
- /**
- * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable.ValueParameter}
- */
- public static final class ValueParameter extends
- com.google.protobuf.GeneratedMessageLite.ExtendableMessage<
- ValueParameter> implements ValueParameterOrBuilder {
- // Use ValueParameter.newBuilder() to construct.
- private ValueParameter(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
- super(builder);
-
- }
- private ValueParameter(boolean noInit) {}
-
- private static final ValueParameter defaultInstance;
- public static ValueParameter getDefaultInstance() {
- return defaultInstance;
- }
-
- public ValueParameter getDefaultInstanceForType() {
- return defaultInstance;
- }
-
- private ValueParameter(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- initFields();
- int mutable_bitField0_ = 0;
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- default: {
- if (!parseUnknownField(input,
- extensionRegistry, tag)) {
- done = true;
- }
- break;
- }
- case 8: {
- bitField0_ |= 0x00000001;
- flags_ = input.readInt32();
- break;
- }
- case 16: {
- bitField0_ |= 0x00000002;
- name_ = input.readInt32();
- break;
- }
- case 26: {
- org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
- subBuilder = type_.toBuilder();
- }
- type_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
- if (subBuilder != null) {
- subBuilder.mergeFrom(type_);
- type_ = subBuilder.buildPartial();
- }
- bitField0_ |= 0x00000004;
- break;
- }
- case 34: {
- org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
- subBuilder = varargElementType_.toBuilder();
- }
- varargElementType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
- if (subBuilder != null) {
- subBuilder.mergeFrom(varargElementType_);
- varargElementType_ = subBuilder.buildPartial();
- }
- bitField0_ |= 0x00000008;
- break;
- }
- }
- }
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.setUnfinishedMessage(this);
- } catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(
- e.getMessage()).setUnfinishedMessage(this);
- } finally {
- makeExtensionsImmutable();
- }
- }
- public static com.google.protobuf.Parser PARSER =
- new com.google.protobuf.AbstractParser() {
- public ValueParameter parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return new ValueParameter(input, extensionRegistry);
- }
- };
-
- @java.lang.Override
- public com.google.protobuf.Parser getParserForType() {
- return PARSER;
- }
-
- private int bitField0_;
- // optional int32 flags = 1;
- public static final int FLAGS_FIELD_NUMBER = 1;
- private int flags_;
- /**
- * optional int32 flags = 1;
- *
- *
- *
- *declaresDefault
- *has_annotations
- *
- */
- public boolean hasFlags() {
- return ((bitField0_ & 0x00000001) == 0x00000001);
- }
- /**
- * optional int32 flags = 1;
- *
- *
- *
- *declaresDefault
- *has_annotations
- *
- */
- public int getFlags() {
- return flags_;
- }
-
- // required int32 name = 2;
- public static final int NAME_FIELD_NUMBER = 2;
- private int name_;
- /**
- * required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
- */
- public boolean hasName() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
- */
- public int getName() {
- return name_;
- }
-
- // required .org.jetbrains.kotlin.serialization.Type type = 3;
- public static final int TYPE_FIELD_NUMBER = 3;
- private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_;
- /**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
- */
- public boolean hasType() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
- }
- /**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
- */
- public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
- return type_;
- }
-
- // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4;
- private org.jetbrains.kotlin.serialization.ProtoBuf.Type varargElementType_;
- /**
- * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- */
- public boolean hasVarargElementType() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
- }
- /**
- * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- */
- public org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType() {
- return varargElementType_;
- }
-
- private void initFields() {
- flags_ = 0;
- name_ = 0;
- type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- }
- private byte memoizedIsInitialized = -1;
- public final boolean isInitialized() {
- byte isInitialized = memoizedIsInitialized;
- if (isInitialized != -1) return isInitialized == 1;
-
- if (!hasName()) {
- memoizedIsInitialized = 0;
- return false;
- }
- if (!hasType()) {
- memoizedIsInitialized = 0;
- return false;
- }
- if (!getType().isInitialized()) {
- memoizedIsInitialized = 0;
- return false;
- }
- if (hasVarargElementType()) {
- if (!getVarargElementType().isInitialized()) {
- memoizedIsInitialized = 0;
- return false;
- }
- }
- if (!extensionsAreInitialized()) {
- memoizedIsInitialized = 0;
- return false;
- }
- memoizedIsInitialized = 1;
- return true;
- }
-
- public void writeTo(com.google.protobuf.CodedOutputStream output)
- throws java.io.IOException {
- getSerializedSize();
- com.google.protobuf.GeneratedMessageLite
- .ExtendableMessage.ExtensionWriter extensionWriter =
- newExtensionWriter();
- if (((bitField0_ & 0x00000001) == 0x00000001)) {
- output.writeInt32(1, flags_);
- }
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeInt32(2, name_);
- }
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
- output.writeMessage(3, type_);
- }
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
- output.writeMessage(4, varargElementType_);
- }
- extensionWriter.writeUntil(200, output);
- }
-
- private int memoizedSerializedSize = -1;
- public int getSerializedSize() {
- int size = memoizedSerializedSize;
- if (size != -1) return size;
-
- size = 0;
- if (((bitField0_ & 0x00000001) == 0x00000001)) {
- size += com.google.protobuf.CodedOutputStream
- .computeInt32Size(1, flags_);
- }
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- size += com.google.protobuf.CodedOutputStream
- .computeInt32Size(2, name_);
- }
- if (((bitField0_ & 0x00000004) == 0x00000004)) {
- size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(3, type_);
- }
- if (((bitField0_ & 0x00000008) == 0x00000008)) {
- size += com.google.protobuf.CodedOutputStream
- .computeMessageSize(4, varargElementType_);
- }
- size += extensionsSerializedSize();
- memoizedSerializedSize = size;
- return size;
- }
-
- private static final long serialVersionUID = 0L;
- @java.lang.Override
- protected java.lang.Object writeReplace()
- throws java.io.ObjectStreamException {
- return super.writeReplace();
- }
-
- public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
- com.google.protobuf.ByteString data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
- com.google.protobuf.ByteString data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(byte[] data)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data);
- }
- public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
- byte[] data,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return PARSER.parseFrom(data, extensionRegistry);
- }
- public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(java.io.InputStream input)
- throws java.io.IOException {
- return PARSER.parseFrom(input);
- }
- public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseFrom(input, extensionRegistry);
- }
- public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseDelimitedFrom(java.io.InputStream input)
- throws java.io.IOException {
- return PARSER.parseDelimitedFrom(input);
- }
- public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseDelimitedFrom(
- java.io.InputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseDelimitedFrom(input, extensionRegistry);
- }
- public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
- com.google.protobuf.CodedInputStream input)
- throws java.io.IOException {
- return PARSER.parseFrom(input);
- }
- public static org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parseFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- return PARSER.parseFrom(input, extensionRegistry);
- }
-
- public static Builder newBuilder() { return Builder.create(); }
- public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter prototype) {
- return newBuilder().mergeFrom(prototype);
- }
- public Builder toBuilder() { return newBuilder(this); }
-
- /**
- * Protobuf type {@code org.jetbrains.kotlin.serialization.Callable.ValueParameter}
- */
- public static final class Builder extends
- com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameterOrBuilder {
- // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
-
- private void maybeForceBuilderInitialization() {
- }
- private static Builder create() {
- return new Builder();
- }
-
- public Builder clear() {
- super.clear();
- flags_ = 0;
- bitField0_ = (bitField0_ & ~0x00000001);
- name_ = 0;
- bitField0_ = (bitField0_ & ~0x00000002);
- type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000004);
- varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- bitField0_ = (bitField0_ & ~0x00000008);
- return this;
- }
-
- public Builder clone() {
- return create().mergeFrom(buildPartial());
- }
-
- public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter getDefaultInstanceForType() {
- return org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance();
- }
-
- public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter build() {
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter result = buildPartial();
- if (!result.isInitialized()) {
- throw newUninitializedMessageException(result);
- }
- return result;
- }
-
- public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter buildPartial() {
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter result = new org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter(this);
- int from_bitField0_ = bitField0_;
- int to_bitField0_ = 0;
- if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
- to_bitField0_ |= 0x00000001;
- }
- result.flags_ = flags_;
- if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
- to_bitField0_ |= 0x00000002;
- }
- result.name_ = name_;
- if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
- to_bitField0_ |= 0x00000004;
- }
- result.type_ = type_;
- if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
- to_bitField0_ |= 0x00000008;
- }
- result.varargElementType_ = varargElementType_;
- result.bitField0_ = to_bitField0_;
- return result;
- }
-
- public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter other) {
- if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance()) return this;
- if (other.hasFlags()) {
- setFlags(other.getFlags());
- }
- if (other.hasName()) {
- setName(other.getName());
- }
- if (other.hasType()) {
- mergeType(other.getType());
- }
- if (other.hasVarargElementType()) {
- mergeVarargElementType(other.getVarargElementType());
- }
- this.mergeExtensionFields(other);
- return this;
- }
-
- public final boolean isInitialized() {
- if (!hasName()) {
-
- return false;
- }
- if (!hasType()) {
-
- return false;
- }
- if (!getType().isInitialized()) {
-
- return false;
- }
- if (hasVarargElementType()) {
- if (!getVarargElementType().isInitialized()) {
-
- return false;
- }
- }
- if (!extensionsAreInitialized()) {
-
- return false;
- }
- return true;
- }
-
- public Builder mergeFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws java.io.IOException {
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter parsedMessage = null;
- try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter) e.getUnfinishedMessage();
- throw e;
- } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
- return this;
- }
- private int bitField0_;
-
- // optional int32 flags = 1;
- private int flags_ ;
- /**
- * optional int32 flags = 1;
- *
- *
- *
- *declaresDefault
- *has_annotations
- *
- */
- public boolean hasFlags() {
- return ((bitField0_ & 0x00000001) == 0x00000001);
- }
- /**
- * optional int32 flags = 1;
- *
- *
- *
- *declaresDefault
- *has_annotations
- *
- */
- public int getFlags() {
- return flags_;
- }
- /**
- * optional int32 flags = 1;
- *
- *
- *
- *declaresDefault
- *has_annotations
- *
- */
- public Builder setFlags(int value) {
- bitField0_ |= 0x00000001;
- flags_ = value;
-
- return this;
- }
- /**
- * optional int32 flags = 1;
- *
- *
- *
- *declaresDefault
- *has_annotations
- *
- */
- public Builder clearFlags() {
- bitField0_ = (bitField0_ & ~0x00000001);
- flags_ = 0;
-
- return this;
- }
-
- // required int32 name = 2;
- private int name_ ;
- /**
- * required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
- */
- public boolean hasName() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
- }
- /**
- * required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
- */
- public int getName() {
- return name_;
- }
- /**
- * required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
- */
- public Builder setName(int value) {
- bitField0_ |= 0x00000002;
- name_ = value;
-
- return this;
- }
- /**
- * required int32 name = 2;
- *
- *
- * Id in the StringTable
- *
- */
- public Builder clearName() {
- bitField0_ = (bitField0_ & ~0x00000002);
- name_ = 0;
-
- return this;
- }
-
- // required .org.jetbrains.kotlin.serialization.Type type = 3;
- private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- /**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
- */
- public boolean hasType() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
- }
- /**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
- */
- public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
- return type_;
- }
- /**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
- */
- public Builder setType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
- if (value == null) {
- throw new NullPointerException();
- }
- type_ = value;
-
- bitField0_ |= 0x00000004;
- return this;
- }
- /**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
- */
- public Builder setType(
- org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
- type_ = builderForValue.build();
-
- bitField0_ |= 0x00000004;
- return this;
- }
- /**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
- */
- public Builder mergeType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
- if (((bitField0_ & 0x00000004) == 0x00000004) &&
- type_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
- type_ =
- org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
- } else {
- type_ = value;
- }
-
- bitField0_ |= 0x00000004;
- return this;
- }
- /**
- * required .org.jetbrains.kotlin.serialization.Type type = 3;
- */
- public Builder clearType() {
- type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
-
- bitField0_ = (bitField0_ & ~0x00000004);
- return this;
- }
-
- // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- private org.jetbrains.kotlin.serialization.ProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
- /**
- * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- */
- public boolean hasVarargElementType() {
- return ((bitField0_ & 0x00000008) == 0x00000008);
- }
- /**
- * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- */
- public org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType() {
- return varargElementType_;
- }
- /**
- * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- */
- public Builder setVarargElementType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
- if (value == null) {
- throw new NullPointerException();
- }
- varargElementType_ = value;
-
- bitField0_ |= 0x00000008;
- return this;
- }
- /**
- * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- */
- public Builder setVarargElementType(
- org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
- varargElementType_ = builderForValue.build();
-
- bitField0_ |= 0x00000008;
- return this;
- }
- /**
- * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- */
- public Builder mergeVarargElementType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
- if (((bitField0_ & 0x00000008) == 0x00000008) &&
- varargElementType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
- varargElementType_ =
- org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
- } else {
- varargElementType_ = value;
- }
-
- bitField0_ |= 0x00000008;
- return this;
- }
- /**
- * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
- */
- public Builder clearVarargElementType() {
- varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
-
- bitField0_ = (bitField0_ & ~0x00000008);
- return this;
- }
-
- // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Callable.ValueParameter)
- }
-
- static {
- defaultInstance = new ValueParameter(true);
- defaultInstance.initFields();
- }
-
- // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Callable.ValueParameter)
- }
-
private int bitField0_;
// optional int32 flags = 1;
public static final int FLAGS_FIELD_NUMBER = 1;
@@ -11275,7 +10134,7 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*CallableKind
*MemberKind
*hasGetter
@@ -11284,6 +10143,7 @@ public final class ProtoBuf {
*isConst
*lateinit
*isOperator
+ *isInfix
*
*/
public boolean hasFlags() {
@@ -11296,7 +10156,7 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*CallableKind
*MemberKind
*hasGetter
@@ -11305,6 +10165,7 @@ public final class ProtoBuf {
*isConst
*lateinit
*isOperator
+ *isInfix
*
*/
public int getFlags() {
@@ -11322,7 +10183,7 @@ public final class ProtoBuf {
*isNotDefault
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*
*/
public boolean hasGetterFlags() {
@@ -11336,7 +10197,7 @@ public final class ProtoBuf {
*isNotDefault
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*
*/
public int getGetterFlags() {
@@ -11416,51 +10277,43 @@ public final class ProtoBuf {
private int name_;
/**
* required int32 name = 6;
- *
- *
- * Id in the StringTable
- *
*/
public boolean hasName() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* required int32 name = 6;
- *
- *
- * Id in the StringTable
- *
*/
public int getName() {
return name_;
}
- // repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
public static final int VALUE_PARAMETER_FIELD_NUMBER = 7;
- private java.util.List valueParameter_;
+ private java.util.List valueParameter_;
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public java.util.List getValueParameterList() {
+ public java.util.List getValueParameterList() {
return valueParameter_;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public java.util.List
+ public java.util.List
getValueParameterOrBuilderList() {
return valueParameter_;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
@@ -11470,23 +10323,23 @@ public final class ProtoBuf {
return valueParameter_.size();
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter getValueParameter(int index) {
+ public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index) {
return valueParameter_.get(index);
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder(
+ public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
int index) {
return valueParameter_.get(index);
}
@@ -11909,7 +10762,7 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*CallableKind
*MemberKind
*hasGetter
@@ -11918,6 +10771,7 @@ public final class ProtoBuf {
*isConst
*lateinit
*isOperator
+ *isInfix
*
*/
public boolean hasFlags() {
@@ -11930,7 +10784,7 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*CallableKind
*MemberKind
*hasGetter
@@ -11939,6 +10793,7 @@ public final class ProtoBuf {
*isConst
*lateinit
*isOperator
+ *isInfix
*
*/
public int getFlags() {
@@ -11951,7 +10806,7 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*CallableKind
*MemberKind
*hasGetter
@@ -11960,6 +10815,7 @@ public final class ProtoBuf {
*isConst
*lateinit
*isOperator
+ *isInfix
*
*/
public Builder setFlags(int value) {
@@ -11975,7 +10831,7 @@ public final class ProtoBuf {
*
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*CallableKind
*MemberKind
*hasGetter
@@ -11984,6 +10840,7 @@ public final class ProtoBuf {
*isConst
*lateinit
*isOperator
+ *isInfix
*
*/
public Builder clearFlags() {
@@ -12003,7 +10860,7 @@ public final class ProtoBuf {
*isNotDefault
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*
*/
public boolean hasGetterFlags() {
@@ -12017,7 +10874,7 @@ public final class ProtoBuf {
*isNotDefault
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*
*/
public int getGetterFlags() {
@@ -12031,7 +10888,7 @@ public final class ProtoBuf {
*isNotDefault
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*
*/
public Builder setGetterFlags(int value) {
@@ -12048,7 +10905,7 @@ public final class ProtoBuf {
*isNotDefault
*Visibility
*Modality
- *has_annotations
+ *hasAnnotations
*
*/
public Builder clearGetterFlags() {
@@ -12281,30 +11138,18 @@ public final class ProtoBuf {
private int name_ ;
/**
* required int32 name = 6;
- *
- *
- * Id in the StringTable
- *
*/
public boolean hasName() {
return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* required int32 name = 6;
- *
- *
- * Id in the StringTable
- *
*/
public int getName() {
return name_;
}
/**
* required int32 name = 6;
- *
- *
- * Id in the StringTable
- *
*/
public Builder setName(int value) {
bitField0_ |= 0x00000020;
@@ -12314,10 +11159,6 @@ public final class ProtoBuf {
}
/**
* required int32 name = 6;
- *
- *
- * Id in the StringTable
- *
*/
public Builder clearName() {
bitField0_ = (bitField0_ & ~0x00000020);
@@ -12326,28 +11167,28 @@ public final class ProtoBuf {
return this;
}
- // repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
- private java.util.List valueParameter_ =
+ // repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
+ private java.util.List valueParameter_ =
java.util.Collections.emptyList();
private void ensureValueParameterIsMutable() {
if (!((bitField0_ & 0x00000040) == 0x00000040)) {
- valueParameter_ = new java.util.ArrayList(valueParameter_);
+ valueParameter_ = new java.util.ArrayList(valueParameter_);
bitField0_ |= 0x00000040;
}
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public java.util.List getValueParameterList() {
+ public java.util.List getValueParameterList() {
return java.util.Collections.unmodifiableList(valueParameter_);
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
@@ -12357,24 +11198,24 @@ public final class ProtoBuf {
return valueParameter_.size();
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter getValueParameter(int index) {
+ public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index) {
return valueParameter_.get(index);
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder setValueParameter(
- int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter value) {
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
if (value == null) {
throw new NullPointerException();
}
@@ -12384,27 +11225,27 @@ public final class ProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder setValueParameter(
- int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
ensureValueParameterIsMutable();
valueParameter_.set(index, builderForValue.build());
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
- public Builder addValueParameter(org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter value) {
+ public Builder addValueParameter(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
if (value == null) {
throw new NullPointerException();
}
@@ -12414,14 +11255,14 @@ public final class ProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder addValueParameter(
- int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter value) {
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
if (value == null) {
throw new NullPointerException();
}
@@ -12431,49 +11272,49 @@ public final class ProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder addValueParameter(
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
ensureValueParameterIsMutable();
valueParameter_.add(builderForValue.build());
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder addValueParameter(
- int index, org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.Builder builderForValue) {
+ int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
ensureValueParameterIsMutable();
valueParameter_.add(index, builderForValue.build());
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
*
*/
public Builder addAllValueParameter(
- java.lang.Iterable values) {
+ java.lang.Iterable values) {
ensureValueParameterIsMutable();
super.addAll(values, valueParameter_);
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
@@ -12486,7 +11327,7 @@ public final class ProtoBuf {
return this;
}
/**
- * repeated .org.jetbrains.kotlin.serialization.Callable.ValueParameter value_parameter = 7;
+ * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 7;
*
*
* Value parameters for functions and constructors, or setter value parameter for properties
@@ -12571,6 +11412,752 @@ public final class ProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Callable)
}
+ public interface ValueParameterOrBuilder extends
+ com.google.protobuf.GeneratedMessageLite.
+ ExtendableMessageOrBuilder {
+
+ // optional int32 flags = 1;
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ boolean hasFlags();
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ int getFlags();
+
+ // required int32 name = 2;
+ /**
+ * required int32 name = 2;
+ */
+ boolean hasName();
+ /**
+ * required int32 name = 2;
+ */
+ int getName();
+
+ // required .org.jetbrains.kotlin.serialization.Type type = 3;
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ boolean hasType();
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type getType();
+
+ // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ boolean hasVarargElementType();
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType();
+ }
+ /**
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.ValueParameter}
+ */
+ public static final class ValueParameter extends
+ com.google.protobuf.GeneratedMessageLite.ExtendableMessage<
+ ValueParameter> implements ValueParameterOrBuilder {
+ // Use ValueParameter.newBuilder() to construct.
+ private ValueParameter(com.google.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+ super(builder);
+
+ }
+ private ValueParameter(boolean noInit) {}
+
+ private static final ValueParameter defaultInstance;
+ public static ValueParameter getDefaultInstance() {
+ return defaultInstance;
+ }
+
+ public ValueParameter getDefaultInstanceForType() {
+ return defaultInstance;
+ }
+
+ private ValueParameter(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ initFields();
+ int mutable_bitField0_ = 0;
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ default: {
+ if (!parseUnknownField(input,
+ extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ case 8: {
+ bitField0_ |= 0x00000001;
+ flags_ = input.readInt32();
+ break;
+ }
+ case 16: {
+ bitField0_ |= 0x00000002;
+ name_ = input.readInt32();
+ break;
+ }
+ case 26: {
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ subBuilder = type_.toBuilder();
+ }
+ type_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(type_);
+ type_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000004;
+ break;
+ }
+ case 34: {
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ subBuilder = varargElementType_.toBuilder();
+ }
+ varargElementType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(varargElementType_);
+ varargElementType_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000008;
+ break;
+ }
+ }
+ }
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(
+ e.getMessage()).setUnfinishedMessage(this);
+ } finally {
+ makeExtensionsImmutable();
+ }
+ }
+ public static com.google.protobuf.Parser PARSER =
+ new com.google.protobuf.AbstractParser() {
+ public ValueParameter parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new ValueParameter(input, extensionRegistry);
+ }
+ };
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ private int bitField0_;
+ // optional int32 flags = 1;
+ public static final int FLAGS_FIELD_NUMBER = 1;
+ private int flags_;
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public boolean hasFlags() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public int getFlags() {
+ return flags_;
+ }
+
+ // required int32 name = 2;
+ public static final int NAME_FIELD_NUMBER = 2;
+ private int name_;
+ /**
+ * required int32 name = 2;
+ */
+ public boolean hasName() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * required int32 name = 2;
+ */
+ public int getName() {
+ return name_;
+ }
+
+ // required .org.jetbrains.kotlin.serialization.Type type = 3;
+ public static final int TYPE_FIELD_NUMBER = 3;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_;
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
+ return type_;
+ }
+
+ // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.Type varargElementType_;
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public boolean hasVarargElementType() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType() {
+ return varargElementType_;
+ }
+
+ private void initFields() {
+ flags_ = 0;
+ name_ = 0;
+ type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ }
+ private byte memoizedIsInitialized = -1;
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized != -1) return isInitialized == 1;
+
+ if (!hasName()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!hasType()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (!getType().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ if (hasVarargElementType()) {
+ if (!getVarargElementType().isInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ }
+ if (!extensionsAreInitialized()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ public void writeTo(com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ getSerializedSize();
+ com.google.protobuf.GeneratedMessageLite
+ .ExtendableMessage.ExtensionWriter extensionWriter =
+ newExtensionWriter();
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeInt32(1, flags_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeInt32(2, name_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeMessage(3, type_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeMessage(4, varargElementType_);
+ }
+ extensionWriter.writeUntil(200, output);
+ }
+
+ private int memoizedSerializedSize = -1;
+ public int getSerializedSize() {
+ int size = memoizedSerializedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(1, flags_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(2, name_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(3, type_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeMessageSize(4, varargElementType_);
+ }
+ size += extensionsSerializedSize();
+ memoizedSerializedSize = size;
+ return size;
+ }
+
+ private static final long serialVersionUID = 0L;
+ @java.lang.Override
+ protected java.lang.Object writeReplace()
+ throws java.io.ObjectStreamException {
+ return super.writeReplace();
+ }
+
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+ byte[] data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseDelimitedFrom(
+ java.io.InputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseDelimitedFrom(input, extensionRegistry);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+ com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input);
+ }
+ public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return PARSER.parseFrom(input, extensionRegistry);
+ }
+
+ public static Builder newBuilder() { return Builder.create(); }
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter prototype) {
+ return newBuilder().mergeFrom(prototype);
+ }
+ public Builder toBuilder() { return newBuilder(this); }
+
+ /**
+ * Protobuf type {@code org.jetbrains.kotlin.serialization.ValueParameter}
+ */
+ public static final class Builder extends
+ com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter, Builder> implements org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameterOrBuilder {
+ // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private void maybeForceBuilderInitialization() {
+ }
+ private static Builder create() {
+ return new Builder();
+ }
+
+ public Builder clear() {
+ super.clear();
+ flags_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ name_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ bitField0_ = (bitField0_ & ~0x00000004);
+ varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ bitField0_ = (bitField0_ & ~0x00000008);
+ return this;
+ }
+
+ public Builder clone() {
+ return create().mergeFrom(buildPartial());
+ }
+
+ public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getDefaultInstanceForType() {
+ return org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
+ }
+
+ public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter build() {
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter buildPartial() {
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter result = new org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.flags_ = flags_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.name_ = name_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.type_ = type_;
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ result.varargElementType_ = varargElementType_;
+ result.bitField0_ = to_bitField0_;
+ return result;
+ }
+
+ public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter other) {
+ if (other == org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance()) return this;
+ if (other.hasFlags()) {
+ setFlags(other.getFlags());
+ }
+ if (other.hasName()) {
+ setName(other.getName());
+ }
+ if (other.hasType()) {
+ mergeType(other.getType());
+ }
+ if (other.hasVarargElementType()) {
+ mergeVarargElementType(other.getVarargElementType());
+ }
+ this.mergeExtensionFields(other);
+ return this;
+ }
+
+ public final boolean isInitialized() {
+ if (!hasName()) {
+
+ return false;
+ }
+ if (!hasType()) {
+
+ return false;
+ }
+ if (!getType().isInitialized()) {
+
+ return false;
+ }
+ if (hasVarargElementType()) {
+ if (!getVarargElementType().isInitialized()) {
+
+ return false;
+ }
+ }
+ if (!extensionsAreInitialized()) {
+
+ return false;
+ }
+ return true;
+ }
+
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter) e.getUnfinishedMessage();
+ throw e;
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int bitField0_;
+
+ // optional int32 flags = 1;
+ private int flags_ ;
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public boolean hasFlags() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public int getFlags() {
+ return flags_;
+ }
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public Builder setFlags(int value) {
+ bitField0_ |= 0x00000001;
+ flags_ = value;
+
+ return this;
+ }
+ /**
+ * optional int32 flags = 1;
+ *
+ *
+ *
+ *declaresDefault
+ *hasAnnotations
+ *
+ */
+ public Builder clearFlags() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ flags_ = 0;
+
+ return this;
+ }
+
+ // required int32 name = 2;
+ private int name_ ;
+ /**
+ * required int32 name = 2;
+ */
+ public boolean hasName() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * required int32 name = 2;
+ */
+ public int getName() {
+ return name_;
+ }
+ /**
+ * required int32 name = 2;
+ */
+ public Builder setName(int value) {
+ bitField0_ |= 0x00000002;
+ name_ = value;
+
+ return this;
+ }
+ /**
+ * required int32 name = 2;
+ */
+ public Builder clearName() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ name_ = 0;
+
+ return this;
+ }
+
+ // required .org.jetbrains.kotlin.serialization.Type type = 3;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public boolean hasType() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
+ return type_;
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public Builder setType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ type_ = value;
+
+ bitField0_ |= 0x00000004;
+ return this;
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public Builder setType(
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+ type_ = builderForValue.build();
+
+ bitField0_ |= 0x00000004;
+ return this;
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public Builder mergeType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+ if (((bitField0_ & 0x00000004) == 0x00000004) &&
+ type_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+ type_ =
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+ } else {
+ type_ = value;
+ }
+
+ bitField0_ |= 0x00000004;
+ return this;
+ }
+ /**
+ * required .org.jetbrains.kotlin.serialization.Type type = 3;
+ */
+ public Builder clearType() {
+ type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+
+ bitField0_ = (bitField0_ & ~0x00000004);
+ return this;
+ }
+
+ // optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ private org.jetbrains.kotlin.serialization.ProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public boolean hasVarargElementType() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType() {
+ return varargElementType_;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public Builder setVarargElementType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ varargElementType_ = value;
+
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public Builder setVarargElementType(
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+ varargElementType_ = builderForValue.build();
+
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public Builder mergeVarargElementType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+ if (((bitField0_ & 0x00000008) == 0x00000008) &&
+ varargElementType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+ varargElementType_ =
+ org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
+ } else {
+ varargElementType_ = value;
+ }
+
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+ */
+ public Builder clearVarargElementType() {
+ varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+
+ bitField0_ = (bitField0_ & ~0x00000008);
+ return this;
+ }
+
+ // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.ValueParameter)
+ }
+
+ static {
+ defaultInstance = new ValueParameter(true);
+ defaultInstance.initFields();
+ }
+
+ // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.ValueParameter)
+ }
+
static {
}
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
index 8734bcc2f09..19b0eb8f4db 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
@@ -75,14 +75,14 @@ public final class BuiltInsProtoBuf {
com.google.protobuf.WireFormat.FieldType.MESSAGE);
public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
/**
- * extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }
+ * extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }
*/
public static final
com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter,
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter,
java.util.List> parameterAnnotation = com.google.protobuf.GeneratedMessageLite
.newRepeatedGeneratedExtension(
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance(),
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
null,
150,
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java
index f089850aed7..68c845d530f 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.java
@@ -45,7 +45,7 @@ public interface AnnotationAndConstantLoader {
@NotNull NameResolver nameResolver,
@NotNull AnnotatedCallableKind kind,
int parameterIndex,
- @NotNull ProtoBuf.Callable.ValueParameter proto
+ @NotNull ProtoBuf.ValueParameter proto
);
@NotNull
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
index fad407d8ee9..6c11902a307 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
@@ -25,10 +25,11 @@ import org.jetbrains.kotlin.descriptors.impl.PropertySetterDescriptorImpl
import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
import org.jetbrains.kotlin.resolve.DescriptorFactory
import org.jetbrains.kotlin.serialization.Flags
+import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.ProtoBuf.Callable
-import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.FUN
-import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.VAL
-import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.VAR
+import org.jetbrains.kotlin.serialization.ProtoBuf.CallableKind.FUN
+import org.jetbrains.kotlin.serialization.ProtoBuf.CallableKind.VAL
+import org.jetbrains.kotlin.serialization.ProtoBuf.CallableKind.VAR
import org.jetbrains.kotlin.serialization.deserialization.descriptors.*
import org.jetbrains.kotlin.utils.toReadOnlyList
@@ -50,7 +51,7 @@ public class MemberDeserializer(private val c: DeserializationContext) {
getAnnotations(proto, flags, AnnotatedCallableKind.PROPERTY),
Deserialization.modality(Flags.MODALITY.get(flags)),
Deserialization.visibility(Flags.VISIBILITY.get(flags)),
- Flags.CALLABLE_KIND.get(flags) == Callable.CallableKind.VAR,
+ Flags.CALLABLE_KIND.get(flags) == ProtoBuf.CallableKind.VAR,
c.nameResolver.getName(proto.getName()),
Deserialization.memberKind(Flags.MEMBER_KIND.get(flags)),
proto,
@@ -230,7 +231,7 @@ public class MemberDeserializer(private val c: DeserializationContext) {
callable: Callable,
kind: AnnotatedCallableKind,
index: Int,
- valueParameter: Callable.ValueParameter
+ valueParameter: ProtoBuf.ValueParameter
): Annotations {
return DeserializedAnnotations(c.storageManager) {
c.components.annotationAndConstantLoader.loadValueParameterAnnotations(
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
index f972056c09f..f12f0b93235 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.CallableKind
import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.kotlin.utils.toReadOnlyList
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
index 8a08d44997b..a0f1cbf0d2d 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt
@@ -26,11 +26,11 @@ import org.jetbrains.kotlin.types.Variance
object Deserialization {
@JvmStatic
- fun memberKind(memberKind: ProtoBuf.Callable.MemberKind) = when (memberKind) {
- ProtoBuf.Callable.MemberKind.DECLARATION -> CallableMemberDescriptor.Kind.DECLARATION
- ProtoBuf.Callable.MemberKind.FAKE_OVERRIDE -> CallableMemberDescriptor.Kind.FAKE_OVERRIDE
- ProtoBuf.Callable.MemberKind.DELEGATION -> CallableMemberDescriptor.Kind.DELEGATION
- ProtoBuf.Callable.MemberKind.SYNTHESIZED -> CallableMemberDescriptor.Kind.SYNTHESIZED
+ fun memberKind(memberKind: ProtoBuf.MemberKind) = when (memberKind) {
+ ProtoBuf.MemberKind.DECLARATION -> CallableMemberDescriptor.Kind.DECLARATION
+ ProtoBuf.MemberKind.FAKE_OVERRIDE -> CallableMemberDescriptor.Kind.FAKE_OVERRIDE
+ ProtoBuf.MemberKind.DELEGATION -> CallableMemberDescriptor.Kind.DELEGATION
+ ProtoBuf.MemberKind.SYNTHESIZED -> CallableMemberDescriptor.Kind.SYNTHESIZED
}
@JvmStatic
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/AnnotationLoaderForKotlinJavaScriptStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/AnnotationLoaderForKotlinJavaScriptStubBuilder.kt
index a770b9c1153..c4399511361 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/AnnotationLoaderForKotlinJavaScriptStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/AnnotationLoaderForKotlinJavaScriptStubBuilder.kt
@@ -48,7 +48,7 @@ public class AnnotationLoaderForKotlinJavaScriptStubBuilder() : AnnotationAndCon
nameResolver: NameResolver,
kind: AnnotatedCallableKind,
parameterIndex: Int,
- proto: ProtoBuf.Callable.ValueParameter
+ proto: ProtoBuf.ValueParameter
): List =
proto.getExtension(JsProtoBuf.parameterAnnotation).orEmpty().map { nameResolver.getClassId(it.id) }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
index 95c8a591d36..abbbf99765a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
@@ -27,8 +27,8 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyStubImpl
import org.jetbrains.kotlin.resolve.dataClassUtils.isComponentLike
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
-import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.MemberKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.CallableKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.MemberKind
import org.jetbrains.kotlin.serialization.ProtoBuf.Modality
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
@@ -64,7 +64,7 @@ private class CallableClsStubBuilder(
private val typeStubBuilder = TypeClsStubBuilder(c)
private val isTopLevel: Boolean get() = protoContainer.packageFqName != null
private val callableKind = Flags.CALLABLE_KIND[callableProto.getFlags()]
- private val isConstructor = callableKind == ProtoBuf.Callable.CallableKind.CONSTRUCTOR
+ private val isConstructor = callableKind == CallableKind.CONSTRUCTOR
private val isPrimaryConstructor = isConstructor && parent is KotlinClassStubImpl
private val callableStub = doCreateCallableStub()
@@ -118,7 +118,7 @@ private class CallableClsStubBuilder(
val callableName = c.nameResolver.getName(callableProto.getName())
return when (callableKind) {
- ProtoBuf.Callable.CallableKind.FUN -> {
+ CallableKind.FUN -> {
KotlinFunctionStubImpl(
parent,
callableName.ref(),
@@ -130,7 +130,7 @@ private class CallableClsStubBuilder(
hasTypeParameterListBeforeFunctionName = callableProto.getTypeParameterList().isNotEmpty()
)
}
- ProtoBuf.Callable.CallableKind.VAL, ProtoBuf.Callable.CallableKind.VAR -> {
+ CallableKind.VAL, CallableKind.VAR -> {
KotlinPropertyStubImpl(
parent,
callableName.ref(),
@@ -144,7 +144,7 @@ private class CallableClsStubBuilder(
fqName = c.containerFqName.child(callableName)
)
}
- ProtoBuf.Callable.CallableKind.CONSTRUCTOR -> {
+ CallableKind.CONSTRUCTOR -> {
if (isPrimaryConstructor)
KotlinPlaceHolderStubImpl(parent, JetStubElementTypes.PRIMARY_CONSTRUCTOR)
else
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
index de84ef8b950..a4143dce4e9 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes
import org.jetbrains.kotlin.psi.stubs.impl.*
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.CallableKind
import org.jetbrains.kotlin.serialization.ProtoBuf.Type
import org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection
import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
index bdfbbcb375f..ece8cc1813a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes
import org.jetbrains.kotlin.psi.stubs.impl.*
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
+import org.jetbrains.kotlin.serialization.ProtoBuf.CallableKind
import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
index 07f99c5ca12..2b7e42dfdc8 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
@@ -270,7 +270,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
return true
}
- open fun checkEquals(old: ProtoBuf.Callable.ValueParameter, new: ProtoBuf.Callable.ValueParameter): Boolean {
+ open fun checkEquals(old: ProtoBuf.ValueParameter, new: ProtoBuf.ValueParameter): Boolean {
if (old.hasFlags() != new.hasFlags()) return false
if (old.hasFlags()) {
if (old.flags != new.flags) return false
@@ -753,7 +753,7 @@ public fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndex
return hashCode
}
-public fun ProtoBuf.Callable.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
+public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
var hashCode = 1
if (hasFlags()) {
diff --git a/js/js.serializer/src/js.proto b/js/js.serializer/src/js.proto
index e6aca789b89..cd1e594bf7d 100644
--- a/js/js.serializer/src/js.proto
+++ b/js/js.serializer/src/js.proto
@@ -30,7 +30,7 @@ extend Callable {
optional Annotation.Argument.Value compile_time_value = 131;
}
-extend Callable.ValueParameter {
+extend ValueParameter {
repeated Annotation parameter_annotation = 130;
}
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
index 98b7570e261..a99c118b6f8 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
@@ -1509,14 +1509,14 @@ public final class JsProtoBuf {
com.google.protobuf.WireFormat.FieldType.MESSAGE);
public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
/**
- * extend .org.jetbrains.kotlin.serialization.Callable.ValueParameter { ... }
+ * extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }
*/
public static final
com.google.protobuf.GeneratedMessageLite.GeneratedExtension<
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter,
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter,
java.util.List> parameterAnnotation = com.google.protobuf.GeneratedMessageLite
.newRepeatedGeneratedExtension(
- org.jetbrains.kotlin.serialization.ProtoBuf.Callable.ValueParameter.getDefaultInstance(),
+ org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance(),
org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
null,
130,
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptAnnotationAndConstantLoader.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptAnnotationAndConstantLoader.kt
index 20961048de1..a0dbd83c0f0 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptAnnotationAndConstantLoader.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptAnnotationAndConstantLoader.kt
@@ -53,7 +53,7 @@ class KotlinJavascriptAnnotationAndConstantLoader(
nameResolver: NameResolver,
kind: AnnotatedCallableKind,
parameterIndex: Int,
- proto: ProtoBuf.Callable.ValueParameter
+ proto: ProtoBuf.ValueParameter
): List {
val annotations = proto.getExtension(JsProtoBuf.parameterAnnotation).orEmpty()
return annotations.map { proto -> deserializer.deserializeAnnotation(proto, nameResolver) }
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerExtension.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerExtension.kt
index 426fb3253c9..3c64fb39b12 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerExtension.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerExtension.kt
@@ -50,7 +50,7 @@ public class KotlinJavascriptSerializerExtension : SerializerExtension() {
}
}
- override fun serializeValueParameter(descriptor: ValueParameterDescriptor, proto: ProtoBuf.Callable.ValueParameter.Builder) {
+ override fun serializeValueParameter(descriptor: ValueParameterDescriptor, proto: ProtoBuf.ValueParameter.Builder) {
for (annotation in descriptor.annotations) {
proto.addExtension(JsProtoBuf.parameterAnnotation, annotationSerializer.serializeAnnotation(annotation))
}