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

NamespaceComparator now serializes kind, if it's not DECLARATION.

Browse Source 
Lots of test data changed to include members' kinds.
This commit is contained in:
Alexander Udalov
2012-09-06 18:43:28 +04:00
parent cb13995057
commit c0dc1e6742
23 changed files with 177 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt
+22 -22
View File
@@ -2,26 +2,26 @@ namespace test
public abstract class test.ClassDoesNotOverrideMethod : java.util.Date {
public final /*constructor*/ fun <init>(): test.ClassDoesNotOverrideMethod
public open override /*1*/ fun after(/*0*/ p0: java.util.Date?): jet.Boolean
public open override /*1*/ fun before(/*0*/ p0: java.util.Date?): jet.Boolean
public open override /*1*/ fun compareTo(/*0*/ p0: java.util.Date?): jet.Int
public open override /*1*/ fun compareTo(/*0*/ p0: jet.Any?): jet.Int
public open override /*1*/ fun getDate(): jet.Int
public open override /*1*/ fun getDay(): jet.Int
public open override /*1*/ fun getHours(): jet.Int
public open override /*1*/ fun getMinutes(): jet.Int
public open override /*1*/ fun getMonth(): jet.Int
public open override /*1*/ fun getSeconds(): jet.Int
public open override /*1*/ fun getTime(): jet.Long
public open override /*1*/ fun getTimezoneOffset(): jet.Int
public open override /*1*/ fun getYear(): jet.Int
public open override /*1*/ fun setDate(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ fun setHours(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ fun setMinutes(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ fun setMonth(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ fun setSeconds(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ fun setTime(/*0*/ p0: jet.Long): jet.Tuple0
public open override /*1*/ fun setYear(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ fun toGMTString(): jet.String?
public open override /*1*/ fun toLocaleString(): jet.String?
public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date?): jet.Boolean
public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date?): jet.Boolean
public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ p0: java.util.Date?): jet.Int
public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ p0: jet.Any?): jet.Int
public open override /*1*/ /*fake_override*/ fun getDate(): jet.Int
public open override /*1*/ /*fake_override*/ fun getDay(): jet.Int
public open override /*1*/ /*fake_override*/ fun getHours(): jet.Int
public open override /*1*/ /*fake_override*/ fun getMinutes(): jet.Int
public open override /*1*/ /*fake_override*/ fun getMonth(): jet.Int
public open override /*1*/ /*fake_override*/ fun getSeconds(): jet.Int
public open override /*1*/ /*fake_override*/ fun getTime(): jet.Long
public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): jet.Int
public open override /*1*/ /*fake_override*/ fun getYear(): jet.Int
public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun setMonth(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: jet.Long): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun toGMTString(): jet.String?
public open override /*1*/ /*fake_override*/ fun toLocaleString(): jet.String?
}
compiler/testData/loadJava/ClassWithTypePExtendsIterableP.txt
+1 -1
View File
@@ -2,5 +2,5 @@ namespace test
public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : jet.MutableIterable<P> {
public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypePExtendsIterableP<P>
public abstract override /*1*/ fun iterator(): jet.MutableIterator<P>
public abstract override /*1*/ /*fake_override*/ fun iterator(): jet.MutableIterator<P>
}
compiler/testData/loadJava/modality/ModalityOfFakeOverrides.txt
+23 -23
View File
@@ -2,29 +2,29 @@ namespace test
public open class test.ModalityOfFakeOverrides : java.util.AbstractList<jet.String> {
public final /*constructor*/ fun <init>(): test.ModalityOfFakeOverrides
public open override /*1*/ fun add(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.Tuple0
public open override /*1*/ fun add(/*0*/ p0: jet.String): jet.Boolean
public open override /*1*/ fun addAll(/*0*/ p0: jet.Collection<out jet.String>): jet.Boolean
public open override /*1*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: jet.Collection<out jet.String>): jet.Boolean
public open override /*1*/ fun clear(): jet.Tuple0
public open override /*1*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean
public open override /*1*/ fun containsAll(/*0*/ p0: jet.Collection<out jet.Any?>): jet.Boolean
public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun add(/*0*/ p0: jet.String): jet.Boolean
public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: jet.Collection<out jet.String>): jet.Boolean
public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ p0: jet.Int, /*1*/ p1: jet.Collection<out jet.String>): jet.Boolean
public open override /*1*/ /*fake_override*/ fun clear(): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun contains(/*0*/ p0: jet.Any?): jet.Boolean
public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ p0: jet.Collection<out jet.Any?>): jet.Boolean
public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.String
public open override /*1*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
public open override /*1*/ fun isEmpty(): jet.Boolean
public open override /*1*/ fun iterator(): jet.MutableIterator<jet.String>
public open override /*1*/ fun lastIndexOf(/*0*/ p0: jet.Any?): jet.Int
public open override /*1*/ fun listIterator(): jet.MutableListIterator<jet.String>
public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): jet.MutableListIterator<jet.String>
protected final override /*1*/ var modCount: jet.Int
public open override /*1*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
public open override /*1*/ fun remove(/*0*/ p0: jet.Int): jet.String?
public open override /*1*/ fun removeAll(/*0*/ p0: jet.Collection<out jet.Any?>): jet.Boolean
protected open override /*1*/ fun removeRange(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Tuple0
public open override /*1*/ fun retainAll(/*0*/ p0: jet.Collection<out jet.Any?>): jet.Boolean
public open override /*1*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.String
public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
public open override /*1*/ /*fake_override*/ fun isEmpty(): jet.Boolean
public open override /*1*/ /*fake_override*/ fun iterator(): jet.MutableIterator<jet.String>
public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ p0: jet.Any?): jet.Int
public open override /*1*/ /*fake_override*/ fun listIterator(): jet.MutableListIterator<jet.String>
public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ p0: jet.Int): jet.MutableListIterator<jet.String>
protected final override /*1*/ /*fake_override*/ var modCount: jet.Int
public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0: jet.Any?): jet.Boolean
public open override /*1*/ /*fake_override*/ fun remove(/*0*/ p0: jet.Int): jet.String?
public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ p0: jet.Collection<out jet.Any?>): jet.Boolean
protected open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ p0: jet.Collection<out jet.Any?>): jet.Boolean
public open override /*1*/ /*fake_override*/ fun set(/*0*/ p0: jet.Int, /*1*/ p1: jet.String): jet.String
public open override /*1*/ fun size(): jet.Int
public open override /*1*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.MutableList<jet.String>
public open override /*1*/ fun toArray(): jet.Array<jet.Any?>
public open override /*1*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<out T>): jet.Array<T>
public open override /*1*/ /*fake_override*/ fun subList(/*0*/ p0: jet.Int, /*1*/ p1: jet.Int): jet.MutableList<jet.String>
public open override /*1*/ /*fake_override*/ fun toArray(): jet.Array<jet.Any?>
public open override /*1*/ /*fake_override*/ fun </*0*/ T : jet.Any?>toArray(/*0*/ p0: jet.Array<out T>): jet.Array<T>
}