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

Rename some of builtin parameters

Browse Source
This commit is contained in:
Denis Zharkov
2015-10-16 15:58:27 +03:00
parent 1c02231cda
commit 28c46b73f1
41 changed files with 451 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/builtins/native/kotlin/Collections.kt
+28 -28
View File
@@ -59,14 +59,14 @@ public interface Collection<out E> : Iterable<E> {
/**
* Checks if the specified element is contained in this collection.
*/
public operator fun contains(o: @UnsafeVariance E): Boolean
public operator fun contains(element: @UnsafeVariance E): Boolean
override fun iterator(): Iterator<E>
// Bulk Operations
/**
* Checks if all elements in the specified collection are contained in this collection.
*/
public fun containsAll(c: Collection<@UnsafeVariance E>): Boolean
public fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean
}
/**
@@ -83,7 +83,7 @@ public interface MutableCollection<E> : Collection<E>, MutableIterable<E> {
* @return `true` if the element has been added, `false` if the collection does not support duplicates
* and the element is already contained in the collection.
*/
public fun add(e: E): Boolean
public fun add(element: E): Boolean
/**
* Removes a single instance of the specified element from this
@@ -91,7 +91,7 @@ public interface MutableCollection<E> : Collection<E>, MutableIterable<E> {
*
* @return `true` if the element has been successfully removed; `false` if it was not present in the collection.
*/
public fun remove(o: E): Boolean
public fun remove(element: E): Boolean
// Bulk Modification Operations
/**
@@ -99,21 +99,21 @@ public interface MutableCollection<E> : Collection<E>, MutableIterable<E> {
*
* @return `true` if any of the specified elements was added to the collection, `false` if the collection was not modified.
*/
public fun addAll(c: Collection<E>): Boolean
public fun addAll(elements: Collection<E>): Boolean
/**
* Removes all of this collection's elements that are also contained in the specified collection.
*
* @return `true` if any of the specified elements was removed from the collection, `false` if the collection was not modified.
*/
public fun removeAll(c: Collection<E>): Boolean
public fun removeAll(elements: Collection<E>): Boolean
/**
* Retains only the elements in this collection that are contained in the specified collection.
*
* @return `true` if any element was removed from the collection, `false` if the collection was not modified.
*/
public fun retainAll(c: Collection<E>): Boolean
public fun retainAll(elements: Collection<E>): Boolean
/**
* Removes all elements from this collection.
@@ -130,11 +130,11 @@ public interface List<out E> : Collection<E> {
// Query Operations
override val size: Int
override fun isEmpty(): Boolean
override fun contains(o: @UnsafeVariance E): Boolean
override fun contains(element: @UnsafeVariance E): Boolean
override fun iterator(): Iterator<E>
// Bulk Operations
override fun containsAll(c: Collection<@UnsafeVariance E>): Boolean
override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean
// Positional Access Operations
/**
@@ -147,13 +147,13 @@ public interface List<out E> : Collection<E> {
* Returns the index of the first occurrence of the specified element in the list, or -1 if the specified
* element is not contained in the list.
*/
public fun indexOf(o: @UnsafeVariance E): Int
public fun indexOf(element: @UnsafeVariance E): Int
/**
* Returns the index of the last occurrence of the specified element in the list, or -1 if the specified
* element is not contained in the list.
*/
public fun lastIndexOf(o: @UnsafeVariance E): Int
public fun lastIndexOf(element: @UnsafeVariance E): Int
// List Iterators
/**
@@ -180,20 +180,20 @@ public interface List<out E> : Collection<E> {
*/
public interface MutableList<E> : List<E>, MutableCollection<E> {
// Modification Operations
override fun add(e: E): Boolean
override fun remove(o: E): Boolean
override fun add(element: E): Boolean
override fun remove(element: E): Boolean
// Bulk Modification Operations
override fun addAll(c: Collection<E>): Boolean
override fun addAll(elements: Collection<E>): Boolean
/**
* Inserts all of the elements in the specified collection [c] into this list at the specified [index].
* Inserts all of the elements in the specified collection [elements] into this list at the specified [index].
*
* @return `true` if the list was changed as the result of the operation.
*/
public fun addAll(index: Int, c: Collection<E>): Boolean
override fun removeAll(c: Collection<E>): Boolean
override fun retainAll(c: Collection<E>): Boolean
public fun addAll(index: Int, elements: Collection<E>): Boolean
override fun removeAll(elements: Collection<E>): Boolean
override fun retainAll(elements: Collection<E>): Boolean
override fun clear(): Unit
// Positional Access Operations
@@ -234,11 +234,11 @@ public interface Set<out E> : Collection<E> {
// Query Operations
override val size: Int
override fun isEmpty(): Boolean
override fun contains(o: @UnsafeVariance E): Boolean
override fun contains(element: @UnsafeVariance E): Boolean
override fun iterator(): Iterator<E>
// Bulk Operations
override fun containsAll(c: Collection<@UnsafeVariance E>): Boolean
override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean
}
/**
@@ -251,13 +251,13 @@ public interface MutableSet<E> : Set<E>, MutableCollection<E> {
override fun iterator(): MutableIterator<E>
// Modification Operations
override fun add(e: E): Boolean
override fun remove(o: E): Boolean
override fun add(element: E): Boolean
override fun remove(element: E): Boolean
// Bulk Modification Operations
override fun addAll(c: Collection<E>): Boolean
override fun removeAll(c: Collection<E>): Boolean
override fun retainAll(c: Collection<E>): Boolean
override fun addAll(elements: Collection<E>): Boolean
override fun removeAll(elements: Collection<E>): Boolean
override fun retainAll(elements: Collection<E>): Boolean
override fun clear(): Unit
}
@@ -352,9 +352,9 @@ public interface MutableMap<K, V> : Map<K, V> {
// Bulk Modification Operations
/**
* Updates this map with key/value pairs from the specified map [m].
* Updates this map with key/value pairs from the specified map [from].
*/
public fun putAll(m: Map<out K, V>): Unit
public fun putAll(from: Map<out K, V>): Unit
/**
* Removes all elements from this map.
@@ -375,6 +375,6 @@ public interface MutableMap<K, V> : Map<K, V> {
*
* @return the previous value corresponding to the key.
*/
public fun setValue(value: V): V
public fun setValue(newValue: V): V
}
}
core/builtins/native/kotlin/Iterator.kt
+4 -4
View File
@@ -86,17 +86,17 @@ public interface MutableListIterator<T> : ListIterator<T>, MutableIterator<T> {
override fun remove(): Unit
/**
* Replaces the last element returned by [next] or [previous] with the specified element [e].
* Replaces the last element returned by [next] or [previous] with the specified element [element].
*/
public fun set(e: T): Unit
public fun set(element: T): Unit
/**
* Adds the specified element [e] into the underlying collection immediately before the element that would be
* Adds the specified element [element] into the underlying collection immediately before the element that would be
* returned by [next], if any, and after the element that would be returned by [previous], if any.
* (If the collection contains no elements, the new element becomes the sole element in the collection.)
* The new element is inserted before the implicit cursor: a subsequent call to [next] would be unaffected,
* and a subsequent call to [previous] would return the new element. (This call increases by one the value \
* that would be returned by a call to [nextIndex] or [previousIndex].)
*/
public fun add(e: T): Unit
public fun add(element: T): Unit
}
core/builtins/native/kotlin/Primitives.kt
+6 -6
View File
@@ -430,11 +430,11 @@ public class Int private () : Number, Comparable<Int> {
public operator fun rangeTo(other: Double): DoubleRange
/** Shifts this value left by [bits]. */
public infix fun shl(bits: Int): Int
public infix fun shl(bitCount: Int): Int
/** Shifts this value right by [bits], filling the leftmost bits with copies of the sign bit. */
public infix fun shr(bits: Int): Int
public infix fun shr(bitCount: Int): Int
/** Shifts this value right by [bits], filling the leftmost bits with zeros. */
public infix fun ushr(bits: Int): Int
public infix fun ushr(bitCount: Int): Int
/** Performs a bitwise AND operation between the two values. */
public infix fun and(other: Int): Int
/** Performs a bitwise OR operation between the two values. */
@@ -585,11 +585,11 @@ public class Long private () : Number, Comparable<Long> {
public operator fun rangeTo(other: Double): DoubleRange
/** Shifts this value left by [bits]. */
public infix fun shl(bits: Int): Long
public infix fun shl(bitCount: Int): Long
/** Shifts this value right by [bits], filling the leftmost bits with copies of the sign bit. */
public infix fun shr(bits: Int): Long
public infix fun shr(bitCount: Int): Long
/** Shifts this value right by [bits], filling the leftmost bits with zeros. */
public infix fun ushr(bits: Int): Long
public infix fun ushr(bitCount: Int): Long
/** Performs a bitwise AND operation between the two values. */
public infix fun and(other: Long): Long
/** Performs a bitwise OR operation between the two values. */