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

Clarify 'class_fq_name` field in jvm_descriptors.proto

Browse Source 
Regenerate protobuf files with protoc 2.5.0
This commit is contained in:
Alexander Udalov
2015-03-19 19:03:32 +03:00
parent 5d0af36432
commit 06537c5b14
7 changed files with 565 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+60
View File
@@ -6229,14 +6229,26 @@ public final class DebugProtoBuf {
// optional .org.jetbrains.kotlin.serialization.Type type = 2;
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
boolean hasType();
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType();
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
}
@@ -6476,18 +6488,30 @@ public final class DebugProtoBuf {
private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_;
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public boolean hasType() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
return type_;
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
return type_;
@@ -6800,12 +6824,20 @@ public final class DebugProtoBuf {
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public boolean hasType() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
if (typeBuilder_ == null) {
@@ -6816,6 +6848,10 @@ public final class DebugProtoBuf {
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public Builder setType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
if (typeBuilder_ == null) {
@@ -6832,6 +6868,10 @@ public final class DebugProtoBuf {
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public Builder setType(
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
@@ -6846,6 +6886,10 @@ public final class DebugProtoBuf {
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public Builder mergeType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
if (typeBuilder_ == null) {
@@ -6865,6 +6909,10 @@ public final class DebugProtoBuf {
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public Builder clearType() {
if (typeBuilder_ == null) {
@@ -6878,6 +6926,10 @@ public final class DebugProtoBuf {
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() {
bitField0_ |= 0x00000002;
@@ -6886,6 +6938,10 @@ public final class DebugProtoBuf {
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
if (typeBuilder_ != null) {
@@ -6896,6 +6952,10 @@ public final class DebugProtoBuf {
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.Type type = 2;</code>
*
* <pre>
* when projection is STAR, no type is written, otherwise type must be specified
* </pre>
*/
private com.google.protobuf.SingleFieldBuilder<
org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>
compiler/tests/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
+219 -228
View File
File diff suppressed because it is too large Load Diff
compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+40 -32
View File
@@ -18,28 +18,28 @@ public final class DebugJvmProtoBuf {
// optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;
/**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
*
* <pre>
* One of these should be present
* </pre>
*/
boolean hasPrimitiveType();
/**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
*
* <pre>
* One of these should be present
* </pre>
*/
org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType getPrimitiveType();
// optional int32 class_fq_name = 2;
/**
* <code>optional int32 class_fq_name = 2;</code>
*
* <pre>
* id in QualifiedNameTable of a name in the following format: 'package.Outer$Nested'
* </pre>
*/
boolean hasClassFqName();
/**
* <code>optional int32 class_fq_name = 2;</code>
*
* <pre>
* id in QualifiedNameTable of a name in the following format: 'package.Outer$Nested'
* </pre>
*/
int getClassFqName();
@@ -55,6 +55,10 @@ public final class DebugJvmProtoBuf {
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmType}
*
* <pre>
* Either a primitive type, or a class FQ name should be present
* </pre>
*/
public static final class JvmType extends
com.google.protobuf.GeneratedMessage
@@ -323,20 +327,12 @@ public final class DebugJvmProtoBuf {
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType primitiveType_;
/**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
*
* <pre>
* One of these should be present
* </pre>
*/
public boolean hasPrimitiveType() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
*
* <pre>
* One of these should be present
* </pre>
*/
public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType getPrimitiveType() {
return primitiveType_;
@@ -347,12 +343,20 @@ public final class DebugJvmProtoBuf {
private int classFqName_;
/**
* <code>optional int32 class_fq_name = 2;</code>
*
* <pre>
* id in QualifiedNameTable of a name in the following format: 'package.Outer$Nested'
* </pre>
*/
public boolean hasClassFqName() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>optional int32 class_fq_name = 2;</code>
*
* <pre>
* id in QualifiedNameTable of a name in the following format: 'package.Outer$Nested'
* </pre>
*/
public int getClassFqName() {
return classFqName_;
@@ -501,6 +505,10 @@ public final class DebugJvmProtoBuf {
}
/**
* Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmType}
*
* <pre>
* Either a primitive type, or a class FQ name should be present
* </pre>
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder<Builder>
@@ -639,30 +647,18 @@ public final class DebugJvmProtoBuf {
private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType primitiveType_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType.VOID;
/**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
*
* <pre>
* One of these should be present
* </pre>
*/
public boolean hasPrimitiveType() {
return ((bitField0_ & 0x00000001) == 0x00000001);
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
*
* <pre>
* One of these should be present
* </pre>
*/
public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType getPrimitiveType() {
return primitiveType_;
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
*
* <pre>
* One of these should be present
* </pre>
*/
public Builder setPrimitiveType(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmType.PrimitiveType value) {
if (value == null) {
@@ -675,10 +671,6 @@ public final class DebugJvmProtoBuf {
}
/**
* <code>optional .org.jetbrains.kotlin.serialization.jvm.JvmType.PrimitiveType primitive_type = 1;</code>
*
* <pre>
* One of these should be present
* </pre>
*/
public Builder clearPrimitiveType() {
bitField0_ = (bitField0_ & ~0x00000001);
@@ -691,18 +683,30 @@ public final class DebugJvmProtoBuf {
private int classFqName_ ;
/**
* <code>optional int32 class_fq_name = 2;</code>
*
* <pre>
* id in QualifiedNameTable of a name in the following format: 'package.Outer$Nested'
* </pre>
*/
public boolean hasClassFqName() {
return ((bitField0_ & 0x00000002) == 0x00000002);
}
/**
* <code>optional int32 class_fq_name = 2;</code>
*
* <pre>
* id in QualifiedNameTable of a name in the following format: 'package.Outer$Nested'
* </pre>
*/
public int getClassFqName() {
return classFqName_;
}
/**
* <code>optional int32 class_fq_name = 2;</code>
*
* <pre>
* id in QualifiedNameTable of a name in the following format: 'package.Outer$Nested'
* </pre>
*/
public Builder setClassFqName(int value) {
bitField0_ |= 0x00000002;
@@ -712,6 +716,10 @@ public final class DebugJvmProtoBuf {
}
/**
* <code>optional int32 class_fq_name = 2;</code>
*
* <pre>
* id in QualifiedNameTable of a name in the following format: 'package.Outer$Nested'
* </pre>
*/
public Builder clearClassFqName() {
bitField0_ = (bitField0_ & ~0x00000002);