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

Test data fixed

Browse Source
This commit is contained in:
Andrey Breslav
2014-06-30 17:14:34 +04:00
parent 195274370f
commit 0cbbb6a0db
72 changed files with 219 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/EnumMembers.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public final enum class EnumMembers : kotlin.Enum<test.EnumMembers> {
public final enum class EnumMembers : kotlin.Enum<test.EnumMembers!> {
private constructor EnumMembers(/*0*/ p0: kotlin.Boolean)
public final val isFirst: kotlin.Boolean
public open fun first(): kotlin.Boolean
compiler/testData/loadJava/compiledJava/InnerOfGeneric.txt
+8 -8
View File
@@ -5,26 +5,26 @@ public open class InnerOfGeneric {
public abstract inner class A</*0*/ K> {
public constructor A</*0*/ K>()
public abstract inner class Inner : test.InnerOfGeneric.S<K> {
public abstract inner class Inner : test.InnerOfGeneric.S<K!> {
public constructor Inner()
public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<K>?
public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.(Mutable)Iterator<K!>!
}
}
public open inner class B</*0*/ L> : test.InnerOfGeneric.A<L> {
public open inner class B</*0*/ L> : test.InnerOfGeneric.A<L!> {
public constructor B</*0*/ L>()
public open inner class SubInner : test.InnerOfGeneric.A.Inner {
public constructor SubInner()
public open override /*1*/ fun iterator(): kotlin.MutableIterator<L>?
public open override /*1*/ fun iterator(): kotlin.(Mutable)Iterator<L!>!
}
}
public trait S</*0*/ E> {
public abstract fun iterator(): kotlin.MutableIterator<E>?
public abstract fun iterator(): kotlin.(Mutable)Iterator<E!>!
}
// Static members
public final /*synthesized*/ fun </*0*/ E> S(/*0*/ function: () -> kotlin.MutableIterator<E>?): test.InnerOfGeneric.S<E>
public final /*synthesized*/ fun </*0*/ E> S(/*0*/ function: () -> kotlin.MutableIterator<E!>!): test.InnerOfGeneric.S<E>
}
compiler/testData/loadJava/compiledJava/JavaEnum.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public final enum class JavaEnum : kotlin.Enum<test.JavaEnum> {
public final enum class JavaEnum : kotlin.Enum<test.JavaEnum!> {
private constructor JavaEnum()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
compiler/testData/loadJava/compiledJava/OverrideMethod.txt
+2 -2
View File
@@ -6,7 +6,7 @@ public open class OverrideMethod {
public/*package*/ open inner class Base : test.OverrideMethod.SuperBase {
public/*package*/ constructor Base()
public/*package*/ open fun bar(): kotlin.Unit
public/*package*/ open fun foo(/*0*/ p0: kotlin.String?): kotlin.String?
public/*package*/ open fun foo(/*0*/ p0: kotlin.String!): kotlin.String!
public/*package*/ open override /*1*/ /*fake_override*/ fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit
}
@@ -14,7 +14,7 @@ public open class OverrideMethod {
public/*package*/ constructor Derived()
public/*package*/ open override /*1*/ /*fake_override*/ fun bar(): kotlin.Unit
public/*package*/ open fun baz(): kotlin.Unit
public/*package*/ open override /*1*/ fun foo(/*0*/ p0: kotlin.String?): kotlin.String?
public/*package*/ open override /*1*/ fun foo(/*0*/ p0: kotlin.String!): kotlin.String!
public/*package*/ open override /*1*/ /*fake_override*/ fun quux(/*0*/ p0: kotlin.Int): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/PackageLocalVisibility.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class JFrame : awt.Frame {
public constructor JFrame()
protected/*protected and package*/ final var accessibleContext: kotlin.String?
protected/*protected and package*/ final var accessibleContext: kotlin.String!
}
compiler/testData/loadJava/compiledJava/PrivateMembers.txt
+2 -2
View File
@@ -5,8 +5,8 @@ public open class PrivateMembers {
private final var field: kotlin.Int
private open fun method(): kotlin.Unit
private final /*synthesized*/ fun samAdapter(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
private open fun samAdapter(/*0*/ p0: test.PrivateMembers.SamInterface?): kotlin.Unit
private open fun samAdapter(/*0*/ p0: test.PrivateMembers.SamInterface!): kotlin.Unit
private open inner class Inner {
private constructor Inner()
}
compiler/testData/loadJava/compiledJava/SubclassFromNested.txt
+1 -1
View File
@@ -1,7 +1,7 @@
package test
public/*package*/ open class B {
public/*package*/ constructor B(/*0*/ p0: test.B.C?)
public/*package*/ constructor B(/*0*/ p0: test.B.C!)
public/*package*/ trait C {
}
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+1 -1
View File
@@ -7,7 +7,7 @@ public trait CustomAnnotation {
public abstract fun value(): test.CustomAnnotation.MyEnum
}
public final enum class MyEnum : kotlin.Enum<test.CustomAnnotation.MyEnum> {
public final enum class MyEnum : kotlin.Enum<test.CustomAnnotation.MyEnum!> {
private constructor MyEnum()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.txt
+1 -1
View File
@@ -9,7 +9,7 @@ public open class NestedEnumArgument {
public abstract fun value(): test.NestedEnumArgument.E
}
public final enum class E : kotlin.Enum<test.NestedEnumArgument.E> {
public final enum class E : kotlin.Enum<test.NestedEnumArgument.E!> {
private constructor E()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
compiler/testData/loadJava/compiledJava/sam/Comparator.txt
+2 -2
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun </*0*/ T> Comparator(/*0*/ function: (T?, T?) -> kotlin.Int): test.Comparator<T>
public /*synthesized*/ fun </*0*/ T> Comparator(/*0*/ function: (T!, T!) -> kotlin.Int): test.Comparator<T>
public trait Comparator</*0*/ T> {
public abstract fun compare(/*0*/ p0: T?, /*1*/ p1: T?): kotlin.Int
public abstract fun compare(/*0*/ p0: T!, /*1*/ p1: T!): kotlin.Int
}
compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt
+2 -2
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File?, kotlin.String?) -> kotlin.Boolean): test.FilenameFilter
public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File!, kotlin.String!) -> kotlin.Boolean): test.FilenameFilter
public trait FilenameFilter {
public abstract fun accept(/*0*/ p0: java.io.File?, /*1*/ p1: kotlin.String?): kotlin.Boolean
public abstract fun accept(/*0*/ p0: java.io.File!, /*1*/ p1: kotlin.String!): kotlin.Boolean
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt
+3 -3
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun </*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> GenericInterfaceParameterWithSelfBound(/*0*/ function: (T?) -> T?): test.GenericInterfaceParameterWithSelfBound<T>
public /*synthesized*/ fun </*0*/ T : test.GenericInterfaceParameterWithSelfBound<T!>!> GenericInterfaceParameterWithSelfBound(/*0*/ function: (T!) -> T!): test.GenericInterfaceParameterWithSelfBound<T>
public trait GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> {
public abstract fun method(/*0*/ p0: T?): T?
public trait GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T!>!> {
public abstract fun method(/*0*/ p0: T!): T!
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
+3 -3
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun </*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> GenericInterfaceParametersWithBounds(/*0*/ function: (kotlin.Array<out A>?, B?) -> kotlin.Unit): test.GenericInterfaceParametersWithBounds<A, B> where A : kotlin.Cloneable?
public /*synthesized*/ fun </*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.(Mutable)List<A!>!> GenericInterfaceParametersWithBounds(/*0*/ function: (kotlin.Array<(out) A!>!, B!) -> kotlin.Unit): test.GenericInterfaceParametersWithBounds<A, B> where A : kotlin.Cloneable!
public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> where A : kotlin.Cloneable? {
public abstract fun method(/*0*/ p0: kotlin.Array<out A>?, /*1*/ p1: B?): kotlin.Unit
public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A!>!, /*1*/ B : kotlin.(Mutable)List<A!>!> where A : kotlin.Cloneable! {
public abstract fun method(/*0*/ p0: kotlin.Array<(out) A!>!, /*1*/ p1: B!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt
+1 -1
View File
@@ -1,5 +1,5 @@
package test
public trait GenericMethodParameters {
public abstract fun </*0*/ A : kotlin.CharSequence?, /*1*/ B : kotlin.List<A>?> method(/*0*/ p0: kotlin.Array<out A>?, /*1*/ p1: B?): kotlin.Unit
public abstract fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.(Mutable)List<A!>!> method(/*0*/ p0: kotlin.Array<(out) A!>!, /*1*/ p1: B!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
+8 -8
View File
@@ -1,21 +1,21 @@
package test
public trait SamSubinterfaceOfTwo {
public trait Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2<kotlin.String> {
public abstract override /*2*/ /*fake_override*/ fun f(): kotlin.String?
public trait Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2<kotlin.String!> {
public abstract override /*2*/ /*fake_override*/ fun f(): kotlin.String!
}
public trait Super1 {
public abstract fun f(): kotlin.CharSequence?
public abstract fun f(): kotlin.CharSequence!
}
public trait Super2</*0*/ T> {
public abstract fun f(): T?
public abstract fun f(): T!
}
// Static members
public final /*synthesized*/ fun Sub(/*0*/ function: () -> kotlin.String?): test.SamSubinterfaceOfTwo.Sub
public final /*synthesized*/ fun Super1(/*0*/ function: () -> kotlin.CharSequence?): test.SamSubinterfaceOfTwo.Super1
public final /*synthesized*/ fun </*0*/ T> Super2(/*0*/ function: () -> T?): test.SamSubinterfaceOfTwo.Super2<T>
public /*synthesized*/ fun Sub(/*0*/ function: () -> kotlin.String!): test.SamSubinterfaceOfTwo.Sub
public /*synthesized*/ fun Super1(/*0*/ function: () -> kotlin.CharSequence!): test.SamSubinterfaceOfTwo.Super1
public /*synthesized*/ fun </*0*/ T> Super2(/*0*/ function: () -> T!): test.SamSubinterfaceOfTwo.Super2<T>
}
compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt
+3 -3
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (kotlin.String, kotlin.String) -> kotlin.Int): test.SubstitutedSamInterface
public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (kotlin.String!, kotlin.String!) -> kotlin.Int): test.SubstitutedSamInterface
public trait SubstitutedSamInterface : java.util.Comparator<kotlin.String> {
public abstract override /*1*/ /*fake_override*/ fun compare(/*0*/ p0: kotlin.String, /*1*/ p1: kotlin.String): kotlin.Int
public trait SubstitutedSamInterface : java.util.Comparator<kotlin.String!> {
public abstract override /*1*/ /*fake_override*/ fun compare(/*0*/ p0: kotlin.String!, /*1*/ p1: kotlin.String!): kotlin.Int
}
compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt
+3 -3
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun SubstitutedSamInterfaceSubclassOfBuiltin(/*0*/ function: (test.SubstitutedSamInterfaceSubclassOfBuiltin) -> kotlin.Int): test.SubstitutedSamInterfaceSubclassOfBuiltin
public /*synthesized*/ fun SubstitutedSamInterfaceSubclassOfBuiltin(/*0*/ function: (test.SubstitutedSamInterfaceSubclassOfBuiltin!) -> kotlin.Int): test.SubstitutedSamInterfaceSubclassOfBuiltin
public trait SubstitutedSamInterfaceSubclassOfBuiltin : kotlin.Comparable<test.SubstitutedSamInterfaceSubclassOfBuiltin> {
public abstract override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.SubstitutedSamInterfaceSubclassOfBuiltin): kotlin.Int
public trait SubstitutedSamInterfaceSubclassOfBuiltin : kotlin.Comparable<test.SubstitutedSamInterfaceSubclassOfBuiltin!> {
public abstract override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.SubstitutedSamInterfaceSubclassOfBuiltin!): kotlin.Int
}
compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt
+2 -2
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun VarargParameter(/*0*/ function: (kotlin.Array<kotlin.String?>) -> kotlin.Unit): test.VarargParameter
public /*synthesized*/ fun VarargParameter(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.VarargParameter
public trait VarargParameter {
public abstract fun f(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
public abstract fun f(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt
+2 -2
View File
@@ -4,6 +4,6 @@ public open class AmbiguousAdapters {
public constructor AmbiguousAdapters()
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public open fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
public open fun foo(/*0*/ p0: java.io.Closeable!): kotlin.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt
+3 -3
View File
@@ -3,9 +3,9 @@ package test
public open class Basic {
public constructor Basic()
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
// Static members
public final /*synthesized*/ fun bar(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public open fun bar(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
public /*synthesized*/ fun bar(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public open fun bar(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class Constructor {
public /*synthesized*/ constructor Constructor(/*0*/ p0: (() -> kotlin.Unit)?)
public constructor Constructor(/*0*/ p0: java.lang.Runnable?)
public constructor Constructor(/*0*/ p0: java.lang.Runnable!)
}
compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
+2 -2
View File
@@ -4,12 +4,12 @@ public trait DeepSamLoop {
public trait Bar {
public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Bar?) -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Foo?): kotlin.Unit
public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Foo!): kotlin.Unit
}
public trait Foo {
public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Foo?) -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Bar?): kotlin.Unit
public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Bar!): kotlin.Unit
}
// Static members
compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt
+4 -4
View File
@@ -4,9 +4,9 @@ public open class NonTrivialFunctionType {
public constructor NonTrivialFunctionType()
public final /*synthesized*/ fun foo(/*0*/ p0: ((java.io.File, kotlin.String) -> kotlin.Boolean)?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit
public open fun foo(/*0*/ p0: java.io.FilenameFilter?): kotlin.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<kotlin.String>?): kotlin.Unit
public open fun foo(/*0*/ p0: java.io.FilenameFilter!): kotlin.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<kotlin.String!>!): kotlin.Unit
public final /*synthesized*/ fun wildcardBound(/*0*/ p0: ((kotlin.CharSequence?, kotlin.CharSequence?) -> kotlin.Int)?): kotlin.Unit
public open fun wildcardBound(/*0*/ p0: java.util.Comparator<in kotlin.CharSequence?>?): kotlin.Unit
public open fun wildcardUnbound(/*0*/ p0: java.util.Comparator<out kotlin.Any?>?): kotlin.Unit
public open fun wildcardBound(/*0*/ p0: java.util.Comparator<in kotlin.CharSequence!>!): kotlin.Unit
public open fun wildcardUnbound(/*0*/ p0: java.util.Comparator<out kotlin.Any?>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt
+3 -3
View File
@@ -1,8 +1,8 @@
package test
public /*synthesized*/ fun SelfAsParameter(/*0*/ function: (test.SelfAsParameter?) -> kotlin.Unit): test.SelfAsParameter
public /*synthesized*/ fun SelfAsParameter(/*0*/ function: (test.SelfAsParameter!) -> kotlin.Unit): test.SelfAsParameter
public trait SelfAsParameter {
public final /*synthesized*/ fun foo(/*0*/ p0: ((test.SelfAsParameter?) -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: test.SelfAsParameter?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: ((test.SelfAsParameter!) -> kotlin.Unit)!): kotlin.Unit
public abstract fun foo(/*0*/ p0: test.SelfAsParameter!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt
+2 -2
View File
@@ -4,6 +4,6 @@ public open class SeveralSamParameters {
public constructor SeveralSamParameters()
// Static members
public final /*synthesized*/ fun findMaxAndInvokeCallback(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?, /*1*/ p1: kotlin.String?, /*2*/ p2: kotlin.String?, /*3*/ p3: (() -> kotlin.Unit)?): kotlin.String?
public open fun findMaxAndInvokeCallback(/*0*/ p0: java.util.Comparator<kotlin.String>?, /*1*/ p1: kotlin.String?, /*2*/ p2: kotlin.String?, /*3*/ p3: java.lang.Runnable?): kotlin.String?
public /*synthesized*/ fun findMaxAndInvokeCallback(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?, /*1*/ p1: kotlin.String?, /*2*/ p2: kotlin.String?, /*3*/ p3: (() -> kotlin.Unit)?): kotlin.String?
public open fun findMaxAndInvokeCallback(/*0*/ p0: java.util.Comparator<kotlin.String!>!, /*1*/ p1: kotlin.String!, /*2*/ p2: kotlin.String!, /*3*/ p3: java.lang.Runnable!): kotlin.String!
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt
+1 -1
View File
@@ -3,5 +3,5 @@ package test
public open class TypeParameterOfClass</*0*/ T> {
public constructor TypeParameterOfClass</*0*/ T>()
public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<T>?): kotlin.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<T!>!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
+6 -6
View File
@@ -4,10 +4,10 @@ public open class TypeParameterOfMethod {
public constructor TypeParameterOfMethod()
// Static members
public final /*synthesized*/ fun </*0*/ T> max(/*0*/ p0: ((T, T) -> kotlin.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T?
public open fun </*0*/ T> max(/*0*/ p0: java.util.Comparator<T>?, /*1*/ p1: T?, /*2*/ p2: T?): T?
public final /*synthesized*/ fun </*0*/ T : kotlin.CharSequence?> max2(/*0*/ p0: ((T, T) -> kotlin.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T?
public open fun </*0*/ T : kotlin.CharSequence?> max2(/*0*/ p0: java.util.Comparator<T>?, /*1*/ p1: T?, /*2*/ p2: T?): T?
public final /*synthesized*/ fun </*0*/ A : kotlin.CharSequence?, /*1*/ B : kotlin.List<A>?> method(/*0*/ p0: ((A, A) -> kotlin.Int)?, /*1*/ p1: B?): kotlin.Unit
public open fun </*0*/ A : kotlin.CharSequence?, /*1*/ B : kotlin.List<A>?> method(/*0*/ p0: java.util.Comparator<A>?, /*1*/ p1: B?): kotlin.Unit
public /*synthesized*/ fun </*0*/ T> max(/*0*/ p0: ((T, T) -> kotlin.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T?
public open fun </*0*/ T> max(/*0*/ p0: java.util.Comparator<T!>!, /*1*/ p1: T!, /*2*/ p2: T!): T!
public /*synthesized*/ fun </*0*/ T : kotlin.CharSequence?> max2(/*0*/ p0: ((T, T) -> kotlin.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T?
public open fun </*0*/ T : kotlin.CharSequence!> max2(/*0*/ p0: java.util.Comparator<T!>!, /*1*/ p1: T!, /*2*/ p2: T!): T!
public /*synthesized*/ fun </*0*/ A : kotlin.CharSequence?, /*1*/ B : kotlin.List<A>?> method(/*0*/ p0: ((A, A) -> kotlin.Int)?, /*1*/ p1: B?): kotlin.Unit
public open fun </*0*/ A : kotlin.CharSequence!, /*1*/ B : kotlin.(Mutable)List<A!>!> method(/*0*/ p0: java.util.Comparator<A!>!, /*1*/ p1: B!): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt
+1 -1
View File
@@ -6,6 +6,6 @@ public open class TypeParameterOfOuterClass</*0*/ T> {
public open inner class Inner {
public constructor Inner()
public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<T>?): kotlin.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<T!>!): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
+4 -4
View File
@@ -4,15 +4,15 @@ public trait InheritedSimple {
public trait Sub : test.InheritedSimple.Super {
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
public trait Super {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable!): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): test.InheritedSimple.Sub
public final /*synthesized*/ fun Super(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): test.InheritedSimple.Super
public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSimple.Sub
public /*synthesized*/ fun Super(/*0*/ function: (java.lang.Runnable!) -> kotlin.Unit): test.InheritedSimple.Super
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
+5 -6
View File
@@ -3,19 +3,18 @@ package test
public trait TwoSuperclassesVarargAndNot {
public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ s: kotlin.Array<out kotlin.String?>?): kotlin.Unit
public abstract override /*2*/ fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
}
public trait Super1 {
public abstract fun foo(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
public abstract fun foo(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}
public trait Super2 {
public abstract fun foo(/*0*/ s: kotlin.Array<out kotlin.String?>?): kotlin.Unit
public abstract fun foo(/*0*/ p0: kotlin.Array<(out) kotlin.String!>!): kotlin.Unit
}
// Static members
public final /*synthesized*/ fun Super1(/*0*/ function: (kotlin.Array<kotlin.String?>) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super1
public final /*synthesized*/ fun Super2(/*0*/ function: (kotlin.Array<out kotlin.String?>?) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super2
public /*synthesized*/ fun Super1(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super1
public /*synthesized*/ fun Super2(/*0*/ function: (kotlin.Array<(out) kotlin.String!>!) -> kotlin.Unit): test.TwoSuperclassesVarargAndNot.Super2
}
compiler/testData/loadJava/compiledJava/vararg/VarargInt.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class VarargInt {
public constructor VarargInt()
public open fun vararg(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray*/): kotlin.Unit
public open fun vararg(/*0*/ vararg p0: kotlin.Int /*kotlin.IntArray!*/): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/vararg/VarargString.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class VarargString {
public constructor VarargString()
public open fun vararg(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
public open fun vararg(/*0*/ vararg p0: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
}
compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.txt
+1 -1
View File
@@ -4,5 +4,5 @@ public final class ClassWithObjectMethod {
public constructor ClassWithObjectMethod()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ fun toString(): kotlin.String
public open override /*1*/ fun toString(): kotlin.String!
}
compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.txt
+1 -1
View File
@@ -1,7 +1,7 @@
package test
public trait InterfaceWithObjectMethods {
public abstract fun clone(): kotlin.Any?
public abstract fun clone(): kotlin.Any!
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public abstract fun finalize(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt
+13 -13
View File
@@ -2,13 +2,13 @@ package test
public abstract class ClassDoesNotOverrideMethod : java.util.Date {
/*primary*/ public constructor ClassDoesNotOverrideMethod()
invisible_fake final override /*1*/ /*fake_override*/ var cdate: sun.util.calendar.BaseCalendar.Date?
invisible_fake final override /*1*/ /*fake_override*/ var cdate: sun.util.calendar.BaseCalendar.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 compareTo(/*0*/ other: java.util.Date): kotlin.Int
invisible_fake final override /*1*/ /*fake_override*/ fun getCalendarDate(): sun.util.calendar.BaseCalendar.Date?
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 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
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getDay(): kotlin.Int
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getHours(): kotlin.Int
@@ -19,9 +19,9 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
invisible_fake final override /*1*/ /*fake_override*/ fun getTimeImpl(): kotlin.Long
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getTimezoneOffset(): kotlin.Int
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun getYear(): kotlin.Int
invisible_fake final override /*1*/ /*fake_override*/ fun normalize(): sun.util.calendar.BaseCalendar.Date?
invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ p0: sun.util.calendar.BaseCalendar.Date?): sun.util.calendar.BaseCalendar.Date?
invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream?): kotlin.Unit
invisible_fake final override /*1*/ /*fake_override*/ fun normalize(): sun.util.calendar.BaseCalendar.Date!
invisible_fake final override /*1*/ /*fake_override*/ fun normalize(/*0*/ p0: sun.util.calendar.BaseCalendar.Date!): sun.util.calendar.BaseCalendar.Date!
invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setDate(/*0*/ p0: kotlin.Int): kotlin.Unit
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setHours(/*0*/ p0: kotlin.Int): kotlin.Unit
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setMinutes(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -29,7 +29,7 @@ public abstract class ClassDoesNotOverrideMethod : java.util.Date {
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: kotlin.Long): kotlin.Unit
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: kotlin.Int): kotlin.Unit
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String
invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream?): kotlin.Unit
}
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toGMTString(): kotlin.String!
kotlin.deprecated(value = "Deprecated in Java": kotlin.String) public open override /*1*/ /*fake_override*/ fun toLocaleString(): kotlin.String!
invisible_fake open override /*1*/ /*fake_override*/ fun writeObject(/*0*/ p0: java.io.ObjectOutputStream!): kotlin.Unit
}
compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
+16 -16
View File
@@ -3,30 +3,30 @@ package test
public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String> {
/*primary*/ 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*/ /*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*/ a: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
}
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt
+8 -8
View File
@@ -2,16 +2,16 @@ package test
public final class Sub : test.Super {
public constructor Sub()
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.io.Closeable?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.io.Closeable!): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
public open class Super {
public constructor Super()
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.io.Closeable?): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.io.Closeable!): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt
+4 -4
View File
@@ -2,12 +2,12 @@ package test
public final class Sub : test.Super {
public constructor Sub()
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public/*package*/ final override /*1*/ /*fake_override*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
public open class Super {
public constructor Super()
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt
+3 -3
View File
@@ -3,11 +3,11 @@ package test
public final class Sub : test.Super {
public constructor Sub()
internal open override /*1*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public/*package*/ open override /*1*/ /*fake_override*/ fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
public open class Super {
public constructor Super()
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)?): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable?): kotlin.Unit
public/*package*/ final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public/*package*/ open fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt
+2 -2
View File
@@ -2,8 +2,8 @@ package test
public open class Sub : test.Super {
public constructor Sub()
public final /*synthesized*/ fun foo(/*0*/ r: () -> kotlin.Unit): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ r: java.lang.Runnable): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ r: (() -> kotlin.Unit)!): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ r: java.lang.Runnable!): kotlin.Unit
}
public final class Super {
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt
+3 -3
View File
@@ -7,7 +7,7 @@ public open class A {
public open class B : test.A {
public constructor B()
public open override /*1*/ fun foo(): kotlin.String
public open override /*1*/ fun foo(): kotlin.String!
}
public open class C : test.B {
@@ -17,7 +17,7 @@ public open class C : test.B {
public open class D : test.C {
public constructor D()
public open override /*1*/ fun foo(): kotlin.String
public open override /*1*/ fun foo(): kotlin.String!
}
public open class E : test.D {
@@ -27,5 +27,5 @@ public open class E : test.D {
public open class F : test.E {
public constructor F()
public open override /*1*/ fun foo(): kotlin.String
public open override /*1*/ fun foo(): kotlin.String!
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt
+2 -2
View File
@@ -1,8 +1,8 @@
package test
public trait Sub : test.Super1, test.Super2 {
public abstract override /*1*/ fun bar(/*0*/ vararg p: kotlin.String /*kotlin.Array<kotlin.String>*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String): kotlin.Unit
public abstract override /*1*/ fun bar(/*0*/ vararg p: kotlin.String! /*kotlin.Array<(out) kotlin.String!>!*/): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p: kotlin.String!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun kotlin.Array<kotlin.String>.bar(): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun kotlin.String.foo(): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public open class Sub : test.Super {
public constructor Sub()
public open override /*1*/ fun kotlin.String.bar(/*0*/ p: kotlin.String): kotlin.String
public open override /*1*/ fun kotlin.String!.bar(/*0*/ p: kotlin.String!): kotlin.String!
public final override /*1*/ /*fake_override*/ fun kotlin.String.foo(): kotlin.Unit
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt
+1 -1
View File
@@ -8,7 +8,7 @@ internal open class Impl : test.Trait {
public open class Subclass : test.Impl {
public constructor Subclass()
java.lang.Override() public open override /*1*/ fun bar(): kotlin.String
java.lang.Override() public open override /*1*/ fun bar(): kotlin.String!
internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.String
}
compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public open class JavaSubclass : test.KotlinClass {
public constructor JavaSubclass()
public open override /*1*/ fun foo(): kotlin.String
public open override /*1*/ fun foo(): kotlin.String!
}
public open class KotlinClass {
compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/javaRefersToKotlin.txt
+2 -2
View File
@@ -1,9 +1,9 @@
package test
public /*synthesized*/ fun J(/*0*/ function: (test.K?) -> kotlin.Unit): test.J
public /*synthesized*/ fun J(/*0*/ function: (test.K!) -> kotlin.Unit): test.J
public trait J {
public abstract fun foo(/*0*/ p0: test.K?): kotlin.Unit
public abstract fun foo(/*0*/ p0: test.K!): kotlin.Unit
}
internal trait K {
compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public open class J : test.K {
public constructor J()
public open override /*1*/ fun foo(/*0*/ l: kotlin.MutableList<kotlin.String>): kotlin.String
public open override /*1*/ fun foo(/*0*/ l: kotlin.(Mutable)List<kotlin.String!>!): kotlin.String!
}
internal trait K {
compiler/testData/loadJava/sourceJava/ErrorTypes.txt
+5 -5
View File
@@ -3,13 +3,13 @@ package test
public trait ErrorTypes {
public trait Sub : test.ErrorTypes.Super {
public abstract fun errorTypeInParameter(/*0*/ list: kotlin.List<kotlin.Array<[ERROR : Unresolved java classifier: T]>?>?): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun errorTypeInParameter(/*0*/ list: kotlin.List<kotlin.Array<[ERROR : Unresolved java classifier: T]>?>?): kotlin.Unit
public abstract override /*1*/ fun returnErrorType(): [ERROR : Unresolved java classifier: T]?
public abstract fun errorTypeInParameter(/*0*/ list: kotlin.(Mutable)List<kotlin.Array<(out) [ERROR : Unresolved java classifier: T]!>!>!): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun errorTypeInParameter(/*0*/ list: kotlin.(Mutable)List<kotlin.Array<(out) [ERROR : Unresolved java classifier: T]!>!>!): kotlin.Unit
public abstract override /*1*/ fun returnErrorType(): [ERROR : Unresolved java classifier: T]!
}
public trait Super {
public abstract fun errorTypeInParameter(/*0*/ list: kotlin.List<kotlin.Array<[ERROR : Unresolved java classifier: T]>?>?): kotlin.Unit
public abstract fun returnErrorType(): [ERROR : Unresolved java classifier: T]?
public abstract fun errorTypeInParameter(/*0*/ list: kotlin.(Mutable)List<kotlin.Array<(out) [ERROR : Unresolved java classifier: T]!>!>!): kotlin.Unit
public abstract fun returnErrorType(): [ERROR : Unresolved java classifier: T]!
}
}
compiler/testData/loadJava/sourceJava/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/sourceJava/ReturnNotSubtype.txt
+10 -10
View File
@@ -2,21 +2,21 @@ package test
public trait ReturnNotSubtype {
public trait Sub : test.ReturnNotSubtype.Super<kotlin.Boolean> {
public trait Sub : test.ReturnNotSubtype.Super<kotlin.Boolean!> {
public abstract override /*1*/ fun _void(): kotlin.Boolean
public abstract override /*1*/ fun array(): kotlin.Array<java.lang.Void>?
public abstract override /*1*/ fun klass(): java.lang.Class<out kotlin.Any?>?
public abstract override /*1*/ fun array(): kotlin.Array<(out) java.lang.Void!>!
public abstract override /*1*/ fun klass(): java.lang.Class<out kotlin.Any?>!
public abstract override /*1*/ fun string1(): kotlin.Unit
public abstract override /*1*/ fun string2(): kotlin.MutableList<kotlin.Boolean>?
public abstract override /*1*/ fun t(): java.lang.Void?
public abstract override /*1*/ fun string2(): kotlin.(Mutable)List<kotlin.Boolean!>!
public abstract override /*1*/ fun t(): java.lang.Void!
}
public trait Super</*0*/ T> {
public abstract fun _void(): kotlin.Unit
public abstract fun array(): kotlin.Array<T>?
public abstract fun klass(): java.lang.Class<out kotlin.CharSequence?>?
public abstract fun string1(): kotlin.String?
public abstract fun string2(): kotlin.String?
public abstract fun t(): T?
public abstract fun array(): kotlin.Array<(out) T!>!
public abstract fun klass(): java.lang.Class<out kotlin.CharSequence!>!
public abstract fun string1(): kotlin.String!
public abstract fun string2(): kotlin.String!
public abstract fun t(): T!
}
}
compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.txt
+4 -4
View File
@@ -1,10 +1,10 @@
package test
public trait WrongNumberOfGenericParameters {
public abstract fun o0(): test.WrongNumberOfGenericParameters.One<out kotlin.Any?>?
public abstract fun o2(): test.WrongNumberOfGenericParameters.One<[ERROR : T]>?
public abstract fun t1(): test.WrongNumberOfGenericParameters.Two<out kotlin.Any?, out kotlin.Any?>?
public abstract fun z(): test.WrongNumberOfGenericParameters.Zero?
public abstract fun o0(): test.WrongNumberOfGenericParameters.One<out kotlin.Any?>!
public abstract fun o2(): test.WrongNumberOfGenericParameters.One<[ERROR : T]>!
public abstract fun t1(): test.WrongNumberOfGenericParameters.Two<out kotlin.Any?, out kotlin.Any?>!
public abstract fun z(): test.WrongNumberOfGenericParameters.Zero!
public trait One</*0*/ T> {
}