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

Another portion of test data fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-08-21 14:29:26 +04:00
parent a3d9ff65aa
commit 8134d097e3
27 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.txt
+1 -1
View File
@@ -6,7 +6,7 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
invisible_fake final override /*1*/ /*fake_override*/ var fastTime: kotlin.Long
public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date!): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date!): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any!
public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: java.util.Date!): kotlin.Int
invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarDate(): sun.util.calendar.BaseCalendar.Date!
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDate(): kotlin.Int
compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.txt
+2 -2
View File
@@ -3,7 +3,7 @@ package test
public open class InnerClassReferencesOuterTP</*0*/ P> {
public constructor InnerClassReferencesOuterTP</*0*/ P>()
public open inner class Inner</*0*/ Q : P> {
public constructor Inner</*0*/ Q : P>()
public open inner class Inner</*0*/ Q : P!> {
public constructor Inner</*0*/ Q : P!>()
}
}
compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class AllBoundsInWhen {
public constructor AllBoundsInWhen()
public open fun </*0*/ T : java.io.Serializable> foo(): kotlin.Unit
public open fun </*0*/ T : java.io.Serializable!> foo(): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class ArrayType {
public constructor ArrayType()
public open fun foo(): kotlin.Array<kotlin.String>
public open fun foo(): kotlin.Array<(out) kotlin.String!>!
}
compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public open class PropertySimpleType {
public constructor PropertySimpleType()
public final var fieldOne: kotlin.String
public final var fieldOne: kotlin.String!
public final var fieldTwo: kotlin.String!
}
compiler/testData/loadJava/compiledJava/library/LoadIterable.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package test
public trait LoadIterable</*0*/ T> {
public abstract fun getIterable(): kotlin.MutableIterable<T>?
public abstract fun setIterable(/*0*/ p0: kotlin.Iterable<T>?): kotlin.Unit
public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/library/LoadIterator.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package test
public trait LoadIterator</*0*/ T> {
public abstract fun getIterator(): kotlin.MutableIterator<T>?
public abstract fun setIterator(/*0*/ p0: kotlin.Iterator<T>?): kotlin.Unit
public abstract fun getIterator(): kotlin.(Mutable)Iterator<T!>!
public abstract fun setIterator(/*0*/ p0: kotlin.(Mutable)Iterator<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/library/Max.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class Max {
public constructor Max()
public open fun </*0*/ T> max(/*0*/ p0: kotlin.Collection<T>?): T? where T : kotlin.Comparable<T>?
public open fun </*0*/ T : kotlin.Any!> max(/*0*/ p0: (kotlin.MutableCollection<out T!>..kotlin.Collection<T!>?)): T! where T : kotlin.Comparable<T!>!
}
compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
+17 -17
View File
@@ -1,32 +1,32 @@
package test
public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String> {
public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String!> {
public constructor ModalityOfFakeOverrides()
protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: (kotlin.MutableCollection<out kotlin.String!>..kotlin.Collection<kotlin.String!>?)): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any?): kotlin.Int
public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Any!): kotlin.Int
public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String>
public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any?): kotlin.Int
public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String?
public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.(Mutable)Iterator<kotlin.String!>!
public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Any!): kotlin.Int
public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.(Mutable)ListIterator<kotlin.String!>!
public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.(Mutable)ListIterator<kotlin.String!>!
invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun remove(/*0*/ index: kotlin.Int): kotlin.String
public open override /*1*/ /*fake_override*/ fun remove(/*0*/ index: kotlin.Int): kotlin.String!
public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.Any?>): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
public open override /*1*/ fun size(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<kotlin.Any?>
public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ a: kotlin.Array<out T>): kotlin.Array<T>
public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.(Mutable)List<kotlin.String!>!
public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
public open override /*1*/ /*fake_override*/ fun </*0*/ T> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterable.txt
+4 -4
View File
@@ -1,8 +1,8 @@
package test
public trait LoadIterable</*0*/ T> {
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>?
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T>?
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>?): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable<T>?): kotlin.Unit
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package test
public trait LoadIterableWithConflict</*0*/ T> {
org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>?
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>?): kotlin.Unit
org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.ReadOnly() org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.txt
+4 -4
View File
@@ -1,8 +1,8 @@
package test
public trait LoadIterableWithNullability</*0*/ T> {
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T>
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable<T>): kotlin.Unit
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.txt
+9 -9
View File
@@ -3,17 +3,17 @@ package test
public trait LoadIterableWithPropagation {
public trait LoadIterable</*0*/ T> {
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.MutableIterable<T>?
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.Iterable<T>?
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.MutableIterable<T>?): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.Iterable<T>?): kotlin.Unit
org.jetbrains.annotations.Mutable() public abstract fun getIterable(): kotlin.(Mutable)Iterable<T!>!
org.jetbrains.annotations.ReadOnly() public abstract fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
public abstract fun setIterable(/*0*/ org.jetbrains.annotations.Mutable() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
public abstract fun setReadOnlyIterable(/*0*/ org.jetbrains.annotations.ReadOnly() p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
}
public open class LoadIterableImpl</*0*/ T> : test.LoadIterableWithPropagation.LoadIterable<T> {
public open class LoadIterableImpl</*0*/ T> : test.LoadIterableWithPropagation.LoadIterable<T!> {
public constructor LoadIterableImpl</*0*/ T>()
public open override /*1*/ fun getIterable(): kotlin.MutableIterable<T>?
public open override /*1*/ fun getReadOnlyIterable(): kotlin.Iterable<T>?
public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.MutableIterable<T>?): kotlin.Unit
public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: kotlin.Iterable<T>?): kotlin.Unit
public open override /*1*/ fun getIterable(): kotlin.(Mutable)Iterable<T!>!
public open override /*1*/ fun getReadOnlyIterable(): kotlin.(Mutable)Iterable<T!>!
public open override /*1*/ fun setIterable(/*0*/ p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
public open override /*1*/ fun setReadOnlyIterable(/*0*/ p0: kotlin.(Mutable)Iterable<T!>!): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/notNull/NotNullField.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class NotNullField {
public constructor NotNullField()
public final var hi: kotlin.String
public final var hi: kotlin.String!
}
compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class NotNullMethod {
public constructor NotNullMethod()
public open fun hi(): kotlin.String
public open fun hi(): kotlin.String!
}
compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class NotNullObjectArray {
public constructor NotNullObjectArray()
public open fun hi(): kotlin.Array<kotlin.Any>
public open fun hi(): kotlin.Array<(out) kotlin.Any!>!
}
compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class NotNullParameter {
public constructor NotNullParameter()
public open fun hi(/*0*/ p0: kotlin.String): kotlin.Unit
public open fun hi(/*0*/ p0: kotlin.String!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/rendering/Rendering.txt
+1 -1
View File
@@ -38,7 +38,7 @@ public open class Rendering {
public abstract fun foo4(/*0*/ p0: kotlin.(Mutable)List<kotlin.String!>!): kotlin.Unit
public abstract fun foo5(/*0*/ p0: kotlin.(Mutable)Set<kotlin.String!>!): kotlin.Unit
public abstract fun foo6(/*0*/ p0: kotlin.(Mutable)Map<kotlin.String!, kotlin.String!>!): kotlin.Unit
public abstract fun foo7(/*0*/ p0: (kotlin.MutableMap.MutableEntry<kotlin.String!, kotlin.String!>..kotlin.Map.Entry<kotlin.String!, kotlin.String!>?)): kotlin.Unit
public abstract fun foo7(/*0*/ p0: kotlin.(Mutable)Map.(Mutable)Entry<kotlin.String!, kotlin.String!>!): kotlin.Unit
}
public/*package*/ trait H_Raw {
compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
+6 -6
View File
@@ -3,14 +3,14 @@ package test
public trait ArraysInSubtypes {
public trait Sub</*0*/ T> : test.ArraysInSubtypes.Super {
public abstract override /*1*/ fun array(): kotlin.Array<kotlin.String>?
public abstract override /*1*/ fun listOfArray(): kotlin.MutableList<out kotlin.Array<kotlin.String>?>?
public abstract override /*1*/ fun objArray(): kotlin.Array<T>?
public abstract override /*1*/ fun array(): kotlin.Array<(out) kotlin.String!>!
public abstract override /*1*/ fun listOfArray(): (kotlin.MutableList<out kotlin.Array<(out) kotlin.String!>!>..kotlin.List<kotlin.Array<(out) kotlin.String!>!>?)
public abstract override /*1*/ fun objArray(): kotlin.Array<(out) T!>!
}
public trait Super {
public abstract fun array(): kotlin.Array<kotlin.CharSequence>?
public abstract fun listOfArray(): kotlin.MutableList<out kotlin.Array<kotlin.CharSequence>?>?
public abstract fun objArray(): kotlin.Array<kotlin.Any>?
public abstract fun array(): kotlin.Array<(out) kotlin.CharSequence!>!
public abstract fun listOfArray(): (kotlin.MutableList<out kotlin.Array<(out) kotlin.CharSequence!>!>..kotlin.List<kotlin.Array<(out) kotlin.CharSequence!>!>?)
public abstract fun objArray(): kotlin.Array<(out) kotlin.Any!>!
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
+3 -3
View File
@@ -3,11 +3,11 @@ package test
public trait MethodTypeParameterErased {
public trait Bug</*0*/ T> {
public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T>?> save(): RET?
public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T!>!> save(): RET!
}
public open class SubBug : test.MethodTypeParameterErased.Bug<kotlin.Any> {
public open class SubBug : test.MethodTypeParameterErased.Bug<kotlin.Any!> {
public constructor SubBug()
public open fun save(): test.MethodTypeParameterErased.SubBug?
public open fun save(): test.MethodTypeParameterErased.SubBug!
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+3 -3
View File
@@ -5,13 +5,13 @@ public open class RawSuperType {
public open inner class Derived : test.RawSuperType.Super<kotlin.Any?> {
public constructor Derived()
public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any?): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ p0: kotlin.Any!): kotlin.Unit
}
public trait Super</*0*/ T> {
public abstract fun foo(/*0*/ p0: T?): kotlin.Unit
public abstract fun foo(/*0*/ p0: T!): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun </*0*/ T> Super(/*0*/ function: (T?) -> kotlin.Unit): test.RawSuperType.Super<T>
public /*synthesized*/ fun </*0*/ T> Super(/*0*/ function: (T!) -> kotlin.Unit): test.RawSuperType.Super<T>
}
compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
+3 -3
View File
@@ -2,12 +2,12 @@ package test
public trait ReturnInnerSubclassOfSupersInner {
public open class Sub</*0*/ B> : test.ReturnInnerSubclassOfSupersInner.Super<B> {
public open class Sub</*0*/ B> : test.ReturnInnerSubclassOfSupersInner.Super<B!> {
public constructor Sub</*0*/ B>()
public/*package*/ open inner class Inner : test.ReturnInnerSubclassOfSupersInner.Super.Inner {
public/*package*/ constructor Inner()
public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B>?
public/*package*/ open override /*1*/ fun get(): test.ReturnInnerSubclassOfSupersInner.Sub<B!>!
}
}
@@ -16,7 +16,7 @@ public trait ReturnInnerSubclassOfSupersInner {
public/*package*/ open inner class Inner {
public/*package*/ constructor Inner()
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A>?
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A!>!
}
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
+6 -6
View File
@@ -1,19 +1,19 @@
package test
public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> kotlin.MutableList<kotlin.String?>): test.TwoSuperclassesInconsistentGenericTypes
public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> kotlin.(Mutable)List<kotlin.String!>!): test.TwoSuperclassesInconsistentGenericTypes
public trait TwoSuperclassesInconsistentGenericTypes {
public abstract fun foo(): kotlin.MutableList<kotlin.String?>
public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
public trait Other {
public abstract fun foo(): kotlin.MutableList<kotlin.String>?
public abstract fun foo(): kotlin.(Mutable)List<kotlin.String!>!
}
public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
public constructor Sub()
public open override /*2*/ fun foo(): kotlin.MutableList<kotlin.String>
public open override /*2*/ fun foo(): kotlin.(Mutable)List<kotlin.String!>!
}
// Static members
public final /*synthesized*/ fun Other(/*0*/ function: () -> kotlin.MutableList<kotlin.String>?): test.TwoSuperclassesInconsistentGenericTypes.Other
public /*synthesized*/ fun Other(/*0*/ function: () -> kotlin.(Mutable)List<kotlin.String!>!): test.TwoSuperclassesInconsistentGenericTypes.Other
}
compiler/testData/loadJava/compiledJava/static/Enum.txt
+2 -2
View File
@@ -1,6 +1,6 @@
package test
public final enum class Enum : kotlin.Enum<test.Enum> {
public final enum class Enum : kotlin.Enum<test.Enum!> {
private constructor Enum()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
@@ -44,7 +44,7 @@ public final enum class Enum : kotlin.Enum<test.Enum> {
public open inner class Inner {
public constructor Inner()
public/*package*/ open fun bar(): kotlin.Unit
public/*package*/ open fun valueOf(/*0*/ p0: kotlin.String?): kotlin.Unit
public/*package*/ open fun valueOf(/*0*/ p0: kotlin.String!): kotlin.Unit
}
public open class Nested {
compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+3 -3
View File
@@ -1,6 +1,6 @@
package test
public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEnum> {
public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEnum!> {
private constructor StaticMembersInEnum()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
@@ -18,8 +18,8 @@ public final enum class StaticMembersInEnum : kotlin.Enum<test.StaticMembersInEn
}
// Static members
public final val CONSTANT: test.StaticMembersInEnum
public final var STATIC_FIELD: kotlin.Int
public val CONSTANT: test.StaticMembersInEnum!
public var STATIC_FIELD: kotlin.Int
public open fun foo(): kotlin.Unit
public open fun valueOf(/*0*/ p0: kotlin.Int): kotlin.Unit
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.StaticMembersInEnum