From 5b6805eede14c6ba6636f271c79d68b1e7da7c88 Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Tue, 6 Mar 2012 08:41:42 +0000
Subject: [PATCH] refactored flatMap()'s default argument values into
 flatMap(fn) and flatMapTo(coll, fn) for easier completion/documentation

---
 stdlib/ktSrc/JavaIterables.kt                       | 10 +++++++++-
 stdlib/ktSrc/generated/ArraysFromJavaIterables.kt   | 10 +++++++++-
 stdlib/ktSrc/generated/StandardFromJavaIterables.kt | 10 +++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/stdlib/ktSrc/JavaIterables.kt b/stdlib/ktSrc/JavaIterables.kt
index ddebe0115f0..14092aad1a2 100644
--- a/stdlib/ktSrc/JavaIterables.kt
+++ b/stdlib/ktSrc/JavaIterables.kt
@@ -83,7 +83,15 @@ inline fun <T, C: Collection<in T>> java.lang.Iterable<T>.filterNotTo(result: C,
   * Returns the result of transforming each item in the collection to a one or more values which
   * are concatenated together into a single collection
   */
-inline fun <T, out R> java.lang.Iterable<T>.flatMap(result: Collection<R> = ArrayList<R>(), transform: (T)-> Collection<R>) : Collection<R> {
+inline fun <T, R> java.lang.Iterable<T>.flatMap(transform: (T)-> Collection<R>) : Collection<R> {
+    return flatMapTo(ArrayList<R>(), transform)
+}
+
+/**
+  * Returns the result of transforming each item in the collection to a one or more values which
+  * are concatenated together into a single collection
+  */
+inline fun <T, R> java.lang.Iterable<T>.flatMapTo(result: Collection<R>, transform: (T)-> Collection<R>) : Collection<R> {
   for (elem in this) {
     val coll = transform(elem)
     if (coll != null) {
diff --git a/stdlib/ktSrc/generated/ArraysFromJavaIterables.kt b/stdlib/ktSrc/generated/ArraysFromJavaIterables.kt
index ccbda01553b..8d5a80aa89d 100644
--- a/stdlib/ktSrc/generated/ArraysFromJavaIterables.kt
+++ b/stdlib/ktSrc/generated/ArraysFromJavaIterables.kt
@@ -86,7 +86,15 @@ inline fun <T, C: Collection<in T>> Array<T>.filterNotTo(result: C, predicate: (
   * Returns the result of transforming each item in the collection to a one or more values which
   * are concatenated together into a single collection
   */
-inline fun <T, out R> Array<T>.flatMap(result: Collection<R> = ArrayList<R>(), transform: (T)-> Collection<R>) : Collection<R> {
+inline fun <T, R> Array<T>.flatMap(transform: (T)-> Collection<R>) : Collection<R> {
+    return flatMapTo(ArrayList<R>(), transform)
+}
+
+/**
+  * Returns the result of transforming each item in the collection to a one or more values which
+  * are concatenated together into a single collection
+  */
+inline fun <T, R> Array<T>.flatMapTo(result: Collection<R>, transform: (T)-> Collection<R>) : Collection<R> {
   for (elem in this) {
     val coll = transform(elem)
     if (coll != null) {
diff --git a/stdlib/ktSrc/generated/StandardFromJavaIterables.kt b/stdlib/ktSrc/generated/StandardFromJavaIterables.kt
index ccd1d9dd4af..6f3470b2f73 100644
--- a/stdlib/ktSrc/generated/StandardFromJavaIterables.kt
+++ b/stdlib/ktSrc/generated/StandardFromJavaIterables.kt
@@ -74,7 +74,15 @@ inline fun <T, C: Collection<in T>> Iterable<T>.filterNotTo(result: C, predicate
   * Returns the result of transforming each item in the collection to a one or more values which
   * are concatenated together into a single collection
   */
-inline fun <T, out R> Iterable<T>.flatMap(result: Collection<R> = ArrayList<R>(), transform: (T)-> Collection<R>) : Collection<R> {
+inline fun <T, R> Iterable<T>.flatMap(transform: (T)-> Collection<R>) : Collection<R> {
+    return flatMapTo(ArrayList<R>(), transform)
+}
+
+/**
+  * Returns the result of transforming each item in the collection to a one or more values which
+  * are concatenated together into a single collection
+  */
+inline fun <T, R> Iterable<T>.flatMapTo(result: Collection<R>, transform: (T)-> Collection<R>) : Collection<R> {
   for (elem in this) {
     val coll = transform(elem)
     if (coll != null) {