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

get rid of 'internal protected' visibility

Browse Source
This commit is contained in:
Svetlana Isakova
2012-06-09 19:43:53 +04:00
parent f556485db0
commit 2286022307
9 changed files with 12 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.jet
+4 -4
View File
@@ -40,7 +40,7 @@ fun test_fun_stays_protected(g: G) {
//------------
open class H {
internal protected open fun pi_fun() {}
protected open fun pi_fun() {}
}
class I : H() {
@@ -48,7 +48,7 @@ class I : H() {
}
class J : H() {
internal override fun pi_fun() {}
<!CANNOT_CHANGE_ACCESS_PRIVILEGE!>internal<!> override fun pi_fun() {}
}
class K : H() {
@@ -69,11 +69,11 @@ class M : L() {
}
//---------------
trait R {
internal protected fun foo() {}
<!INCOMPATIBLE_MODIFIERS!>internal<!> <!INCOMPATIBLE_MODIFIERS!>protected<!> fun foo() {}
}
trait P : R {
internal override fun foo() {}
<!CANNOT_CHANGE_ACCESS_PRIVILEGE!>internal<!> override fun foo() {}
}
trait Q : R {