From b012b9d8a35c28407845554dfba617f43515ee09 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 19 Feb 2015 12:10:39 +0300 Subject: [PATCH] Stdlib: Move classes out of class object in FunctionalList --- .../src/kotlin/concurrent/FunctionalList.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt b/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt index 19797e8ad52..dd7595dd718 100644 --- a/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt +++ b/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt @@ -38,16 +38,16 @@ public abstract class FunctionalList(public val size: Int) { override fun hasNext(): Boolean = !cur.empty } + private class Empty() : FunctionalList(0) { + override val head: T + get() = throw java.util.NoSuchElementException() + override val tail: FunctionalList + get() = throw java.util.NoSuchElementException() + } + + private class Standard(override val head: T, override val tail: FunctionalList) : FunctionalList(tail.size + 1) + class object { - private class Empty() : FunctionalList(0) { - override val head: T - get() = throw java.util.NoSuchElementException() - override val tail: FunctionalList - get() = throw java.util.NoSuchElementException() - } - - private class Standard(override val head: T, override val tail: FunctionalList) : FunctionalList(tail.size + 1) - public fun emptyList(): FunctionalList = Empty() public fun of(element: T): FunctionalList = FunctionalList.Standard(element, emptyList())