From 2cdd4135909fa8ab2c628293f9611a9781d43088 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 9 Oct 2015 19:13:54 +0300 Subject: [PATCH] StdLib generators: Add some infix extensions for DSL, remove unneeded import, simplify declarations. --- js/js.libraries/src/core/kotlin_special.kt | 1 - .../src/generators/GenerateStandardLib.kt | 1 - .../kotlin-stdlib-gen/src/templates/Engine.kt | 21 ++++++------------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/js/js.libraries/src/core/kotlin_special.kt b/js/js.libraries/src/core/kotlin_special.kt index 5594d29d13b..79c108b27f2 100644 --- a/js/js.libraries/src/core/kotlin_special.kt +++ b/js/js.libraries/src/core/kotlin_special.kt @@ -5,7 +5,6 @@ package kotlin // See: https://github.com/JetBrains/kotlin/tree/master/libraries/stdlib // -import kotlin.platform.* import java.util.* import java.util.Collections // TODO: it's temporary while we have java.util.Collections in js diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt index d8279483b12..6716d810e5a 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt @@ -37,7 +37,6 @@ fun List.writeTo(file: File, builder: GenericFunction.() -> Str its.use { its.append("package kotlin\n\n") its.append("$COMMON_AUTOGENERATED_WARNING\n\n") - its.append("import kotlin.platform.*\n") // TODO: Remove unneeded import its.append("import java.util.*\n\n") its.append("import java.util.Collections // TODO: it's temporary while we have java.util.Collections in js\n\n") for (t in this.sortedBy { it.signature }) { diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt index 9b337b8740e..5a9dd6d70a0 100644 --- a/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt +++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt @@ -413,20 +413,11 @@ class GenericFunction(val signature: String, val keyword: String = "fun") { } -fun f(signature: String, init: GenericFunction.() -> Unit): GenericFunction { - val gf = GenericFunction(signature) - gf.init() - return gf -} +infix fun MutableList.add(item: GenericFunction) = add(item) +infix fun MutableList.addAll(items: Iterable) = this.addAll(iterable = items) -fun pval(signature: String, init: GenericFunction.() -> Unit): GenericFunction { - val gf = GenericFunction(signature, "val") - gf.init() - return gf -} +fun f(signature: String, init: GenericFunction.() -> Unit) = GenericFunction(signature).apply(init) -fun pvar(signature: String, init: GenericFunction.() -> Unit): GenericFunction { - val gf = GenericFunction(signature, "var") - gf.init() - return gf -} +fun pval(signature: String, init: GenericFunction.() -> Unit) = GenericFunction(signature, "val").apply(init) + +fun pvar(signature: String, init: GenericFunction.() -> Unit) = GenericFunction(signature, "var").apply(init)