From da2f886beea478eedd0d4595de681ab82c12a0b9 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 19 Nov 2012 19:52:33 +0400 Subject: [PATCH] Redundant projections removed from code --- compiler/frontend/src/jet/Collections.jet | 26 +++++++++++------------ js/js.libraries/src/core/javautil.kt | 10 ++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/compiler/frontend/src/jet/Collections.jet b/compiler/frontend/src/jet/Collections.jet index 7e26c66cc36..651a21e0cfd 100644 --- a/compiler/frontend/src/jet/Collections.jet +++ b/compiler/frontend/src/jet/Collections.jet @@ -10,7 +10,7 @@ public trait Collection : Iterable, Hashable { public fun toArray(a : Array) : Array // Bulk Operations - public fun containsAll(c : Collection) : Boolean + public fun containsAll(c : Collection) : Boolean } public trait MutableCollection : Collection, MutableIterable { @@ -22,9 +22,9 @@ public trait MutableCollection : Collection, MutableIterable { public fun remove(o : Any?) : Boolean // Bulk Modification Operations - public fun addAll(c : Collection) : Boolean - public fun removeAll(c : Collection) : Boolean - public fun retainAll(c : Collection) : Boolean + public fun addAll(c : Collection) : Boolean + public fun removeAll(c : Collection) : Boolean + public fun retainAll(c : Collection) : Boolean public fun clear() } @@ -38,7 +38,7 @@ public trait List : Collection { override fun toArray(a : Array) : Array // Bulk Operations - override fun containsAll(c : Collection) : Boolean + override fun containsAll(c : Collection) : Boolean // Positional Access Operations public fun get(index : Int) : E @@ -61,10 +61,10 @@ public trait MutableList : List, MutableCollection { override fun remove(o : Any?) : Boolean // Bulk Modification Operations - override fun addAll(c : Collection) : Boolean - public fun addAll(index : Int, c : Collection) : Boolean - override fun removeAll(c : Collection) : Boolean - override fun retainAll(c : Collection) : Boolean + override fun addAll(c : Collection) : Boolean + public fun addAll(index : Int, c : Collection) : Boolean + override fun removeAll(c : Collection) : Boolean + override fun retainAll(c : Collection) : Boolean override fun clear() // Positional Access Operations @@ -90,7 +90,7 @@ public trait Set : Collection { override fun toArray(a : Array) : Array // Bulk Operations - override fun containsAll(c : Collection) : Boolean + override fun containsAll(c : Collection) : Boolean } public trait MutableSet : Set, MutableCollection { @@ -102,9 +102,9 @@ public trait MutableSet : Set, MutableCollection { override fun remove(o : Any?) : Boolean // Bulk Modification Operations - override fun addAll(c : Collection) : Boolean - override fun removeAll(c : Collection) : Boolean - override fun retainAll(c : Collection) : Boolean + override fun addAll(c : Collection) : Boolean + override fun removeAll(c : Collection) : Boolean + override fun retainAll(c : Collection) : Boolean override fun clear() } diff --git a/js/js.libraries/src/core/javautil.kt b/js/js.libraries/src/core/javautil.kt index 2cd02777bf2..ce3e5f58ffd 100644 --- a/js/js.libraries/src/core/javautil.kt +++ b/js/js.libraries/src/core/javautil.kt @@ -22,10 +22,10 @@ public abstract class AbstractCollection() : MutableCollection { override fun add(e: E): Boolean = js.noImpl override fun remove(o: Any?): Boolean = js.noImpl - override fun addAll(c: Collection): Boolean = js.noImpl - override fun containsAll(c : Collection) : Boolean = js.noImpl - override fun removeAll(c : Collection) : Boolean = js.noImpl - override fun retainAll(c : Collection) : Boolean = js.noImpl + override fun addAll(c: Collection): Boolean = js.noImpl + override fun containsAll(c : Collection) : Boolean = js.noImpl + override fun removeAll(c : Collection) : Boolean = js.noImpl + override fun retainAll(c : Collection) : Boolean = js.noImpl override fun clear(): Unit = js.noImpl override fun size(): Int = js.noImpl @@ -41,7 +41,7 @@ public abstract class AbstractList(): AbstractCollection(), MutableList library("addAt") override fun add(index: Int, element: E): Unit = js.noImpl - override fun addAll(index : Int, c : Collection) : Boolean = js.noImpl + override fun addAll(index : Int, c : Collection) : Boolean = js.noImpl library("removeAt") override fun remove(index: Int): E = js.noImpl