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

contentDeepToString: use list instead of set for infinite recursion tracking

Browse Source 
#KT-26388
This commit is contained in:
Ilya Gorbunov
2018-09-13 02:09:32 +03:00
parent 2d356b89b5
commit 9353cfb526
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/collections/Arrays.kt
+3 -3
View File
@@ -115,12 +115,12 @@ internal fun <T> Array<out T>.contentDeepEqualsImpl(other: Array<out T>): Boolea
internal fun <T> Array<out T>.contentDeepToStringImpl(): String { internal fun <T> Array<out T>.contentDeepToStringImpl(): String {
val length = size.coerceAtMost((Int.MAX_VALUE - 2) / 5) * 5 + 2 // in order not to overflow Int.MAX_VALUE val length = size.coerceAtMost((Int.MAX_VALUE - 2) / 5) * 5 + 2 // in order not to overflow Int.MAX_VALUE
return buildString(length) { return buildString(length) {
contentDeepToStringInternal(this, mutableSetOf()) contentDeepToStringInternal(this, mutableListOf())
} }
} }
@UseExperimental(ExperimentalUnsignedTypes::class) @UseExperimental(ExperimentalUnsignedTypes::class)
private fun <T> Array<out T>.contentDeepToStringInternal(result: StringBuilder, processed: MutableSet<Array<*>>) { private fun <T> Array<out T>.contentDeepToStringInternal(result: StringBuilder, processed: MutableList<Array<*>>) {
if (this in processed) { if (this in processed) {
result.append("[...]") result.append("[...]")
return return
@@ -155,5 +155,5 @@ private fun <T> Array<out T>.contentDeepToStringInternal(result: StringBuilder,
} }
result.append(']') result.append(']')
processed.remove(this) processed.removeAt(processed.lastIndex)
} }