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

Replace "jet" package name with "kotlin" in testData

Browse Source
This commit is contained in:
Alexander Udalov
2014-02-21 23:29:57 +04:00
parent f2b4c7fa3e
commit f7b6457139
763 changed files with 2314 additions and 2310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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?) -> jet.Int): test.Comparator<T>
public /*synthesized*/ fun </*0*/ T> Comparator(/*0*/ function: (T?, T?) -> kotlin.Int): test.Comparator<T>
public trait Comparator</*0*/ T> : java.lang.Object {
public abstract fun compare(/*0*/ p0: T?, /*1*/ p1: T?): jet.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?, jet.String?) -> jet.Boolean): test.FilenameFilter
public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File?, kotlin.String?) -> kotlin.Boolean): test.FilenameFilter
public trait FilenameFilter : java.lang.Object {
public abstract fun accept(/*0*/ p0: java.io.File?, /*1*/ p1: jet.String?): jet.Boolean
public abstract fun accept(/*0*/ p0: java.io.File?, /*1*/ p1: kotlin.String?): kotlin.Boolean
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
+3 -3
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun </*0*/ A : jet.Comparable<A>?, /*1*/ B : jet.List<A>?> GenericInterfaceParametersWithBounds(/*0*/ function: (jet.Array<out A>?, B?) -> jet.Unit): test.GenericInterfaceParametersWithBounds<A, B> where A : java.lang.Cloneable?
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 : java.lang.Cloneable?
public trait GenericInterfaceParametersWithBounds</*0*/ A : jet.Comparable<A>?, /*1*/ B : jet.List<A>?> : java.lang.Object where A : java.lang.Cloneable? {
public abstract fun method(/*0*/ p0: jet.Array<out A>?, /*1*/ p1: B?): jet.Unit
public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> : java.lang.Object where A : java.lang.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 : java.lang.Object {
public abstract fun </*0*/ A : jet.CharSequence?, /*1*/ B : jet.List<A>?> method(/*0*/ p0: jet.Array<out A>?, /*1*/ p1: B?): jet.Unit
public abstract fun </*0*/ A : kotlin.CharSequence?, /*1*/ B : kotlin.List<A>?> method(/*0*/ p0: kotlin.Array<out A>?, /*1*/ p1: B?): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/Nested.txt
+6 -6
View File
@@ -5,27 +5,27 @@ public trait Nested : java.lang.Object {
public trait Deeper1 : java.lang.Object {
public trait Runnable : java.lang.Object {
public abstract fun run(): jet.Unit
public abstract fun run2(): jet.Unit
public abstract fun run(): kotlin.Unit
public abstract fun run2(): kotlin.Unit
}
}
public trait Deeper2 : java.lang.Object {
public trait Runnable : java.lang.Object {
public abstract fun run(): jet.Unit
public abstract fun run(): kotlin.Unit
}
}
public trait Runnable : java.lang.Object {
public abstract fun run(): jet.Unit
public abstract fun run(): kotlin.Unit
}
}
package test.Nested {
public /*synthesized*/ fun Runnable(/*0*/ function: () -> jet.Unit): test.Nested.Runnable
public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Runnable
package test.Nested.Deeper2 {
public /*synthesized*/ fun Runnable(/*0*/ function: () -> jet.Unit): test.Nested.Deeper2.Runnable
public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Deeper2.Runnable
}
}
compiler/testData/loadJava/compiledJava/sam/Runnable.txt
+2 -2
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun Runnable(/*0*/ function: () -> jet.Unit): test.Runnable
public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Runnable
public trait Runnable : java.lang.Object {
public abstract fun run(): jet.Unit
public abstract fun run(): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
+5 -5
View File
@@ -2,12 +2,12 @@ package test
public trait SamSubinterfaceOfTwo : java.lang.Object {
public trait Sub : test.SamSubinterfaceOfTwo.Super1, test.SamSubinterfaceOfTwo.Super2<jet.String> {
public abstract override /*2*/ /*fake_override*/ fun f(): jet.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 : java.lang.Object {
public abstract fun f(): jet.CharSequence?
public abstract fun f(): kotlin.CharSequence?
}
public trait Super2</*0*/ T> : java.lang.Object {
@@ -16,7 +16,7 @@ public trait SamSubinterfaceOfTwo : java.lang.Object {
}
package test.SamSubinterfaceOfTwo {
public /*synthesized*/ fun Sub(/*0*/ function: () -> jet.String?): test.SamSubinterfaceOfTwo.Sub
public /*synthesized*/ fun Super1(/*0*/ function: () -> jet.CharSequence?): test.SamSubinterfaceOfTwo.Super1
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/SamSubinterfaceOverridding.txt
+2 -2
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun SamSubinterfaceOverridding(/*0*/ function: () -> jet.Unit): test.SamSubinterfaceOverridding
public /*synthesized*/ fun SamSubinterfaceOverridding(/*0*/ function: () -> kotlin.Unit): test.SamSubinterfaceOverridding
public trait SamSubinterfaceOverridding : java.lang.Runnable {
public abstract override /*1*/ fun run(): jet.Unit
public abstract override /*1*/ fun run(): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt
+3 -3
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (jet.String, jet.String) -> jet.Int): test.SubstitutedSamInterface
public /*synthesized*/ fun SubstitutedSamInterface(/*0*/ function: (kotlin.String, kotlin.String) -> kotlin.Int): test.SubstitutedSamInterface
public trait SubstitutedSamInterface : java.util.Comparator<jet.String> {
public abstract override /*1*/ /*fake_override*/ fun compare(/*0*/ p0: jet.String, /*1*/ p1: jet.String): jet.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) -> jet.Int): test.SubstitutedSamInterfaceSubclassOfBuiltin
public /*synthesized*/ fun SubstitutedSamInterfaceSubclassOfBuiltin(/*0*/ function: (test.SubstitutedSamInterfaceSubclassOfBuiltin) -> kotlin.Int): test.SubstitutedSamInterfaceSubclassOfBuiltin
public trait SubstitutedSamInterfaceSubclassOfBuiltin : jet.Comparable<test.SubstitutedSamInterfaceSubclassOfBuiltin> {
public abstract override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.SubstitutedSamInterfaceSubclassOfBuiltin): jet.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: (jet.Array<jet.String?>) -> jet.Unit): test.VarargParameter
public /*synthesized*/ fun VarargParameter(/*0*/ function: (kotlin.Array<kotlin.String?>) -> kotlin.Unit): test.VarargParameter
public trait VarargParameter : java.lang.Object {
public abstract fun f(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Unit
public abstract fun f(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt
+4 -4
View File
@@ -2,8 +2,8 @@ package test
public open class AmbiguousAdapters : java.lang.Object {
public constructor AmbiguousAdapters()
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public open fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
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
}
compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt
+4 -4
View File
@@ -2,11 +2,11 @@ package test
public open class Basic : java.lang.Object {
public constructor Basic()
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
package test.Basic {
public /*synthesized*/ fun bar(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public open fun bar(/*0*/ p0: java.lang.Runnable?): jet.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
@@ -1,6 +1,6 @@
package test
public open class Constructor : java.lang.Object {
public /*synthesized*/ constructor Constructor(/*0*/ p0: (() -> jet.Unit)?)
public /*synthesized*/ constructor Constructor(/*0*/ p0: (() -> kotlin.Unit)?)
public constructor Constructor(/*0*/ p0: java.lang.Runnable?)
}
compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
+6 -6
View File
@@ -3,17 +3,17 @@ package test
public trait DeepSamLoop : java.lang.Object {
public trait Bar : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Bar?) -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Foo?): jet.Unit
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 trait Foo : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: ((test.DeepSamLoop.Foo?) -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: test.DeepSamLoop.Bar?): jet.Unit
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
}
}
package test.DeepSamLoop {
public /*synthesized*/ fun Bar(/*0*/ function: (test.DeepSamLoop.Foo?) -> jet.Unit): test.DeepSamLoop.Bar
public /*synthesized*/ fun Foo(/*0*/ function: (test.DeepSamLoop.Bar?) -> jet.Unit): test.DeepSamLoop.Foo
public /*synthesized*/ fun Bar(/*0*/ function: (test.DeepSamLoop.Foo?) -> kotlin.Unit): test.DeepSamLoop.Bar
public /*synthesized*/ fun Foo(/*0*/ function: (test.DeepSamLoop.Bar?) -> kotlin.Unit): test.DeepSamLoop.Foo
}
compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt
+7 -7
View File
@@ -2,11 +2,11 @@ package test
public open class NonTrivialFunctionType : java.lang.Object {
public constructor NonTrivialFunctionType()
public final /*synthesized*/ fun foo(/*0*/ p0: ((java.io.File, jet.String) -> jet.Boolean)?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?): jet.Unit
public open fun foo(/*0*/ p0: java.io.FilenameFilter?): jet.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<jet.String>?): jet.Unit
public final /*synthesized*/ fun wildcardBound(/*0*/ p0: ((jet.CharSequence?, jet.CharSequence?) -> jet.Int)?): jet.Unit
public open fun wildcardBound(/*0*/ p0: java.util.Comparator<in jet.CharSequence?>?): jet.Unit
public open fun wildcardUnbound(/*0*/ p0: java.util.Comparator<out jet.Any?>?): jet.Unit
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 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
}
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?) -> jet.Unit): test.SelfAsParameter
public /*synthesized*/ fun SelfAsParameter(/*0*/ function: (test.SelfAsParameter?) -> kotlin.Unit): test.SelfAsParameter
public trait SelfAsParameter : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: ((test.SelfAsParameter?) -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: test.SelfAsParameter?): jet.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
@@ -5,6 +5,6 @@ public open class SeveralSamParameters : java.lang.Object {
}
package test.SeveralSamParameters {
public /*synthesized*/ fun findMaxAndInvokeCallback(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?, /*1*/ p1: jet.String?, /*2*/ p2: jet.String?, /*3*/ p3: (() -> jet.Unit)?): jet.String?
public open fun findMaxAndInvokeCallback(/*0*/ p0: java.util.Comparator<jet.String>?, /*1*/ p1: jet.String?, /*2*/ p2: jet.String?, /*3*/ p3: java.lang.Runnable?): jet.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
+2 -2
View File
@@ -2,6 +2,6 @@ package test
public open class TypeParameterOfClass</*0*/ T> : java.lang.Object {
public constructor TypeParameterOfClass</*0*/ T>()
public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> jet.Int)?): jet.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<T>?): jet.Unit
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
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
+5 -5
View File
@@ -5,10 +5,10 @@ public open class TypeParameterOfMethod : java.lang.Object {
}
package test.TypeParameterOfMethod {
public /*synthesized*/ fun </*0*/ T> max(/*0*/ p0: ((T, T) -> jet.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T?
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 : jet.CharSequence?> max2(/*0*/ p0: ((T, T) -> jet.Int)?, /*1*/ p1: T?, /*2*/ p2: T?): T?
public open fun </*0*/ T : jet.CharSequence?> max2(/*0*/ p0: java.util.Comparator<T>?, /*1*/ p1: T?, /*2*/ p2: T?): T?
public /*synthesized*/ fun </*0*/ A : jet.CharSequence?, /*1*/ B : jet.List<A>?> method(/*0*/ p0: ((A, A) -> jet.Int)?, /*1*/ p1: B?): jet.Unit
public open fun </*0*/ A : jet.CharSequence?, /*1*/ B : jet.List<A>?> method(/*0*/ p0: java.util.Comparator<A>?, /*1*/ p1: B?): jet.Unit
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.List<A>?> method(/*0*/ p0: java.util.Comparator<A>?, /*1*/ p1: B?): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt
+2 -2
View File
@@ -5,7 +5,7 @@ public open class TypeParameterOfOuterClass</*0*/ T> : java.lang.Object {
public open inner class Inner : java.lang.Object {
public constructor Inner()
public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> jet.Int)?): jet.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<T>?): jet.Unit
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
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.java
+1 -1
View File
@@ -2,7 +2,7 @@ package test;
public interface AdapterDoesntOverrideDeclaration {
public interface Super {
void foo(jet.Function0<jet.Unit> r);
void foo(kotlin.Function0<kotlin.Unit> r);
}
public interface Sub extends Super {
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt
+5 -5
View File
@@ -3,16 +3,16 @@ package test
public trait AdapterDoesntOverrideDeclaration : java.lang.Object {
public trait Sub : test.AdapterDoesntOverrideDeclaration.Super {
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
public trait Super : java.lang.Object {
public abstract fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
}
}
package test.AdapterDoesntOverrideDeclaration {
public /*synthesized*/ fun Super(/*0*/ function: ((() -> jet.Unit)?) -> jet.Unit): test.AdapterDoesntOverrideDeclaration.Super
public /*synthesized*/ fun Super(/*0*/ function: ((() -> kotlin.Unit)?) -> kotlin.Unit): test.AdapterDoesntOverrideDeclaration.Super
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.java
+1 -1
View File
@@ -3,7 +3,7 @@ package test;
public interface InheritedAdapterAndDeclaration {
public interface Super {
void foo(Runnable r);
void foo(jet.Function0<jet.Unit> r);
void foo(kotlin.Function0<kotlin.Unit> r);
}
public interface Sub extends Super {
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt
+6 -6
View File
@@ -3,14 +3,14 @@ package test
public trait InheritedAdapterAndDeclaration : java.lang.Object {
public trait Sub : test.InheritedAdapterAndDeclaration.Super {
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
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 trait Super : java.lang.Object {
public abstract fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.txt
+8 -8
View File
@@ -3,16 +3,16 @@ package test
public trait InheritedAmbiguousAdapters : java.lang.Object {
public trait Sub : test.InheritedAmbiguousAdapters.Super {
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
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.io.Closeable?): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
public trait Super : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt
+8 -8
View File
@@ -3,16 +3,16 @@ package test
public trait InheritedAndOverriddenAmbiguousAdapters : java.lang.Object {
public trait Sub : test.InheritedAndOverriddenAmbiguousAdapters.Super {
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
public trait Super : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt
+4 -4
View File
@@ -4,13 +4,13 @@ public trait InheritedOverridden : java.lang.Object {
public open class Sub : test.InheritedOverridden.Super {
public constructor Sub()
public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public open override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final override /*1*/ /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public open override /*1*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
public open class Super : java.lang.Object {
public constructor Super()
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.java
+1 -1
View File
@@ -7,7 +7,7 @@ public interface InheritedOverriddenAdapter {
}
public class Sub extends Super {
public void foo(jet.Function0<jet.Unit> r) {
public void foo(kotlin.Function0<kotlin.Unit> r) {
}
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.txt
+4 -4
View File
@@ -4,13 +4,13 @@ public trait InheritedOverriddenAdapter : java.lang.Object {
public open class Sub : test.InheritedOverriddenAdapter.Super {
public constructor Sub()
public open override /*1*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public open override /*1*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
public open class Super : java.lang.Object {
public constructor Super()
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.txt
+9 -9
View File
@@ -3,23 +3,23 @@ package test
public trait InheritedSameAdapters : java.lang.Object {
public trait Sub : test.InheritedSameAdapters.Super1, test.InheritedSameAdapters.Super2 {
public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
public trait Super1 : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
public trait Super2 : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
}
package test.InheritedSameAdapters {
public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSameAdapters.Sub
public /*synthesized*/ fun Super1(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSameAdapters.Super1
public /*synthesized*/ fun Super2(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSameAdapters.Super2
public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): test.InheritedSameAdapters.Sub
public /*synthesized*/ fun Super1(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): test.InheritedSameAdapters.Super1
public /*synthesized*/ fun Super2(/*0*/ function: (java.lang.Runnable?) -> kotlin.Unit): test.InheritedSameAdapters.Super2
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.txt
+13 -13
View File
@@ -3,29 +3,29 @@ package test
public trait InheritedSameAdaptersWithSubstitution : java.lang.Object {
public trait Sub : test.InheritedSameAdaptersWithSubstitution.Super1, test.InheritedSameAdaptersWithSubstitution.Super2Substituted {
public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?): jet.Unit
public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<jet.String>?): jet.Unit
public final override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit
public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<kotlin.String>?): kotlin.Unit
}
public trait Super1 : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?): jet.Unit
public abstract fun foo(/*0*/ p0: java.util.Comparator<jet.String>?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.util.Comparator<kotlin.String>?): kotlin.Unit
}
public trait Super2</*0*/ T> : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> jet.Int)?): jet.Unit
public abstract fun foo(/*0*/ p0: java.util.Comparator<T>?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: ((T, T) -> kotlin.Int)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.util.Comparator<T>?): kotlin.Unit
}
public trait Super2Substituted : test.InheritedSameAdaptersWithSubstitution.Super2<jet.String> {
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: ((jet.String, jet.String) -> jet.Int)?): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<jet.String>?): jet.Unit
public trait Super2Substituted : test.InheritedSameAdaptersWithSubstitution.Super2<kotlin.String> {
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: ((kotlin.String, kotlin.String) -> kotlin.Int)?): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.util.Comparator<kotlin.String>?): kotlin.Unit
}
}
package test.InheritedSameAdaptersWithSubstitution {
public /*synthesized*/ fun Sub(/*0*/ function: (java.util.Comparator<jet.String>?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Sub
public /*synthesized*/ fun Super1(/*0*/ function: (java.util.Comparator<jet.String>?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Super1
public /*synthesized*/ fun </*0*/ T> Super2(/*0*/ function: (java.util.Comparator<T>?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Super2<T>
public /*synthesized*/ fun Super2Substituted(/*0*/ function: (java.util.Comparator<jet.String>?) -> jet.Unit): test.InheritedSameAdaptersWithSubstitution.Super2Substituted
public /*synthesized*/ fun Sub(/*0*/ function: (java.util.Comparator<kotlin.String>?) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Sub
public /*synthesized*/ fun Super1(/*0*/ function: (java.util.Comparator<kotlin.String>?) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super1
public /*synthesized*/ fun </*0*/ T> Super2(/*0*/ function: (java.util.Comparator<T>?) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super2<T>
public /*synthesized*/ fun Super2Substituted(/*0*/ function: (java.util.Comparator<kotlin.String>?) -> kotlin.Unit): test.InheritedSameAdaptersWithSubstitution.Super2Substituted
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
+6 -6
View File
@@ -3,17 +3,17 @@ package test
public trait InheritedSimple : java.lang.Object {
public trait Sub : test.InheritedSimple.Super {
public final override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
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 trait Super : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
}
package test.InheritedSimple {
public /*synthesized*/ fun Sub(/*0*/ function: (java.lang.Runnable?) -> jet.Unit): test.InheritedSimple.Sub
public /*synthesized*/ fun Super(/*0*/ function: (java.lang.Runnable?) -> jet.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/sam/adapters/inheritance/OverriddenAmbiguousAdapters.java
+1 -1
View File
@@ -9,6 +9,6 @@ public interface OverriddenAmbiguousAdapters {
}
public interface Sub extends Super {
void foo(jet.Function0<jet.Unit> r);
void foo(kotlin.Function0<kotlin.Unit> r);
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt
+7 -7
View File
@@ -3,15 +3,15 @@ package test
public trait OverriddenAmbiguousAdapters : java.lang.Object {
public trait Sub : test.OverriddenAmbiguousAdapters.Super {
public abstract override /*2*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public abstract override /*2*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
public trait Super : java.lang.Object {
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public abstract fun foo(/*0*/ p0: java.io.Closeable?): jet.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public final /*synthesized*/ fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.io.Closeable?): kotlin.Unit
public abstract fun foo(/*0*/ p0: java.lang.Runnable?): kotlin.Unit
}
}