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

Effective visibility: messages fix

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-10-14 10:07:03 +03:00
parent c210ca5b4d
commit d1c7749103
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptors/src/org/jetbrains/kotlin/descriptors/EffectiveVisibility.kt
+5 -5
View File
@@ -68,7 +68,7 @@ sealed class EffectiveVisibility(val name: String) {
override fun hashCode() = container?.hashCode() ?: 0 override fun hashCode() = container?.hashCode() ?: 0
override fun toString() = "${super.toString()}(${container?.name ?: '?'})" override fun toString() = "${super.toString()} (in ${container?.name ?: '?'})"
override fun relation(other: EffectiveVisibility) = when (other) { override fun relation(other: EffectiveVisibility) = when (other) {
Public -> Permissiveness.LESS Public -> Permissiveness.LESS
@@ -98,7 +98,7 @@ sealed class EffectiveVisibility(val name: String) {
} }
// Lower bound for all protected visibilities // Lower bound for all protected visibilities
object ProtectedBound : EffectiveVisibility("most protected") { object ProtectedBound : EffectiveVisibility("protected (in different classes)") {
override fun relation(other: EffectiveVisibility) = when (other) { override fun relation(other: EffectiveVisibility) = when (other) {
Public, is Protected -> Permissiveness.LESS Public, is Protected -> Permissiveness.LESS
Private, InternalProtectedBound -> Permissiveness.MORE Private, InternalProtectedBound -> Permissiveness.MORE
@@ -114,13 +114,13 @@ sealed class EffectiveVisibility(val name: String) {
} }
// Lower bound for internal and protected(C) // Lower bound for internal and protected(C)
class InternalProtected(val container: ClassDescriptor?): EffectiveVisibility("protected & internal") { class InternalProtected(val container: ClassDescriptor?): EffectiveVisibility("internal & protected") {
override fun equals(other: Any?) = (other is InternalProtected && container == other.container) override fun equals(other: Any?) = (other is InternalProtected && container == other.container)
override fun hashCode() = container?.hashCode() ?: 0 override fun hashCode() = container?.hashCode() ?: 0
override fun toString() = "${super.toString()}(${container?.name ?: '?'})" override fun toString() = "${super.toString()} (in ${container?.name ?: '?'})"
override fun relation(other: EffectiveVisibility) = when (other) { override fun relation(other: EffectiveVisibility) = when (other) {
Public, Internal -> Permissiveness.LESS Public, Internal -> Permissiveness.LESS
@@ -146,7 +146,7 @@ sealed class EffectiveVisibility(val name: String) {
} }
// Lower bound for internal and protected lower bound // Lower bound for internal and protected lower bound
object InternalProtectedBound : EffectiveVisibility("most protected & internal") { object InternalProtectedBound : EffectiveVisibility("internal & protected (in different classes)") {
override fun relation(other: EffectiveVisibility) = when (other) { override fun relation(other: EffectiveVisibility) = when (other) {
Public, is Protected, is InternalProtected, ProtectedBound, Internal -> Permissiveness.LESS Public, is Protected, is InternalProtected, ProtectedBound, Internal -> Permissiveness.LESS
Private -> Permissiveness.MORE Private -> Permissiveness.MORE