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

KT-1717 Don't make member visibility inherit when it is not declared explicitly

Browse Source 
#KT-1717 Fixed
This commit is contained in:
Svetlana Isakova
2012-04-03 19:12:29 +04:00
parent 5df7258708
commit 9b2eeb076e
45 changed files with 115 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/visibility2.jet
+2 -2
View File
@@ -38,7 +38,7 @@ class Q {
}
}
//check that 'toString' can be invoked without specifying 'public' and ': String'
//check that 'toString' can be invoked without specifying return type
class NewClass : java.util.ArrayList<Integer>() {
override fun toString() = "a"
public override fun toString() = "a"
}
compiler/testData/diagnostics/tests/scopes/visibility_inherit_modifier.jet
+5 -9
View File
@@ -18,7 +18,7 @@ open class D {
}
class E : D() {
internal override fun self() = this
internal <!NOTHING_TO_OVERRIDE!>override<!> fun self() = this
fun test() {
val <!UNUSED_VARIABLE!>s<!> : E = self()
@@ -31,11 +31,7 @@ open class F {
}
class G : F() {
override fun protected_fun() {}
}
fun test_fun_stays_protected(g: G) {
g.<!UNRESOLVED_REFERENCE!>protected_fun<!>()
<!CANNOT_CHANGE_ACCESS_PRIVILEGE!>override<!> fun protected_fun() {}
}
//------------
@@ -61,11 +57,11 @@ trait T {
}
open class L : T {
override fun foo() {}
<!CANNOT_WEAKEN_ACCESS_PRIVILEGE!>override<!> fun foo() {}
}
class M : L() {
<!CANNOT_WEAKEN_ACCESS_PRIVILEGE!>internal<!> override fun foo() {}
internal override fun foo() {}
}
//---------------
trait R {
@@ -82,4 +78,4 @@ trait Q : R {
class S : P, Q {
<!CANNOT_CHANGE_ACCESS_PRIVILEGE!>internal<!> override fun foo() {}
}
}