azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the brittle contains optimization code #KT-47707

Browse Source
This commit is contained in:
Abduqodiri Qurbonzoda
2022-09-07 02:01:09 +03:00
committed by Space
parent 51fd2af6fd
commit 7060811c8b
9 changed files with 30 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-stdlib-gen/src/templates/Generators.kt
+7 -25
View File
@@ -367,13 +367,6 @@ object Generators : TemplateGroupBase() {
}
}
private fun elementsConversionClause(elements: Family) =
"""
Before Kotlin 1.6, the [elements] ${elements.doc.collection} may have been converted to a [HashSet] to speed up the operation, thus the elements were required to have
a correct and stable implementation of `hashCode()` that didn't change between successive invocations.
On JVM, you can enable this behavior back with the system property `kotlin.collections.convert_arg_to_set_in_removeAll` set to `true`.
"""
val f_minus_iterable = fn("minus(elements: Iterable<T>)") {
include(Iterables, Sets, Sequences)
} builder {
@@ -384,7 +377,7 @@ object Generators : TemplateGroupBase() {
specialFor(Sets, Sequences) { returns("SELF") }
body {
"""
val other = elements.convertToSetForSetOperationWith(this)
val other = elements.convertToListIfNotCollection()
if (other.isEmpty())
return this.toList()
@@ -402,7 +395,7 @@ object Generators : TemplateGroupBase() {
}
body {
"""
val other = elements.convertToSetForSetOperationWith(this)
val other = elements.convertToListIfNotCollection()
if (other.isEmpty())
return this.toSet()
if (other is Set)
@@ -429,7 +422,7 @@ object Generators : TemplateGroupBase() {
"""
return object: Sequence<T> {
override fun iterator(): Iterator<T> {
val other = elements.convertToSetForSetOperation()
val other = elements.convertToListIfNotCollection()
if (other.isEmpty())
return this@minus.iterator()
else
@@ -440,9 +433,6 @@ object Generators : TemplateGroupBase() {
}
}
doc {
doc + elementsConversionClause(Iterables)
}
}
val f_minus_array = fn("minus(elements: Array<out T>)") {
@@ -456,8 +446,7 @@ object Generators : TemplateGroupBase() {
body {
"""
if (elements.isEmpty()) return this.toList()
val other = elements.convertToSetForSetOperation()
return this.filterNot { it in other }
return this.filterNot { it in elements }
"""
}
specialFor(Sets) {
@@ -492,16 +481,12 @@ object Generators : TemplateGroupBase() {
if (elements.isEmpty()) return this
return object: Sequence<T> {
override fun iterator(): Iterator<T> {
val other = elements.convertToSetForSetOperation()
return this@minus.filterNot { it in other }.iterator()
return this@minus.filterNot { it in elements }.iterator()
}
}
"""
}
}
doc {
doc + elementsConversionClause(ArraysOfObjects)
}
}
val f_minus_sequence = fn("minus(elements: Sequence<T>)") {
@@ -514,7 +499,7 @@ object Generators : TemplateGroupBase() {
specialFor(Sets, Sequences) { returns("SELF") }
body {
"""
val other = elements.convertToSetForSetOperation()
val other = elements.toList()
if (other.isEmpty())
return this.toList()
@@ -553,7 +538,7 @@ object Generators : TemplateGroupBase() {
"""
return object: Sequence<T> {
override fun iterator(): Iterator<T> {
val other = elements.convertToSetForSetOperation()
val other = elements.toList()
if (other.isEmpty())
return this@minus.iterator()
else
@@ -563,9 +548,6 @@ object Generators : TemplateGroupBase() {
"""
}
}
doc {
doc + elementsConversionClause(Sequences)
}
}
val f_partition = fn("partition(predicate: (T) -> Boolean)") {