From 212160fa47f03d0c38b66d206ab2042f8256972d Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Tue, 20 Dec 2011 17:46:26 +0000
Subject: [PATCH] added Array<T>.to(collection) too, along with simpler more
 DRY one liners for arrayList(), linkedList() and hashSet() helper functions

---
 stdlib.ipr               |  3 +++
 stdlib/ktSrc/JavaUtil.kt | 28 ++++++++++------------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/stdlib.ipr b/stdlib.ipr
index 30c354500c5..693c766ab77 100644
--- a/stdlib.ipr
+++ b/stdlib.ipr
@@ -27,6 +27,9 @@
     <option name="SKIP_IMPORT_STATEMENTS" value="false" />
   </component>
   <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
   <component name="IdProvider" IDEtalkID="89F322227D19AFBE9B68C2A85DBC4124" />
   <component name="InspectionProjectProfileManager">
     <profiles>
diff --git a/stdlib/ktSrc/JavaUtil.kt b/stdlib/ktSrc/JavaUtil.kt
index 46cbda926e0..cae1b643c5c 100644
--- a/stdlib/ktSrc/JavaUtil.kt
+++ b/stdlib/ktSrc/JavaUtil.kt
@@ -11,28 +11,13 @@ val Collection<*>.empty : Boolean
     get() = isEmpty()
 
 /** Returns a new ArrayList with a variable number of initial elements */
-inline fun arrayList<T>(vararg values: T) : ArrayList<T> {
-  val answer = ArrayList<T>()
-  for (v in values)
-    answer.add(v)
-  return answer;
-}
+inline fun arrayList<T>(vararg values: T) : ArrayList<T> = values.to(ArrayList<T>(values.size))
 
 /** Returns a new LinkedList with a variable number of initial elements */
-inline fun linkedList<T>(vararg values: T) : LinkedList<T> {
-  val answer = LinkedList<T>()
-  for (v in values)
-    answer.add(v)
-  return answer;
-}
+inline fun linkedList<T>(vararg values: T) : LinkedList<T>  = values.to(LinkedList<T>())
 
 /** Returns a new HashSet with a variable number of initial elements */
-inline fun hashSet<T>(vararg values: T) : HashSet<T> {
-  val answer = HashSet<T>()
-  for (v in values)
-    answer.add(v)
-  return answer;
-}
+inline fun hashSet<T>(vararg values: T) : HashSet<T> = values.to(HashSet<T>(values.size))
 
 /** Returns true if any elements in the collection match the given predicate */
 inline fun <T> java.lang.Iterable<T>.any(predicate: fun(T): Boolean) : Boolean {
@@ -123,6 +108,13 @@ inline fun <T, R> java.util.Collection<T>.map(result: Collection<R> = ArrayList<
   return result
 }
 
+// TODO would be nice to not have to write extension methods for Array, Iterable and Iterator
+
+inline fun <T, C: Collection<T>> Array<T>.to(result: C) : C {
+  for (elem in this)
+    result.add(elem)
+  return result
+}
 
 inline fun <T, C: Collection<T>> java.lang.Iterable<T>.to(result: C) : C {
   for (elem in this)