azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

two optional fields have been added to Type.Constructor message in descriptors.proto in preparation to remove field which requires double interpetation

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-07-21 01:19:32 +03:00
parent dbf6da89b7
commit ef8381f8af
4 changed files with 537 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/deserialization/src/descriptors.proto
+7
View File
@@ -138,6 +138,13 @@ message Type {
// 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+
optional int32 constructor_class_name = 6; // fqName id
optional int32 constructor_type_parameter = 7; // type parameter id
extensions 100 to 199;
}
core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+226
View File
@@ -4367,6 +4367,42 @@ public final class ProtoBuf {
* </pre>
*/
org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound();
// optional int32 constructor_class_name = 6;
/**
* <code>optional int32 constructor_class_name = 6;</code>
*
* <pre>
* fqName id
* </pre>
*/
boolean hasConstructorClassName();
/**
* <code>optional int32 constructor_class_name = 6;</code>
*
* <pre>
* fqName id
* </pre>
*/
int getConstructorClassName();
// optional int32 constructor_type_parameter = 7;
/**
* <code>optional int32 constructor_type_parameter = 7;</code>
*
* <pre>
* type parameter id
* </pre>
*/
boolean hasConstructorTypeParameter();
/**
* <code>optional int32 constructor_type_parameter = 7;</code>
*
* <pre>
* type parameter id
* </pre>
*/
int getConstructorTypeParameter();
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.Type}
@@ -4455,6 +4491,16 @@ public final class ProtoBuf {
bitField0_ |= 0x00000008;
break;
}
case 48: {
bitField0_ |= 0x00000010;
constructorClassName_ = input.readInt32();
break;
}
case 56: {
bitField0_ |= 0x00000020;
constructorTypeParameter_ = input.readInt32();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -5709,12 +5755,62 @@ public final class ProtoBuf {
return flexibleUpperBound_;
}
// optional int32 constructor_class_name = 6;
public static final int CONSTRUCTOR_CLASS_NAME_FIELD_NUMBER = 6;
private int constructorClassName_;
/**
* <code>optional int32 constructor_class_name = 6;</code>
*
* <pre>
* fqName id
* </pre>
*/
public boolean hasConstructorClassName() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* <code>optional int32 constructor_class_name = 6;</code>
*
* <pre>
* fqName id
* </pre>
*/
public int getConstructorClassName() {
return constructorClassName_;
}
// optional int32 constructor_type_parameter = 7;
public static final int CONSTRUCTOR_TYPE_PARAMETER_FIELD_NUMBER = 7;
private int constructorTypeParameter_;
/**
* <code>optional int32 constructor_type_parameter = 7;</code>
*
* <pre>
* type parameter id
* </pre>
*/
public boolean hasConstructorTypeParameter() {
return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* <code>optional int32 constructor_type_parameter = 7;</code>
*
* <pre>
* type parameter id
* </pre>
*/
public int getConstructorTypeParameter() {
return constructorTypeParameter_;
}
private void initFields() {
constructor_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Constructor.getDefaultInstance();
argument_ = java.util.Collections.emptyList();
nullable_ = false;
flexibleTypeCapabilitiesId_ = 0;
flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
constructorClassName_ = 0;
constructorTypeParameter_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -5770,6 +5866,12 @@ public final class ProtoBuf {
if (((bitField0_ & 0x00000008) == 0x00000008)) {
output.writeMessage(5, flexibleUpperBound_);
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeInt32(6, constructorClassName_);
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeInt32(7, constructorTypeParameter_);
}
extensionWriter.writeUntil(200, output);
}
@@ -5799,6 +5901,14 @@ public final class ProtoBuf {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(5, flexibleUpperBound_);
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(6, constructorClassName_);
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(7, constructorTypeParameter_);
}
size += extensionsSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -5900,6 +6010,10 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000008);
flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000010);
constructorClassName_ = 0;
bitField0_ = (bitField0_ & ~0x00000020);
constructorTypeParameter_ = 0;
bitField0_ = (bitField0_ & ~0x00000040);
return this;
}
@@ -5944,6 +6058,14 @@ public final class ProtoBuf {
to_bitField0_ |= 0x00000008;
}
result.flexibleUpperBound_ = flexibleUpperBound_;
if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
to_bitField0_ |= 0x00000010;
}
result.constructorClassName_ = constructorClassName_;
if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
to_bitField0_ |= 0x00000020;
}
result.constructorTypeParameter_ = constructorTypeParameter_;
result.bitField0_ = to_bitField0_;
return result;
}
@@ -5972,6 +6094,12 @@ public final class ProtoBuf {
if (other.hasFlexibleUpperBound()) {
mergeFlexibleUpperBound(other.getFlexibleUpperBound());
}
if (other.hasConstructorClassName()) {
setConstructorClassName(other.getConstructorClassName());
}
if (other.hasConstructorTypeParameter()) {
setConstructorTypeParameter(other.getConstructorTypeParameter());
}
this.mergeExtensionFields(other);
return this;
}
@@ -6396,6 +6524,104 @@ public final class ProtoBuf {
return this;
}
// optional int32 constructor_class_name = 6;
private int constructorClassName_ ;
/**
* <code>optional int32 constructor_class_name = 6;</code>
*
* <pre>
* fqName id
* </pre>
*/
public boolean hasConstructorClassName() {
return ((bitField0_ & 0x00000020) == 0x00000020);
}
/**
* <code>optional int32 constructor_class_name = 6;</code>
*
* <pre>
* fqName id
* </pre>
*/
public int getConstructorClassName() {
return constructorClassName_;
}
/**
* <code>optional int32 constructor_class_name = 6;</code>
*
* <pre>
* fqName id
* </pre>
*/
public Builder setConstructorClassName(int value) {
bitField0_ |= 0x00000020;
constructorClassName_ = value;
return this;
}
/**
* <code>optional int32 constructor_class_name = 6;</code>
*
* <pre>
* fqName id
* </pre>
*/
public Builder clearConstructorClassName() {
bitField0_ = (bitField0_ & ~0x00000020);
constructorClassName_ = 0;
return this;
}
// optional int32 constructor_type_parameter = 7;
private int constructorTypeParameter_ ;
/**
* <code>optional int32 constructor_type_parameter = 7;</code>
*
* <pre>
* type parameter id
* </pre>
*/
public boolean hasConstructorTypeParameter() {
return ((bitField0_ & 0x00000040) == 0x00000040);
}
/**
* <code>optional int32 constructor_type_parameter = 7;</code>
*
* <pre>
* type parameter id
* </pre>
*/
public int getConstructorTypeParameter() {
return constructorTypeParameter_;
}
/**
* <code>optional int32 constructor_type_parameter = 7;</code>
*
* <pre>
* type parameter id
* </pre>
*/
public Builder setConstructorTypeParameter(int value) {
bitField0_ |= 0x00000040;
constructorTypeParameter_ = value;
return this;
}
/**
* <code>optional int32 constructor_type_parameter = 7;</code>
*
* <pre>
* type parameter id
* </pre>
*/
public Builder clearConstructorTypeParameter() {
bitField0_ = (bitField0_ & ~0x00000040);
constructorTypeParameter_ = 0;
return this;
}
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type)
}