From 629a07c748f0edbca1940224e8a083f8d6601124 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Wed, 4 Dec 2013 17:04:28 +0400 Subject: [PATCH] Removing inlines annotation from properties --- libraries/stdlib/src/kotlin/Strings.kt | 2 +- libraries/stdlib/src/kotlin/StringsJVM.kt | 4 ++-- libraries/stdlib/src/kotlin/concurrent/Thread.kt | 12 ++++++------ libraries/stdlib/src/kotlin/io/Files.kt | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libraries/stdlib/src/kotlin/Strings.kt b/libraries/stdlib/src/kotlin/Strings.kt index 8131c9a2c43..31250f69b2f 100644 --- a/libraries/stdlib/src/kotlin/Strings.kt +++ b/libraries/stdlib/src/kotlin/Strings.kt @@ -49,7 +49,7 @@ public fun String?.orEmpty(): String = this ?: "" // "Extension functions" for CharSequence -inline val CharSequence.size : Int +val CharSequence.size : Int get() = this.length /** diff --git a/libraries/stdlib/src/kotlin/StringsJVM.kt b/libraries/stdlib/src/kotlin/StringsJVM.kt index f8611d3f32a..288b59b21d9 100644 --- a/libraries/stdlib/src/kotlin/StringsJVM.kt +++ b/libraries/stdlib/src/kotlin/StringsJVM.kt @@ -166,10 +166,10 @@ public fun String.toRegex(flags: Int=0): java.util.regex.Pattern { return java.util.regex.Pattern.compile(this, flags) } -inline val String.reader : StringReader +val String.reader : StringReader get() = StringReader(this) -inline val String.size : Int +val String.size : Int get() = length() diff --git a/libraries/stdlib/src/kotlin/concurrent/Thread.kt b/libraries/stdlib/src/kotlin/concurrent/Thread.kt index d8a9ec62f24..5cb2461f018 100644 --- a/libraries/stdlib/src/kotlin/concurrent/Thread.kt +++ b/libraries/stdlib/src/kotlin/concurrent/Thread.kt @@ -5,25 +5,25 @@ import java.util.concurrent.ExecutorService import java.util.concurrent.Future import java.util.concurrent.Callable -inline val currentThread : Thread +val currentThread : Thread get() = Thread.currentThread() -inline var Thread.name : String +var Thread.name : String get() = getName() set(name: String) { setName(name) } -inline var Thread.daemon : Boolean +var Thread.daemon : Boolean get() = isDaemon() set(on: Boolean) { setDaemon(on) } -inline val Thread.alive : Boolean +val Thread.alive : Boolean get() = isAlive() -inline var Thread.priority : Int +var Thread.priority : Int get() = getPriority() set(prio: Int) { setPriority(prio) } -inline var Thread.contextClassLoader : ClassLoader? +var Thread.contextClassLoader : ClassLoader? get() = getContextClassLoader() set(loader: ClassLoader?) { setContextClassLoader(loader) } diff --git a/libraries/stdlib/src/kotlin/io/Files.kt b/libraries/stdlib/src/kotlin/io/Files.kt index 90fd22ac331..3ecc0cce932 100644 --- a/libraries/stdlib/src/kotlin/io/Files.kt +++ b/libraries/stdlib/src/kotlin/io/Files.kt @@ -23,31 +23,31 @@ public fun File.recurse(block: (File) -> Unit): Unit { /** * Returns this if the file is a directory or the parent if its a file inside a directory */ -inline val File.directory: File +val File.directory: File get() = if (this.isDirectory()) this else this.getParentFile()!! /** * Returns the canonical path of the file */ -inline val File.canonicalPath: String +val File.canonicalPath: String get() = getCanonicalPath() /** * Returns the file name or "" for an empty name */ -inline val File.name: String +val File.name: String get() = getName() /** * Returns the file path or "" for an empty name */ -inline val File.path: String +val File.path: String get() = getPath() /** * Returns true if the file ends with the given extension */ -inline val File.extension: String +val File.extension: String get() { val text = this.name val idx = text.lastIndexOf('.')