From 1414fe1699a4264ce7802b83b143bc4188be01b1 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 13 Oct 2015 19:29:21 +0300 Subject: [PATCH] Add IS_DATA flag --- .../org/jetbrains/kotlin/serialization/DebugProtoBuf.java | 8 ++++++++ core/deserialization/src/descriptors.proto | 1 + .../src/org/jetbrains/kotlin/serialization/Flags.java | 1 + .../src/org/jetbrains/kotlin/serialization/ProtoBuf.java | 8 ++++++++ 4 files changed, 18 insertions(+) diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java index 5546cd421af..72c7eb003ab 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/DebugProtoBuf.java @@ -9015,6 +9015,7 @@ public final class DebugProtoBuf { *Modality *ClassKind *isInner + *isData * */ boolean hasFlags(); @@ -9028,6 +9029,7 @@ public final class DebugProtoBuf { *Modality *ClassKind *isInner + *isData * */ int getFlags(); @@ -9627,6 +9629,7 @@ public final class DebugProtoBuf { *Modality *ClassKind *isInner + *isData * */ public boolean hasFlags() { @@ -9642,6 +9645,7 @@ public final class DebugProtoBuf { *Modality *ClassKind *isInner + *isData * */ public int getFlags() { @@ -10714,6 +10718,7 @@ public final class DebugProtoBuf { *Modality *ClassKind *isInner + *isData * */ public boolean hasFlags() { @@ -10729,6 +10734,7 @@ public final class DebugProtoBuf { *Modality *ClassKind *isInner + *isData * */ public int getFlags() { @@ -10744,6 +10750,7 @@ public final class DebugProtoBuf { *Modality *ClassKind *isInner + *isData * */ public Builder setFlags(int value) { @@ -10762,6 +10769,7 @@ public final class DebugProtoBuf { *Modality *ClassKind *isInner + *isData * */ public Builder clearFlags() { diff --git a/core/deserialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto index cd0666f32e7..2fb744513fd 100644 --- a/core/deserialization/src/descriptors.proto +++ b/core/deserialization/src/descriptors.proto @@ -170,6 +170,7 @@ message Class { Modality ClassKind isInner + isData */ optional int32 flags = 1 [default = 6 /* public final class, no annotations */]; diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java index 1cba157e892..c31d2fb1c8b 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java @@ -34,6 +34,7 @@ public class Flags { public static final FlagField CLASS_KIND = FlagField.after(MODALITY, ProtoBuf.Class.Kind.values()); public static final BooleanFlagField IS_INNER = FlagField.booleanAfter(CLASS_KIND); + public static final BooleanFlagField IS_DATA = FlagField.booleanAfter(IS_INNER); // Callables diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java index 2b70abb4c12..832336388bf 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java @@ -7186,6 +7186,7 @@ public final class ProtoBuf { *Modality *ClassKind *isInner + *isData * */ boolean hasFlags(); @@ -7199,6 +7200,7 @@ public final class ProtoBuf { *Modality *ClassKind *isInner + *isData * */ int getFlags(); @@ -7697,6 +7699,7 @@ public final class ProtoBuf { *Modality *ClassKind *isInner + *isData * */ public boolean hasFlags() { @@ -7712,6 +7715,7 @@ public final class ProtoBuf { *Modality *ClassKind *isInner + *isData * */ public int getFlags() { @@ -8601,6 +8605,7 @@ public final class ProtoBuf { *Modality *ClassKind *isInner + *isData * */ public boolean hasFlags() { @@ -8616,6 +8621,7 @@ public final class ProtoBuf { *Modality *ClassKind *isInner + *isData * */ public int getFlags() { @@ -8631,6 +8637,7 @@ public final class ProtoBuf { *Modality *ClassKind *isInner + *isData * */ public Builder setFlags(int value) { @@ -8649,6 +8656,7 @@ public final class ProtoBuf { *Modality *ClassKind *isInner + *isData * */ public Builder clearFlags() {