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

Minor: refactor and rename parameters.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-09-27 23:44:52 +03:00
parent 31da36bedf
commit e9f40c41c2
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/collections/AbstractList.kt
+5 -5
View File
@@ -125,12 +125,12 @@ public abstract class AbstractList<out E> protected constructor() : AbstractColl
} }
} }
internal fun checkRangeIndexes(start: Int, end: Int, size: Int) { internal fun checkRangeIndexes(fromIndex: Int, toIndex: Int, size: Int) {
if (start < 0 || end > size) { if (fromIndex < 0 || toIndex > size) {
throw IndexOutOfBoundsException("fromIndex: $start, toIndex: $end, size: $size") throw IndexOutOfBoundsException("fromIndex: $fromIndex, toIndex: $toIndex, size: $size")
} }
if (start > end) { if (fromIndex > toIndex) {
throw IllegalArgumentException("fromIndex: $start > toIndex: $end") throw IllegalArgumentException("fromIndex: $fromIndex > toIndex: $toIndex")
} }
} }
libraries/stdlib/src/kotlin/collections/ReversedViews.kt
+3 -4
View File
@@ -22,7 +22,6 @@ package kotlin.collections
private open class ReversedListReadOnly<out T>(private val delegate: List<T>) : AbstractList<T>() { private open class ReversedListReadOnly<out T>(private val delegate: List<T>) : AbstractList<T>() {
override val size: Int get() = delegate.size override val size: Int get() = delegate.size
override fun get(index: Int): T = delegate[reverseElementIndex(index)] override fun get(index: Int): T = delegate[reverseElementIndex(index)]
} }
private class ReversedList<T>(private val delegate: MutableList<T>) : AbstractMutableList<T>() { private class ReversedList<T>(private val delegate: MutableList<T>) : AbstractMutableList<T>() {
@@ -37,11 +36,11 @@ private class ReversedList<T>(private val delegate: MutableList<T>) : AbstractMu
delegate.add(reversePositionIndex(index), element) delegate.add(reversePositionIndex(index), element)
} }
} }
private fun List<*>.reverseElementIndex(index: Int) = // TODO: Use AbstractList.checkElementIndex: run { AbstractList.checkElementIndex(index, size); lastIndex - index } private fun List<*>.reverseElementIndex(index: Int) =
if (index in 0..size - 1) size - index - 1 else throw IndexOutOfBoundsException("Index $index should be in range [${0..size - 1}].") if (index in 0..lastIndex) lastIndex - index else throw IndexOutOfBoundsException("Element index $index must be in range [${0..lastIndex}].")
private fun List<*>.reversePositionIndex(index: Int) = private fun List<*>.reversePositionIndex(index: Int) =
if (index in 0..size) size - index else throw IndexOutOfBoundsException("Index $index should be in range [${0..size}].") if (index in 0..size) size - index else throw IndexOutOfBoundsException("Position index $index must be in range [${0..size}].")
/** /**