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

Update protobuf from 2.5.0 to 2.6.1

Browse Source
This commit is contained in:
Alexander Udalov
2016-06-24 12:54:42 +03:00
parent cfbe48ac46
commit 4c8e8b099a
20 changed files with 2086 additions and 1988 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmPackageTable.java
+83 -42
View File
@@ -8,10 +8,10 @@ public final class JvmPackageTable {
public static void registerAllExtensions(
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
}
public interface PackageTableOrBuilder
extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
public interface PackageTableOrBuilder extends
// @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageTable)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
// repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
/**
* <code>repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;</code>
*/
@@ -30,14 +30,15 @@ public final class JvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageTable}
*/
public static final class PackageTable extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite
implements PackageTableOrBuilder {
org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
// @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
PackageTableOrBuilder {
// Use PackageTable.newBuilder() to construct.
private PackageTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
private PackageTable(boolean noInit) {}
private PackageTable(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final PackageTable defaultInstance;
public static PackageTable getDefaultInstance() {
@@ -48,12 +49,18 @@ public final class JvmPackageTable {
return defaultInstance;
}
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private PackageTable(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
org.jetbrains.kotlin.protobuf.ByteString.newOutput();
org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
unknownFieldsOutput);
try {
boolean done = false;
while (!done) {
@@ -63,7 +70,7 @@ public final class JvmPackageTable {
done = true;
break;
default: {
if (!parseUnknownField(input,
if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
@@ -88,6 +95,13 @@ public final class JvmPackageTable {
if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
packageParts_ = java.util.Collections.unmodifiableList(packageParts_);
}
try {
unknownFieldsCodedOutput.flush();
} catch (java.io.IOException e) {
// Should not happen
} finally {
unknownFields = unknownFieldsOutput.toByteString();
}
makeExtensionsImmutable();
}
}
@@ -106,7 +120,6 @@ public final class JvmPackageTable {
return PARSER;
}
// repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> packageParts_;
/**
@@ -148,7 +161,8 @@ public final class JvmPackageTable {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1;
if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
for (int i = 0; i < getPackagePartsCount(); i++) {
if (!getPackageParts(i).isInitialized()) {
@@ -166,6 +180,7 @@ public final class JvmPackageTable {
for (int i = 0; i < packageParts_.size(); i++) {
output.writeMessage(1, packageParts_.get(i));
}
output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -178,6 +193,7 @@ public final class JvmPackageTable {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, packageParts_.get(i));
}
size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -255,7 +271,9 @@ public final class JvmPackageTable {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable, Builder>
implements org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTableOrBuilder {
implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageTable)
org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTableOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageTable.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -313,6 +331,8 @@ public final class JvmPackageTable {
}
}
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -345,7 +365,6 @@ public final class JvmPackageTable {
}
private int bitField0_;
// repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
private java.util.List<org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> packageParts_ =
java.util.Collections.emptyList();
private void ensurePackagePartsIsMutable() {
@@ -447,7 +466,8 @@ public final class JvmPackageTable {
public Builder addAllPackageParts(
java.lang.Iterable<? extends org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts> values) {
ensurePackagePartsIsMutable();
super.addAll(values, packageParts_);
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, packageParts_);
return this;
}
@@ -481,10 +501,10 @@ public final class JvmPackageTable {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageTable)
}
public interface PackagePartsOrBuilder
extends org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
public interface PackagePartsOrBuilder extends
// @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
// required string package_fq_name = 1;
/**
* <code>required string package_fq_name = 1;</code>
*/
@@ -499,12 +519,11 @@ public final class JvmPackageTable {
org.jetbrains.kotlin.protobuf.ByteString
getPackageFqNameBytes();
// repeated string class_name = 2;
/**
* <code>repeated string class_name = 2;</code>
*/
java.util.List<java.lang.String>
getClassNameList();
org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList();
/**
* <code>repeated string class_name = 2;</code>
*/
@@ -523,14 +542,15 @@ public final class JvmPackageTable {
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
*/
public static final class PackageParts extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite
implements PackagePartsOrBuilder {
org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
// @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
PackagePartsOrBuilder {
// Use PackageParts.newBuilder() to construct.
private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder);
this.unknownFields = builder.getUnknownFields();
}
private PackageParts(boolean noInit) {}
private PackageParts(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final PackageParts defaultInstance;
public static PackageParts getDefaultInstance() {
@@ -541,12 +561,18 @@ public final class JvmPackageTable {
return defaultInstance;
}
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private PackageParts(
org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
initFields();
int mutable_bitField0_ = 0;
org.jetbrains.kotlin.protobuf.ByteString.Output unknownFieldsOutput =
org.jetbrains.kotlin.protobuf.ByteString.newOutput();
org.jetbrains.kotlin.protobuf.CodedOutputStream unknownFieldsCodedOutput =
org.jetbrains.kotlin.protobuf.CodedOutputStream.newInstance(
unknownFieldsOutput);
try {
boolean done = false;
while (!done) {
@@ -556,23 +582,25 @@ public final class JvmPackageTable {
done = true;
break;
default: {
if (!parseUnknownField(input,
if (!parseUnknownField(input, unknownFieldsCodedOutput,
extensionRegistry, tag)) {
done = true;
}
break;
}
case 10: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
bitField0_ |= 0x00000001;
packageFqName_ = input.readBytes();
packageFqName_ = bs;
break;
}
case 18: {
org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
mutable_bitField0_ |= 0x00000002;
}
className_.add(input.readBytes());
className_.add(bs);
break;
}
}
@@ -584,7 +612,14 @@ public final class JvmPackageTable {
e.getMessage()).setUnfinishedMessage(this);
} finally {
if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(className_);
className_ = className_.getUnmodifiableView();
}
try {
unknownFieldsCodedOutput.flush();
} catch (java.io.IOException e) {
// Should not happen
} finally {
unknownFields = unknownFieldsOutput.toByteString();
}
makeExtensionsImmutable();
}
@@ -605,7 +640,6 @@ public final class JvmPackageTable {
}
private int bitField0_;
// required string package_fq_name = 1;
public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1;
private java.lang.Object packageFqName_;
/**
@@ -648,13 +682,12 @@ public final class JvmPackageTable {
}
}
// repeated string class_name = 2;
public static final int CLASS_NAME_FIELD_NUMBER = 2;
private org.jetbrains.kotlin.protobuf.LazyStringList className_;
/**
* <code>repeated string class_name = 2;</code>
*/
public java.util.List<java.lang.String>
public org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList() {
return className_;
}
@@ -685,7 +718,8 @@ public final class JvmPackageTable {
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1;
if (isInitialized == 1) return true;
if (isInitialized == 0) return false;
if (!hasPackageFqName()) {
memoizedIsInitialized = 0;
@@ -704,6 +738,7 @@ public final class JvmPackageTable {
for (int i = 0; i < className_.size(); i++) {
output.writeBytes(2, className_.getByteString(i));
}
output.writeRawBytes(unknownFields);
}
private int memoizedSerializedSize = -1;
@@ -725,6 +760,7 @@ public final class JvmPackageTable {
size += dataSize;
size += 1 * getClassNameList().size();
}
size += unknownFields.size();
memoizedSerializedSize = size;
return size;
}
@@ -802,7 +838,9 @@ public final class JvmPackageTable {
public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts, Builder>
implements org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder {
implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackagePartsOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.jvm.JvmPackageTable.PackageParts.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
@@ -848,8 +886,7 @@ public final class JvmPackageTable {
}
result.packageFqName_ = packageFqName_;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
className_ = new org.jetbrains.kotlin.protobuf.UnmodifiableLazyStringList(
className_);
className_ = className_.getUnmodifiableView();
bitField0_ = (bitField0_ & ~0x00000002);
}
result.className_ = className_;
@@ -874,6 +911,8 @@ public final class JvmPackageTable {
}
}
setUnknownFields(
getUnknownFields().concat(other.unknownFields));
return this;
}
@@ -904,7 +943,6 @@ public final class JvmPackageTable {
}
private int bitField0_;
// required string package_fq_name = 1;
private java.lang.Object packageFqName_ = "";
/**
* <code>required string package_fq_name = 1;</code>
@@ -918,9 +956,12 @@ public final class JvmPackageTable {
public java.lang.String getPackageFqName() {
java.lang.Object ref = packageFqName_;
if (!(ref instanceof java.lang.String)) {
java.lang.String s = ((org.jetbrains.kotlin.protobuf.ByteString) ref)
.toStringUtf8();
packageFqName_ = s;
org.jetbrains.kotlin.protobuf.ByteString bs =
(org.jetbrains.kotlin.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
packageFqName_ = s;
}
return s;
} else {
return (java.lang.String) ref;
@@ -978,7 +1019,6 @@ public final class JvmPackageTable {
return this;
}
// repeated string class_name = 2;
private org.jetbrains.kotlin.protobuf.LazyStringList className_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
private void ensureClassNameIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) {
@@ -989,9 +1029,9 @@ public final class JvmPackageTable {
/**
* <code>repeated string class_name = 2;</code>
*/
public java.util.List<java.lang.String>
public org.jetbrains.kotlin.protobuf.ProtocolStringList
getClassNameList() {
return java.util.Collections.unmodifiableList(className_);
return className_.getUnmodifiableView();
}
/**
* <code>repeated string class_name = 2;</code>
@@ -1044,7 +1084,8 @@ public final class JvmPackageTable {
public Builder addAllClassName(
java.lang.Iterable<java.lang.String> values) {
ensureClassNameIsMutable();
super.addAll(values, className_);
org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
values, className_);
return this;
}
core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
+195 -110
View File
File diff suppressed because it is too large Load Diff