From d7dfbe40a4727a98dd386975155f83bfbf82f80c Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 30 Sep 2014 22:16:32 +0400 Subject: [PATCH] Stdlib: moved CharSequence.size and String.size to StringJVM.kt because they are intrinsic in JS. --- libraries/stdlib/src/kotlin/text/Strings.kt | 9 --------- libraries/stdlib/src/kotlin/text/StringsJVM.kt | 6 ++++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libraries/stdlib/src/kotlin/text/Strings.kt b/libraries/stdlib/src/kotlin/text/Strings.kt index 844947746cd..99e58eac6a7 100644 --- a/libraries/stdlib/src/kotlin/text/Strings.kt +++ b/libraries/stdlib/src/kotlin/text/Strings.kt @@ -41,15 +41,6 @@ public fun CharSequence.iterator(): CharIterator = object : CharIterator() { /** Returns the string if it is not null or the empty string if its null */ public fun String?.orEmpty(): String = this ?: "" - -// "Extension functions" for CharSequence - -public val CharSequence.size: Int - get() = this.length - -public val String.size: Int - get() = length() - public val String.indices: IntRange get() = 0..length() - 1 diff --git a/libraries/stdlib/src/kotlin/text/StringsJVM.kt b/libraries/stdlib/src/kotlin/text/StringsJVM.kt index b3c28afce38..26888bfcf69 100644 --- a/libraries/stdlib/src/kotlin/text/StringsJVM.kt +++ b/libraries/stdlib/src/kotlin/text/StringsJVM.kt @@ -136,6 +136,12 @@ public fun CharSequence.toString(): String? = (this as java.lang.CharSequence).t public fun CharSequence.length(): Int = (this as java.lang.CharSequence).length() +public val CharSequence.size: Int + get() = this.length + +public val String.size: Int + get() = length() + public fun String.toBoolean(): Boolean = java.lang.Boolean.parseBoolean(this) public fun String.toShort(): Short = java.lang.Short.parseShort(this) public fun String.toInt(): Int = java.lang.Integer.parseInt(this)