From 15ce4f885647eab18eeac633b8050b25cc8d7d6c Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 27 Jun 2016 15:50:26 +0300 Subject: [PATCH] Minor. Add comment about type aliases based types metadata format --- .../kotlin/serialization/DebugProtoBuf.java | 40 +++++++++++++++++++ core/deserialization/src/descriptors.proto | 3 ++ .../kotlin/serialization/ProtoBuf.java | 40 +++++++++++++++++++ 3 files changed, 83 insertions(+) diff --git a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java index 8a63b18e80f..0415409a6b9 100644 --- a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java +++ b/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java @@ -5449,10 +5449,20 @@ public final class DebugProtoBuf { /** * optional int32 type_alias_name = 12; + * + *
+     * Note that this may be present only for abbreviated_type
+     * Top level types are always fully expanded
+     * 
*/ boolean hasTypeAliasName(); /** * optional int32 type_alias_name = 12; + * + *
+     * Note that this may be present only for abbreviated_type
+     * Top level types are always fully expanded
+     * 
*/ int getTypeAliasName(); @@ -6709,12 +6719,22 @@ public final class DebugProtoBuf { private int typeAliasName_; /** * optional int32 type_alias_name = 12; + * + *
+     * Note that this may be present only for abbreviated_type
+     * Top level types are always fully expanded
+     * 
*/ public boolean hasTypeAliasName() { return ((bitField0_ & 0x00000080) == 0x00000080); } /** * optional int32 type_alias_name = 12; + * + *
+     * Note that this may be present only for abbreviated_type
+     * Top level types are always fully expanded
+     * 
*/ public int getTypeAliasName() { return typeAliasName_; @@ -7951,18 +7971,33 @@ public final class DebugProtoBuf { private int typeAliasName_ ; /** * optional int32 type_alias_name = 12; + * + *
+       * Note that this may be present only for abbreviated_type
+       * Top level types are always fully expanded
+       * 
*/ public boolean hasTypeAliasName() { return ((bitField0_ & 0x00000100) == 0x00000100); } /** * optional int32 type_alias_name = 12; + * + *
+       * Note that this may be present only for abbreviated_type
+       * Top level types are always fully expanded
+       * 
*/ public int getTypeAliasName() { return typeAliasName_; } /** * optional int32 type_alias_name = 12; + * + *
+       * Note that this may be present only for abbreviated_type
+       * Top level types are always fully expanded
+       * 
*/ public Builder setTypeAliasName(int value) { bitField0_ |= 0x00000100; @@ -7972,6 +8007,11 @@ public final class DebugProtoBuf { } /** * optional int32 type_alias_name = 12; + * + *
+       * Note that this may be present only for abbreviated_type
+       * Top level types are always fully expanded
+       * 
*/ public Builder clearTypeAliasName() { bitField0_ = (bitField0_ & ~0x00000100); diff --git a/core/deserialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto index 8d29a6b4b44..bac4337c95f 100644 --- a/core/deserialization/src/descriptors.proto +++ b/core/deserialization/src/descriptors.proto @@ -127,6 +127,9 @@ message Type { optional int32 type_parameter = 7; // id of the type parameter // Name of the type parameter in the immediate owner optional int32 type_parameter_name = 9 [(name_id_in_table) = true]; + + // Note that this may be present only for abbreviated_type + // Top level types are always fully expanded optional int32 type_alias_name = 12 [(fq_name_id_in_table) = true]; optional Type outer_type = 10; diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java index a77fa2ad0e4..bfa622fa866 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java @@ -4437,10 +4437,20 @@ public final class ProtoBuf { /** * optional int32 type_alias_name = 12; + * + *
+     * Note that this may be present only for abbreviated_type
+     * Top level types are always fully expanded
+     * 
*/ boolean hasTypeAliasName(); /** * optional int32 type_alias_name = 12; + * + *
+     * Note that this may be present only for abbreviated_type
+     * Top level types are always fully expanded
+     * 
*/ int getTypeAliasName(); @@ -5510,12 +5520,22 @@ public final class ProtoBuf { private int typeAliasName_; /** * optional int32 type_alias_name = 12; + * + *
+     * Note that this may be present only for abbreviated_type
+     * Top level types are always fully expanded
+     * 
*/ public boolean hasTypeAliasName() { return ((bitField0_ & 0x00000080) == 0x00000080); } /** * optional int32 type_alias_name = 12; + * + *
+     * Note that this may be present only for abbreviated_type
+     * Top level types are always fully expanded
+     * 
*/ public int getTypeAliasName() { return typeAliasName_; @@ -6478,18 +6498,33 @@ public final class ProtoBuf { private int typeAliasName_ ; /** * optional int32 type_alias_name = 12; + * + *
+       * Note that this may be present only for abbreviated_type
+       * Top level types are always fully expanded
+       * 
*/ public boolean hasTypeAliasName() { return ((bitField0_ & 0x00000100) == 0x00000100); } /** * optional int32 type_alias_name = 12; + * + *
+       * Note that this may be present only for abbreviated_type
+       * Top level types are always fully expanded
+       * 
*/ public int getTypeAliasName() { return typeAliasName_; } /** * optional int32 type_alias_name = 12; + * + *
+       * Note that this may be present only for abbreviated_type
+       * Top level types are always fully expanded
+       * 
*/ public Builder setTypeAliasName(int value) { bitField0_ |= 0x00000100; @@ -6499,6 +6534,11 @@ public final class ProtoBuf { } /** * optional int32 type_alias_name = 12; + * + *
+       * Note that this may be present only for abbreviated_type
+       * Top level types are always fully expanded
+       * 
*/ public Builder clearTypeAliasName() { bitField0_ = (bitField0_ & ~0x00000100);