From 9e8600e52f46af108a2a59819b8f7b5e6aed46b3 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 20 Oct 2015 17:39:50 +0300
Subject: [PATCH] Cleanup in stdlib generators

---
 .../kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt | 2 +-
 libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt   | 2 +-
 libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
index 6716d810e5a..dd4980a64ba 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/generators/GenerateStandardLib.kt
@@ -17,7 +17,7 @@ private val COMMON_AUTOGENERATED_WARNING: String = """//
  * at runtime.
  */
 fun main(args: Array<String>) {
-    require(args.size() == 1) { "Expecting Kotlin project home path as an argument" }
+    require(args.size == 1) { "Expecting Kotlin project home path as an argument" }
 
     val outDir = File(File(args[0]), "libraries/stdlib/src/generated")
     require(outDir.exists()) { "$outDir doesn't exist!" }
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
index e00b9075082..5d1a43bd98b 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Arrays.kt
@@ -54,7 +54,7 @@ fun arrays(): List<GenericFunction> {
         }
     }
 
-    templates addAll PrimitiveType.values().map { primitive ->
+    templates addAll PrimitiveType.defaultPrimitives.map { primitive ->
         val arrayType = primitive.name + "Array"
         f("to$arrayType()") {
             only(ArraysOfObjects, Collections)
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
index c7d2104c571..c8c6dd42ff5 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/Engine.kt
@@ -43,7 +43,7 @@ enum class PrimitiveType {
     Double;
 
     companion object {
-        val defaultPrimitives = PrimitiveType.values().toSet()
+        val defaultPrimitives = PrimitiveType.values.toSet()
         val numericPrimitives = setOf(Int, Long, Byte, Short, Double, Float)
         val integralPrimitives = setOf(Int, Long, Byte, Short, Char)
 
@@ -170,7 +170,7 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
         buildPrimitives.addAll(p.toList())
     }
 
-    fun instantiate(vararg families: Family = Family.values()): List<ConcreteFunction> {
+    fun instantiate(vararg families: Family = Family.values): List<ConcreteFunction> {
         return families
                 .sortedBy { it.name }
                 .filter { buildFamilies.contains(it) }
@@ -201,7 +201,7 @@ class GenericFunction(val signature: String, val keyword: String = "fun") {
         Primitives, Generic -> SourceFile.Misc
     }
 
-    fun build(vararg families: Family = Family.values()): String {
+    fun build(vararg families: Family = Family.values): String {
         val builder = StringBuilder()
         for (family in families.sortedBy { it.name }) {
             if (buildFamilies.contains(family))