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

Add serialization for PRIVATE_TO_THIS

Browse Source
This commit is contained in:
Stanislav Erokhin
2014-11-20 17:06:16 +03:00
parent fc8cec9509
commit f640f82ed0
9 changed files with 80 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/serialization/src/descriptors.proto
+2 -1
View File
@@ -299,5 +299,6 @@ enum Visibility {
PRIVATE = 0x01;
PROTECTED = 0x02;
PUBLIC = 0x03;
EXTRA = 0x04; // there's an extra field for the actual visibility
PRIVATE_TO_THIS = 0x04;
EXTRA = 0x05; // there's an extra field for the actual visibility
}
core/serialization/src/org/jetbrains/jet/descriptors/serialization/Flags.java
+3
View File
@@ -148,6 +148,9 @@ public class Flags {
else if (visibility == Visibilities.PRIVATE) {
return ProtoBuf.Visibility.PRIVATE;
}
else if (visibility == Visibilities.PRIVATE_TO_THIS) {
return ProtoBuf.Visibility.PRIVATE_TO_THIS;
}
else if (visibility == Visibilities.PROTECTED) {
return ProtoBuf.Visibility.PROTECTED;
}
core/serialization/src/org/jetbrains/jet/descriptors/serialization/ProtoBuf.java
+14 -5
View File
@@ -107,13 +107,17 @@ public final class ProtoBuf {
*/
PUBLIC(3, 3),
/**
* <code>EXTRA = 4;</code>
* <code>PRIVATE_TO_THIS = 4;</code>
*/
PRIVATE_TO_THIS(4, 4),
/**
* <code>EXTRA = 5;</code>
*
* <pre>
* there's an extra field for the actual visibility
* </pre>
*/
EXTRA(4, 4),
EXTRA(5, 5),
;
/**
@@ -137,13 +141,17 @@ public final class ProtoBuf {
*/
public static final int PUBLIC_VALUE = 3;
/**
* <code>EXTRA = 4;</code>
* <code>PRIVATE_TO_THIS = 4;</code>
*/
public static final int PRIVATE_TO_THIS_VALUE = 4;
/**
* <code>EXTRA = 5;</code>
*
* <pre>
* there's an extra field for the actual visibility
* </pre>
*/
public static final int EXTRA_VALUE = 4;
public static final int EXTRA_VALUE = 5;
public final int getNumber() { return value; }
@@ -154,7 +162,8 @@ public final class ProtoBuf {
case 1: return PRIVATE;
case 2: return PROTECTED;
case 3: return PUBLIC;
case 4: return EXTRA;
case 4: return PRIVATE_TO_THIS;
case 5: return EXTRA;
default: return null;
}
}
core/serialization/src/org/jetbrains/jet/descriptors/serialization/protoEnumMapping.kt
+1
View File
@@ -40,6 +40,7 @@ fun modality(modality: ProtoBuf.Modality) = when (modality) {
fun visibility(visibility: ProtoBuf.Visibility) = when (visibility) {
ProtoBuf.Visibility.INTERNAL -> Visibilities.INTERNAL
ProtoBuf.Visibility.PRIVATE -> Visibilities.PRIVATE
ProtoBuf.Visibility.PRIVATE_TO_THIS -> Visibilities.PRIVATE_TO_THIS
ProtoBuf.Visibility.PROTECTED -> Visibilities.PROTECTED
ProtoBuf.Visibility.PUBLIC -> Visibilities.PUBLIC
ProtoBuf.Visibility.EXTRA -> throw UnsupportedOperationException("Extra visibilities are not supported yet")