From 816e9975ad2232adc159bc9448bfc64704a3f743 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 21 Jan 2014 15:05:06 +0400 Subject: [PATCH] Overload constructor of Composite iterator for lazy use cases --- libraries/sandbox/extensionTraits/src/kotlin2/Iterators.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/sandbox/extensionTraits/src/kotlin2/Iterators.kt b/libraries/sandbox/extensionTraits/src/kotlin2/Iterators.kt index 50b7c304425..a4c0391206b 100644 --- a/libraries/sandbox/extensionTraits/src/kotlin2/Iterators.kt +++ b/libraries/sandbox/extensionTraits/src/kotlin2/Iterators.kt @@ -160,9 +160,10 @@ class FunctionIterator(val nextFunction: () -> T?): AbstractIterator() { } /** An [[Iterator]] which iterates over a number of iterators in sequence */ -class CompositeIterator(vararg iterators: Iterator): AbstractIterator() { +fun CompositeIterator(vararg iterators: Iterator) = CompositeIterator(iterators.iterator()) + +class CompositeIterator(val iterators: Iterator>): AbstractIterator() { - val iteratorsIter = iterators.iterator() var currentIter: Iterator? = null override protected fun computeNext(): Unit {