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

Rename in descriptors.proto: class_object_name -> default_object_name

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-03 18:47:55 +03:00
parent 48fbce9582
commit f507af15c0
8 changed files with 130 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+75 -75
View File
@@ -9287,23 +9287,23 @@ public final class DebugProtoBuf {
*/ */
int getFqName(); int getFqName();
// optional int32 class_object_name = 4; // optional int32 default_object_name = 4;
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
boolean hasClassObjectName(); boolean hasDefaultObjectName();
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
int getClassObjectName(); int getDefaultObjectName();
// repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5; // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
/** /**
@@ -9512,7 +9512,7 @@ public final class DebugProtoBuf {
} }
case 32: { case 32: {
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
classObjectName_ = input.readInt32(); defaultObjectName_ = input.readInt32();
break; break;
} }
case 42: { case 42: {
@@ -10428,28 +10428,28 @@ public final class DebugProtoBuf {
return fqName_; return fqName_;
} }
// optional int32 class_object_name = 4; // optional int32 default_object_name = 4;
public static final int CLASS_OBJECT_NAME_FIELD_NUMBER = 4; public static final int DEFAULT_OBJECT_NAME_FIELD_NUMBER = 4;
private int classObjectName_; private int defaultObjectName_;
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public boolean hasClassObjectName() { public boolean hasDefaultObjectName() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public int getClassObjectName() { public int getDefaultObjectName() {
return classObjectName_; return defaultObjectName_;
} }
// repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5; // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
@@ -10658,7 +10658,7 @@ public final class DebugProtoBuf {
private void initFields() { private void initFields() {
flags_ = 0; flags_ = 0;
fqName_ = 0; fqName_ = 0;
classObjectName_ = 0; defaultObjectName_ = 0;
typeParameter_ = java.util.Collections.emptyList(); typeParameter_ = java.util.Collections.emptyList();
supertype_ = java.util.Collections.emptyList(); supertype_ = java.util.Collections.emptyList();
nestedClassName_ = java.util.Collections.emptyList(); nestedClassName_ = java.util.Collections.emptyList();
@@ -10720,7 +10720,7 @@ public final class DebugProtoBuf {
output.writeInt32(3, fqName_); output.writeInt32(3, fqName_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(4, classObjectName_); output.writeInt32(4, defaultObjectName_);
} }
for (int i = 0; i < typeParameter_.size(); i++) { for (int i = 0; i < typeParameter_.size(); i++) {
output.writeMessage(5, typeParameter_.get(i)); output.writeMessage(5, typeParameter_.get(i));
@@ -10760,7 +10760,7 @@ public final class DebugProtoBuf {
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, classObjectName_); .computeInt32Size(4, defaultObjectName_);
} }
for (int i = 0; i < typeParameter_.size(); i++) { for (int i = 0; i < typeParameter_.size(); i++) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
@@ -10921,7 +10921,7 @@ public final class DebugProtoBuf {
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
fqName_ = 0; fqName_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
classObjectName_ = 0; defaultObjectName_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
if (typeParameterBuilder_ == null) { if (typeParameterBuilder_ == null) {
typeParameter_ = java.util.Collections.emptyList(); typeParameter_ = java.util.Collections.emptyList();
@@ -10990,7 +10990,7 @@ public final class DebugProtoBuf {
if (((from_bitField0_ & 0x00000004) == 0x00000004)) { if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004; to_bitField0_ |= 0x00000004;
} }
result.classObjectName_ = classObjectName_; result.defaultObjectName_ = defaultObjectName_;
if (typeParameterBuilder_ == null) { if (typeParameterBuilder_ == null) {
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
@@ -11058,8 +11058,8 @@ public final class DebugProtoBuf {
if (other.hasFqName()) { if (other.hasFqName()) {
setFqName(other.getFqName()); setFqName(other.getFqName());
} }
if (other.hasClassObjectName()) { if (other.hasDefaultObjectName()) {
setClassObjectName(other.getClassObjectName()); setDefaultObjectName(other.getDefaultObjectName());
} }
if (typeParameterBuilder_ == null) { if (typeParameterBuilder_ == null) {
if (!other.typeParameter_.isEmpty()) { if (!other.typeParameter_.isEmpty()) {
@@ -11324,51 +11324,51 @@ public final class DebugProtoBuf {
return this; return this;
} }
// optional int32 class_object_name = 4; // optional int32 default_object_name = 4;
private int classObjectName_ ; private int defaultObjectName_ ;
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public boolean hasClassObjectName() { public boolean hasDefaultObjectName() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public int getClassObjectName() { public int getDefaultObjectName() {
return classObjectName_; return defaultObjectName_;
} }
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public Builder setClassObjectName(int value) { public Builder setDefaultObjectName(int value) {
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
classObjectName_ = value; defaultObjectName_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public Builder clearClassObjectName() { public Builder clearDefaultObjectName() {
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
classObjectName_ = 0; defaultObjectName_ = 0;
onChanged(); onChanged();
return this; return this;
} }
@@ -16594,47 +16594,47 @@ public final class DebugProtoBuf {
"brains.kotlin.serialization.TypeParamete" + "brains.kotlin.serialization.TypeParamete" +
"r.Variance:\003INV\022=\n\013upper_bound\030\005 \003(\0132(.o", "r.Variance:\003INV\022=\n\013upper_bound\030\005 \003(\0132(.o",
"rg.jetbrains.kotlin.serialization.Type\"$" + "rg.jetbrains.kotlin.serialization.Type\"$" +
"\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\340\004\n" + "\n\010Variance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\342\004\n" +
"\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\017\n\007fq_name\030\003 \002(" + "\005Class\022\020\n\005flags\030\001 \001(\005:\0010\022\017\n\007fq_name\030\003 \002(" +
"\005\022\031\n\021class_object_name\030\004 \001(\005\022I\n\016type_par" + "\005\022\033\n\023default_object_name\030\004 \001(\005\022I\n\016type_p" +
"ameter\030\005 \003(\01321.org.jetbrains.kotlin.seri" + "arameter\030\005 \003(\01321.org.jetbrains.kotlin.se" +
"alization.TypeParameter\022;\n\tsupertype\030\006 \003" + "rialization.TypeParameter\022;\n\tsupertype\030\006" +
"(\0132(.org.jetbrains.kotlin.serialization." + " \003(\0132(.org.jetbrains.kotlin.serializatio" +
"Type\022\031\n\021nested_class_name\030\007 \003(\005\022<\n\006membe" + "n.Type\022\031\n\021nested_class_name\030\007 \003(\005\022<\n\006mem" +
"r\030\013 \003(\0132,.org.jetbrains.kotlin.serializa" + "ber\030\013 \003(\0132,.org.jetbrains.kotlin.seriali" +
"tion.Callable\022\022\n\nenum_entry\030\014 \003(\005\022Y\n\023pri", "zation.Callable\022\022\n\nenum_entry\030\014 \003(\005\022Y\n\023p",
"mary_constructor\030\r \001(\0132<.org.jetbrains.k" + "rimary_constructor\030\r \001(\0132<.org.jetbrains" +
"otlin.serialization.Class.PrimaryConstru" + ".kotlin.serialization.Class.PrimaryConst" +
"ctor\032P\n\022PrimaryConstructor\022:\n\004data\030\001 \001(\013" + "ructor\032P\n\022PrimaryConstructor\022:\n\004data\030\001 \001" +
"2,.org.jetbrains.kotlin.serialization.Ca" + "(\0132,.org.jetbrains.kotlin.serialization." +
"llable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016\n\n" + "Callable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRAIT\020\001\022\016" +
"ENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTATI" + "\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020ANNOTA" +
"ON_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT\020\006" + "TION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_OBJECT" +
"*\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\0132,.org" + "\020\006*\005\010d\020\310\001\"N\n\007Package\022<\n\006member\030\001 \003(\0132,.o" +
".jetbrains.kotlin.serialization.Callable" + "rg.jetbrains.kotlin.serialization.Callab" +
"*\005\010d\020\310\001\"\300\005\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024\n\014g", "le*\005\010d\020\310\001\"\300\005\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\024\n",
"etter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005\022" + "\014getter_flags\030\t \001(\005\022\024\n\014setter_flags\030\n \001(" +
"I\n\016type_parameter\030\004 \003(\01321.org.jetbrains." + "\005\022I\n\016type_parameter\030\004 \003(\01321.org.jetbrain" +
"kotlin.serialization.TypeParameter\022?\n\rre" + "s.kotlin.serialization.TypeParameter\022?\n\r" +
"ceiver_type\030\005 \001(\0132(.org.jetbrains.kotlin" + "receiver_type\030\005 \001(\0132(.org.jetbrains.kotl" +
".serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017val" + "in.serialization.Type\022\014\n\004name\030\006 \002(\005\022T\n\017v" +
"ue_parameter\030\007 \003(\0132;.org.jetbrains.kotli" + "alue_parameter\030\007 \003(\0132;.org.jetbrains.kot" +
"n.serialization.Callable.ValueParameter\022" + "lin.serialization.Callable.ValueParamete" +
"=\n\013return_type\030\010 \002(\0132(.org.jetbrains.kot" + "r\022=\n\013return_type\030\010 \002(\0132(.org.jetbrains.k" +
"lin.serialization.Type\032\263\001\n\016ValueParamete" + "otlin.serialization.Type\032\263\001\n\016ValueParame" +
"r\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type\030\003", "ter\022\r\n\005flags\030\001 \001(\005\022\014\n\004name\030\002 \002(\005\0226\n\004type",
" \002(\0132(.org.jetbrains.kotlin.serializatio" + "\030\003 \002(\0132(.org.jetbrains.kotlin.serializat" +
"n.Type\022E\n\023vararg_element_type\030\004 \001(\0132(.or" + "ion.Type\022E\n\023vararg_element_type\030\004 \001(\0132(." +
"g.jetbrains.kotlin.serialization.Type*\005\010" + "org.jetbrains.kotlin.serialization.Type*" +
"d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n\rF" + "\005\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021\n" +
"AKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNTHE" + "\rFAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYNT" +
"SIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VAL\020" + "HESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003VA" +
"\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010Mo" + "L\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n\010" +
"dality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRACT\020" + "Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRAC" +
"\002*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVATE" + "T\020\002*b\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIVA" +
"\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVATE", "TE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\023\n\017PRIVA",
"_TO_THIS\020\004\022\t\n\005LOCAL\020\005B\022B\rDebugProtoBuf\210\001" + "TE_TO_THIS\020\004\022\t\n\005LOCAL\020\005B\022B\rDebugProtoBuf" +
"\000" "\210\001\000"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -16706,7 +16706,7 @@ public final class DebugProtoBuf {
internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_Class_descriptor, internal_static_org_jetbrains_kotlin_serialization_Class_descriptor,
new java.lang.String[] { "Flags", "FqName", "ClassObjectName", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", }); new java.lang.String[] { "Flags", "FqName", "DefaultObjectName", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", });
internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor = internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_descriptor =
internal_static_org_jetbrains_kotlin_serialization_Class_descriptor.getNestedTypes().get(0); internal_static_org_jetbrains_kotlin_serialization_Class_descriptor.getNestedTypes().get(0);
internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable = new internal_static_org_jetbrains_kotlin_serialization_Class_PrimaryConstructor_fieldAccessorTable = new
compiler/tests/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+8 -8
View File
@@ -1762,7 +1762,7 @@ public final class DebugJvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -1771,7 +1771,7 @@ public final class DebugJvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -1936,7 +1936,7 @@ public final class DebugJvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -1947,7 +1947,7 @@ public final class DebugJvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -2397,7 +2397,7 @@ public final class DebugJvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -2408,7 +2408,7 @@ public final class DebugJvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -2419,7 +2419,7 @@ public final class DebugJvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -2433,7 +2433,7 @@ public final class DebugJvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
core/serialization.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
+8 -8
View File
@@ -1379,7 +1379,7 @@ public final class JvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -1388,7 +1388,7 @@ public final class JvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -1526,7 +1526,7 @@ public final class JvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -1537,7 +1537,7 @@ public final class JvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -1880,7 +1880,7 @@ public final class JvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -1891,7 +1891,7 @@ public final class JvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -1902,7 +1902,7 @@ public final class JvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
@@ -1916,7 +1916,7 @@ public final class JvmProtoBuf {
* <code>optional bool is_static_in_outer = 3 [default = false];</code> * <code>optional bool is_static_in_outer = 3 [default = false];</code>
* *
* <pre> * <pre>
* True iff this field is a backing field for a class object and is really present as a static * True iff this field is a backing field for a default object and is really present as a static
* field in the outer class, not as an instance field here * field in the outer class, not as an instance field here
* </pre> * </pre>
*/ */
core/serialization/src/descriptors.proto
+1 -1
View File
@@ -180,7 +180,7 @@ message Class {
required int32 fq_name = 3; required int32 fq_name = 3;
// If this field is present, it contains the name of default object. // If this field is present, it contains the name of default object.
optional int32 class_object_name = 4; optional int32 default_object_name = 4;
repeated TypeParameter type_parameter = 5; repeated TypeParameter type_parameter = 5;
repeated Type supertype = 6; repeated Type supertype = 6;
core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+1 -2
View File
@@ -32,7 +32,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.isObject;
public class DescriptorSerializer { public class DescriptorSerializer {
@@ -133,7 +132,7 @@ public class DescriptorSerializer {
ClassDescriptor defaultObjectDescriptor = classDescriptor.getDefaultObjectDescriptor(); ClassDescriptor defaultObjectDescriptor = classDescriptor.getDefaultObjectDescriptor();
if (defaultObjectDescriptor != null) { if (defaultObjectDescriptor != null) {
builder.setClassObjectName(stringTable.getSimpleNameIndex(defaultObjectDescriptor.getName())); builder.setDefaultObjectName(stringTable.getSimpleNameIndex(defaultObjectDescriptor.getName()));
} }
extension.serializeClass(classDescriptor, builder, stringTable); extension.serializeClass(classDescriptor, builder, stringTable);
core/serialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+34 -34
View File
@@ -7310,23 +7310,23 @@ public final class ProtoBuf {
*/ */
int getFqName(); int getFqName();
// optional int32 class_object_name = 4; // optional int32 default_object_name = 4;
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
boolean hasClassObjectName(); boolean hasDefaultObjectName();
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
int getClassObjectName(); int getDefaultObjectName();
// repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5; // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
/** /**
@@ -7489,7 +7489,7 @@ public final class ProtoBuf {
} }
case 32: { case 32: {
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
classObjectName_ = input.readInt32(); defaultObjectName_ = input.readInt32();
break; break;
} }
case 42: { case 42: {
@@ -8203,28 +8203,28 @@ public final class ProtoBuf {
return fqName_; return fqName_;
} }
// optional int32 class_object_name = 4; // optional int32 default_object_name = 4;
public static final int CLASS_OBJECT_NAME_FIELD_NUMBER = 4; public static final int DEFAULT_OBJECT_NAME_FIELD_NUMBER = 4;
private int classObjectName_; private int defaultObjectName_;
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public boolean hasClassObjectName() { public boolean hasDefaultObjectName() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public int getClassObjectName() { public int getDefaultObjectName() {
return classObjectName_; return defaultObjectName_;
} }
// repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5; // repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
@@ -8423,7 +8423,7 @@ public final class ProtoBuf {
private void initFields() { private void initFields() {
flags_ = 0; flags_ = 0;
fqName_ = 0; fqName_ = 0;
classObjectName_ = 0; defaultObjectName_ = 0;
typeParameter_ = java.util.Collections.emptyList(); typeParameter_ = java.util.Collections.emptyList();
supertype_ = java.util.Collections.emptyList(); supertype_ = java.util.Collections.emptyList();
nestedClassName_ = java.util.Collections.emptyList(); nestedClassName_ = java.util.Collections.emptyList();
@@ -8485,7 +8485,7 @@ public final class ProtoBuf {
output.writeInt32(3, fqName_); output.writeInt32(3, fqName_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(4, classObjectName_); output.writeInt32(4, defaultObjectName_);
} }
for (int i = 0; i < typeParameter_.size(); i++) { for (int i = 0; i < typeParameter_.size(); i++) {
output.writeMessage(5, typeParameter_.get(i)); output.writeMessage(5, typeParameter_.get(i));
@@ -8524,7 +8524,7 @@ public final class ProtoBuf {
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) { if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeInt32Size(4, classObjectName_); .computeInt32Size(4, defaultObjectName_);
} }
for (int i = 0; i < typeParameter_.size(); i++) { for (int i = 0; i < typeParameter_.size(); i++) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
@@ -8655,7 +8655,7 @@ public final class ProtoBuf {
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
fqName_ = 0; fqName_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
classObjectName_ = 0; defaultObjectName_ = 0;
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
typeParameter_ = java.util.Collections.emptyList(); typeParameter_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
@@ -8703,7 +8703,7 @@ public final class ProtoBuf {
if (((from_bitField0_ & 0x00000004) == 0x00000004)) { if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004; to_bitField0_ |= 0x00000004;
} }
result.classObjectName_ = classObjectName_; result.defaultObjectName_ = defaultObjectName_;
if (((bitField0_ & 0x00000008) == 0x00000008)) { if (((bitField0_ & 0x00000008) == 0x00000008)) {
typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_);
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
@@ -8745,8 +8745,8 @@ public final class ProtoBuf {
if (other.hasFqName()) { if (other.hasFqName()) {
setFqName(other.getFqName()); setFqName(other.getFqName());
} }
if (other.hasClassObjectName()) { if (other.hasDefaultObjectName()) {
setClassObjectName(other.getClassObjectName()); setDefaultObjectName(other.getDefaultObjectName());
} }
if (!other.typeParameter_.isEmpty()) { if (!other.typeParameter_.isEmpty()) {
if (typeParameter_.isEmpty()) { if (typeParameter_.isEmpty()) {
@@ -8962,51 +8962,51 @@ public final class ProtoBuf {
return this; return this;
} }
// optional int32 class_object_name = 4; // optional int32 default_object_name = 4;
private int classObjectName_ ; private int defaultObjectName_ ;
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public boolean hasClassObjectName() { public boolean hasDefaultObjectName() {
return ((bitField0_ & 0x00000004) == 0x00000004); return ((bitField0_ & 0x00000004) == 0x00000004);
} }
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public int getClassObjectName() { public int getDefaultObjectName() {
return classObjectName_; return defaultObjectName_;
} }
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public Builder setClassObjectName(int value) { public Builder setDefaultObjectName(int value) {
bitField0_ |= 0x00000004; bitField0_ |= 0x00000004;
classObjectName_ = value; defaultObjectName_ = value;
return this; return this;
} }
/** /**
* <code>optional int32 class_object_name = 4;</code> * <code>optional int32 default_object_name = 4;</code>
* *
* <pre> * <pre>
* If this field is present, it contains the name of default object. * If this field is present, it contains the name of default object.
* </pre> * </pre>
*/ */
public Builder clearClassObjectName() { public Builder clearDefaultObjectName() {
bitField0_ = (bitField0_ & ~0x00000004); bitField0_ = (bitField0_ & ~0x00000004);
classObjectName_ = 0; defaultObjectName_ = 0;
return this; return this;
} }
core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+2 -2
View File
@@ -110,9 +110,9 @@ public class DeserializedClassDescriptor(
} }
private fun computeDefaultObjectDescriptor(): ClassDescriptor? { private fun computeDefaultObjectDescriptor(): ClassDescriptor? {
if (!classProto.hasClassObjectName()) return null if (!classProto.hasDefaultObjectName()) return null
val defaultObjectName = c.nameResolver.getName(classProto.getClassObjectName()) val defaultObjectName = c.nameResolver.getName(classProto.getDefaultObjectName())
return memberScope.getClassifier(defaultObjectName) as? ClassDescriptor return memberScope.getClassifier(defaultObjectName) as? ClassDescriptor
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+1 -1
View File
@@ -66,7 +66,7 @@ private class ClassClsStubBuilder(
supertypeIds supertypeIds
} }
} }
private val defaultObjectName = if (classProto.hasClassObjectName()) c.nameResolver.getName(classProto.getClassObjectName()) else null private val defaultObjectName = if (classProto.hasDefaultObjectName()) c.nameResolver.getName(classProto.getDefaultObjectName()) else null
private val classOrObjectStub = createClassOrObjectStubAndModifierListStub() private val classOrObjectStub = createClassOrObjectStubAndModifierListStub()