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

Introduce 'reified' instead of 'erased'

Browse Source
This commit is contained in:
Andrey Breslav
2012-06-05 20:05:35 +04:00
parent 0ceee0a383
commit 91606a3901
98 changed files with 158 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jdk-headers/src/java/lang/Iterable.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.lang
public trait Iterable<erased T> {
public trait Iterable<T> {
fun iterator() : java.util.Iterator<T>
}
jdk-headers/src/java/util/AbstractCollection.kt
+2 -2
View File
@@ -1,11 +1,11 @@
package java.util
public abstract class AbstractCollection<erased E> protected () : java.lang.Object(), java.util.Collection<E> {
public abstract class AbstractCollection<E> protected () : java.lang.Object(), java.util.Collection<E> {
public abstract override fun iterator() : java.util.Iterator<E>
public abstract override fun size() : Int
public override fun isEmpty() : Boolean {}
public override fun contains(o : Any?) : Boolean {}
public override fun toArray() : Array<Any?> {}
public override fun toArray<erased T>(a : Array<out T>) : Array<T> {}
public override fun toArray<T>(a : Array<out T>) : Array<T> {}
public override fun add(e : E) : Boolean {}
public override fun remove(o : Any?) : Boolean {}
public override fun containsAll(c : java.util.Collection<*>) : Boolean {}
jdk-headers/src/java/util/AbstractList.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
public abstract class AbstractList<erased E> protected () : java.util.AbstractCollection<E>(), java.util.List<E> {
public abstract class AbstractList<E> protected () : java.util.AbstractCollection<E>(), java.util.List<E> {
public override fun add(e : E) : Boolean {}
public abstract override fun get(index : Int) : E
public override fun set(index : Int, element : E) : E {}
jdk-headers/src/java/util/AbstractMap.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package java.util
import java.util.Map.Entry
public abstract class AbstractMap<erased K, erased V> protected () : java.lang.Object(), java.util.Map<K, V> {
public abstract class AbstractMap<K, V> protected () : java.lang.Object(), java.util.Map<K, V> {
public override fun size() : Int {}
public override fun isEmpty() : Boolean {}
public override fun containsValue(value : Any?) : Boolean {}
jdk-headers/src/java/util/AbstractSequentialList.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
public abstract class AbstractSequentialList<erased E> protected () : java.util.AbstractList<E>() {
public abstract class AbstractSequentialList<E> protected () : java.util.AbstractList<E>() {
public override fun get(index : Int) : E {}
public override fun set(index : Int, element : E) : E {}
public override fun add(index : Int, element : E) : Unit {}
jdk-headers/src/java/util/AbstractSet.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
public abstract class AbstractSet<erased E> protected () : java.util.AbstractCollection<E>(), java.util.Set<E> {
public abstract class AbstractSet<E> protected () : java.util.AbstractCollection<E>(), java.util.Set<E> {
// public override fun equals(o : Any?) : Boolean
// public override fun hashCode() : Int
public override fun removeAll(c : java.util.Collection<*>) : Boolean {}
jdk-headers/src/java/util/ArrayList.kt
+2 -2
View File
@@ -1,5 +1,5 @@
package java.util
public open class ArrayList<erased E>(c : java.util.Collection<out E>) : java.util.AbstractList<E>(),
public open class ArrayList<E>(c : java.util.Collection<out E>) : java.util.AbstractList<E>(),
java.util.List<E>,
java.util.RandomAccess,
java.lang.Cloneable,
@@ -15,7 +15,7 @@ public open class ArrayList<erased E>(c : java.util.Collection<out E>) : java.ut
public override fun lastIndexOf(o : Any?) : Int {}
public override fun clone() : java.lang.Object {}
public override fun toArray() : Array<Any?> {}
public override fun toArray<erased T>(a : Array<out T>) : Array<T> {}
public override fun toArray<T>(a : Array<out T>) : Array<T> {}
public override fun get(index : Int) : E {}
public override fun set(index : Int, element : E) : E {}
public override fun add(e : E) : Boolean {}
jdk-headers/src/java/util/Collection.kt
+2 -2
View File
@@ -1,12 +1,12 @@
package java.util
public trait Collection<erased E> : java.lang.Iterable<E> {
public trait Collection<E> : java.lang.Iterable<E> {
open fun size() : Int
open fun isEmpty() : Boolean
open fun contains(o : Any?) : Boolean
override fun iterator() : java.util.Iterator<E>
open fun toArray() : Array<Any?>
// a : Array<out T> to emulate Java's array covariance
open fun toArray<erased T>(a : Array<out T>) : Array<T>
open fun toArray<T>(a : Array<out T>) : Array<T>
open fun add(e : E) : Boolean
open fun remove(o : Any?) : Boolean
open fun containsAll(c : java.util.Collection<*>) : Boolean
jdk-headers/src/java/util/Deque.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
public trait Deque<erased E> : java.util.Queue<E> {
public trait Deque<E> : java.util.Queue<E> {
open fun addFirst(e : E) : Unit
open fun addLast(e : E) : Unit
open fun offerFirst(e : E) : Boolean
jdk-headers/src/java/util/Enumeration.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
public trait Enumeration<erased E> {
public trait Enumeration<E> {
open fun hasMoreElements() : Boolean
open fun nextElement() : E
}
jdk-headers/src/java/util/HashMap.kt
+1 -1
View File
@@ -1,7 +1,7 @@
package java.util
import java.io.*
import java.util.Map.Entry
public open class HashMap<erased K, erased V>(m : java.util.Map<out K, out V>) : java.util.AbstractMap<K, V>(),
public open class HashMap<K, V>(m : java.util.Map<out K, out V>) : java.util.AbstractMap<K, V>(),
java.util.Map<K, V>,
java.lang.Cloneable,
java.io.Serializable {
jdk-headers/src/java/util/HashSet.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
public open class HashSet<erased E>(c : java.util.Collection<out E>) : java.util.AbstractSet<E>(),
public open class HashSet<E>(c : java.util.Collection<out E>) : java.util.AbstractSet<E>(),
java.util.Set<E>,
java.lang.Cloneable,
java.io.Serializable {
jdk-headers/src/java/util/Iterator.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package java.util
public trait Iterator<erased E> {
public trait Iterator<E> {
fun hasNext() : Boolean
fun next() : E
fun remove() : Unit
jdk-headers/src/java/util/LinkedHashMap.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package java.util
import java.util.Map.Entry
public open class LinkedHashMap<erased K, erased V>(m : java.util.Map<out K, out V>) : java.util.HashMap<K, V>(), java.util.Map<K, V> {
public open class LinkedHashMap<K, V>(m : java.util.Map<out K, out V>) : java.util.HashMap<K, V>(), java.util.Map<K, V> {
public this(initialCapacity : Int, loadFactor : Float) {}
public this(initialCapacity : Int) {}
public this() {}
jdk-headers/src/java/util/LinkedHashSet.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
public open class LinkedHashSet<erased E>(c : java.util.Collection<out E>) : java.util.HashSet<E>(c),
public open class LinkedHashSet<E>(c : java.util.Collection<out E>) : java.util.HashSet<E>(c),
java.util.Set<E>,
java.lang.Cloneable,
java.io.Serializable {
jdk-headers/src/java/util/LinkedList.kt
+2 -2
View File
@@ -1,5 +1,5 @@
package java.util
public open class LinkedList<erased E>(c : java.util.Collection<out E>) : java.util.AbstractSequentialList<E>(),
public open class LinkedList<E>(c : java.util.Collection<out E>) : java.util.AbstractSequentialList<E>(),
java.util.List<E>,
java.util.Deque<E>,
java.lang.Cloneable,
@@ -44,7 +44,7 @@ public open class LinkedList<erased E>(c : java.util.Collection<out E>) : java.u
public override fun descendingIterator() : java.util.Iterator<E> {}
public override fun clone() : Any? {}
public override fun toArray() : Array<Any?> {}
public override fun toArray<erased T>(a : Array<out T>) : Array<T> {}
public override fun toArray<T>(a : Array<out T>) : Array<T> {}
//class object {
//open public fun init<E>(c : java.util.Collection<out E?>?) : LinkedList<E> {
//return __
jdk-headers/src/java/util/List.kt
+2 -2
View File
@@ -1,12 +1,12 @@
package java.util
public trait List<erased E> : java.util.Collection<E> {
public trait List<E> : java.util.Collection<E> {
override fun size() : Int
override fun isEmpty() : Boolean
override fun contains(o : Any?) : Boolean
override fun iterator() : java.util.Iterator<E>
override fun toArray() : Array<Any?>
// Simulate Java's array covariance
override fun toArray<erased T>(a : Array<out T>) : Array<T>
override fun toArray<T>(a : Array<out T>) : Array<T>
override fun add(e : E) : Boolean
override fun remove(o : Any?) : Boolean
override fun containsAll(c : java.util.Collection<*>) : Boolean
jdk-headers/src/java/util/Map.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package java.util
public trait Map<erased K, erased V> {
public trait Map<K, V> {
open fun size() : Int
open fun isEmpty() : Boolean
open fun containsKey(key : Any?) : Boolean
jdk-headers/src/java/util/Queue.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
public trait Queue<erased E> : java.util.Collection<E> {
public trait Queue<E> : java.util.Collection<E> {
override fun add(e : E) : Boolean
open fun offer(e : E) : Boolean
open fun remove() : E
jdk-headers/src/java/util/Set.kt
+2 -2
View File
@@ -1,5 +1,5 @@
package java.util
public trait Set<erased E> : java.util.Collection<E> {
public trait Set<E> : java.util.Collection<E> {
override fun size() : Int
override fun isEmpty() : Boolean
override fun contains(o : Any?) : Boolean
@@ -7,7 +7,7 @@ public trait Set<erased E> : java.util.Collection<E> {
override fun toArray() : Array<Any?>
// Simulate Java's array covariance
override fun toArray<erased T>(a : Array<out T>) : Array<T>
override fun toArray<T>(a : Array<out T>) : Array<T>
override fun add(e : E) : Boolean
override fun remove(o : Any?) : Boolean
override fun containsAll(c : java.util.Collection<*>) : Boolean