Make CharSequence.length a function instead of property

And String.length as well.

This is done for JVM interoperability: java.lang.CharSequence is an open class
and has a function 'length()' which should be implemented in subclasses
somehow.

A minor unexpected effect of this is that String.length() is now a compile-time
constant (it wasn't such as a property because properties are not supported in
compile-time constant evaluation)

 #KT-3571 Fixed
This commit is contained in:
Alexander Udalov
2014-11-26 18:50:04 +03:00
parent 6b8da062a4
commit a7b88e9485
159 changed files with 265 additions and 313 deletions
@@ -6,11 +6,10 @@ fun test(x: Any) {
if (y !is String) return
class Local {
{
<!DEBUG_INFO_SMARTCAST!>x<!>.length
<!DEBUG_INFO_SMARTCAST!>y<!>.length
<!DEBUG_INFO_SMARTCAST!>x<!>.length()
<!DEBUG_INFO_SMARTCAST!>y<!>.length()
}
}
}
}
}
@@ -2,11 +2,11 @@ fun test(x: Any?) {
if (x !is String) return
class C {
val v = <!DEBUG_INFO_SMARTCAST!>x<!>.length
val v = <!DEBUG_INFO_SMARTCAST!>x<!>.length()
val vGet: Int
get() = <!DEBUG_INFO_SMARTCAST!>x<!>.length
get() = <!DEBUG_INFO_SMARTCAST!>x<!>.length()
val s: String = <!DEBUG_INFO_SMARTCAST!>x<!>
}
}
}
@@ -1,9 +1,9 @@
fun foo(x: Any?) {
if (x is String) {
object : Base(<!DEBUG_INFO_SMARTCAST!>x<!>) {
fun bar() = <!DEBUG_INFO_SMARTCAST!>x<!>.length
fun bar() = <!DEBUG_INFO_SMARTCAST!>x<!>.length()
}
}
}
open class Base(s: String)
open class Base(s: String)
@@ -4,9 +4,8 @@ fun test(x: Any) {
class LocalOuter {
inner class Local {
{
<!DEBUG_INFO_SMARTCAST!>x<!>.length
<!DEBUG_INFO_SMARTCAST!>x<!>.length()
}
}
}
}