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

Remove Object from supertypes in LoadJava testData

Browse Source
This commit is contained in:
Alexander Udalov
2014-07-21 17:30:31 +04:00
parent a79398fa00
commit 5dc37217c8
402 changed files with 961 additions and 961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/sam/Comparator.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun </*0*/ T> Comparator(/*0*/ function: (T?, T?) -> kotlin.Int): test.Comparator<T>
public trait Comparator</*0*/ T> : java.lang.Object {
public trait Comparator</*0*/ T> {
public abstract fun compare(/*0*/ p0: T?, /*1*/ p1: T?): kotlin.Int
}
compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun FilenameFilter(/*0*/ function: (java.io.File?, kotlin.String?) -> kotlin.Boolean): test.FilenameFilter
public trait FilenameFilter : java.lang.Object {
public trait FilenameFilter {
public abstract fun accept(/*0*/ p0: java.io.File?, /*1*/ p1: kotlin.String?): kotlin.Boolean
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun </*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> GenericInterfaceParameterWithSelfBound(/*0*/ function: (T?) -> T?): test.GenericInterfaceParameterWithSelfBound<T>
public trait GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> : java.lang.Object {
public trait GenericInterfaceParameterWithSelfBound</*0*/ T : test.GenericInterfaceParameterWithSelfBound<T>?> {
public abstract fun method(/*0*/ p0: T?): T?
}
compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt
+1 -1
View File
@@ -2,6 +2,6 @@ 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 : java.lang.Cloneable?
public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> : java.lang.Object where A : java.lang.Cloneable? {
public trait GenericInterfaceParametersWithBounds</*0*/ A : kotlin.Comparable<A>?, /*1*/ B : kotlin.List<A>?> 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 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
}
compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt
+1 -1
View File
@@ -1,4 +1,4 @@
package test
public trait InterfaceWithObjectMethod : java.lang.Object {
public trait InterfaceWithObjectMethod {
}
compiler/testData/loadJava/compiledJava/sam/Nested.txt
+12 -12
View File
@@ -1,30 +1,30 @@
package test
public trait Nested : java.lang.Object {
public trait Deeper1 : java.lang.Object {
public trait Runnable : java.lang.Object {
public trait Nested {
public trait Deeper1 {
public trait Runnable {
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 trait Deeper2 {
public trait Runnable {
public abstract fun run(): kotlin.Unit
}
}
public trait Runnable : java.lang.Object {
public trait Runnable {
public abstract fun run(): kotlin.Unit
}
}
package test.Nested {
public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Runnable
package test.Nested.Deeper2 {
public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Nested.Deeper2.Runnable
}
compiler/testData/loadJava/compiledJava/sam/Runnable.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun Runnable(/*0*/ function: () -> kotlin.Unit): test.Runnable
public trait Runnable : java.lang.Object {
public trait Runnable {
public abstract fun run(): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt
+6 -6
View File
@@ -1,16 +1,16 @@
package test
public trait SamSubinterfaceOfTwo : java.lang.Object {
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 Super1 : java.lang.Object {
public trait Super1 {
public abstract fun f(): kotlin.CharSequence?
}
public trait Super2</*0*/ T> : java.lang.Object {
public trait Super2</*0*/ T> {
public abstract fun f(): T?
}
}
compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt
+1 -1
View File
@@ -2,6 +2,6 @@ package test
public /*synthesized*/ fun VarargParameter(/*0*/ function: (kotlin.Array<kotlin.String?>) -> kotlin.Unit): test.VarargParameter
public trait VarargParameter : java.lang.Object {
public trait VarargParameter {
public abstract fun f(/*0*/ vararg p0: kotlin.String? /*kotlin.Array<kotlin.String?>*/): kotlin.Unit
}
compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public open class AmbiguousAdapters : java.lang.Object {
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
compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public open class Basic : java.lang.Object {
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
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 open class Constructor {
public /*synthesized*/ constructor Constructor(/*0*/ p0: (() -> kotlin.Unit)?)
public constructor Constructor(/*0*/ p0: java.lang.Runnable?)
}
compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt
+5 -5
View File
@@ -1,13 +1,13 @@
package test
public trait DeepSamLoop : java.lang.Object {
public trait Bar : java.lang.Object {
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 trait Foo : java.lang.Object {
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
}
compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public open class NonTrivialFunctionType : java.lang.Object {
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
compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
public /*synthesized*/ fun SelfAsParameter(/*0*/ function: (test.SelfAsParameter?) -> kotlin.Unit): test.SelfAsParameter
public trait SelfAsParameter : java.lang.Object {
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
}
compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public open class SeveralSamParameters : java.lang.Object {
public open class SeveralSamParameters {
public constructor SeveralSamParameters()
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public open class TypeParameterOfClass</*0*/ T> : java.lang.Object {
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
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt
+1 -1
View File
@@ -1,6 +1,6 @@
package test
public open class TypeParameterOfMethod : java.lang.Object {
public open class TypeParameterOfMethod {
public constructor TypeParameterOfMethod()
}
compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt
+3 -3
View File
@@ -1,9 +1,9 @@
package test
public open class TypeParameterOfOuterClass</*0*/ T> : java.lang.Object {
public open class TypeParameterOfOuterClass</*0*/ T> {
public constructor TypeParameterOfOuterClass</*0*/ T>()
public open inner class Inner : java.lang.Object {
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
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public trait AdapterDoesntOverrideDeclaration : java.lang.Object {
public trait AdapterDoesntOverrideDeclaration {
public trait Sub : test.AdapterDoesntOverrideDeclaration.Super {
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 trait Super {
public abstract fun foo(/*0*/ p0: (() -> kotlin.Unit)?): kotlin.Unit
}
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public trait InheritedAdapterAndDeclaration : java.lang.Object {
public trait InheritedAdapterAndDeclaration {
public trait Sub : test.InheritedAdapterAndDeclaration.Super {
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 trait Super {
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
+4 -4
View File
@@ -1,15 +1,15 @@
package test
public trait InheritedAmbiguousAdapters : java.lang.Object {
public trait InheritedAmbiguousAdapters {
public trait Sub : test.InheritedAmbiguousAdapters.Super {
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 trait Super {
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
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.txt
+4 -4
View File
@@ -1,15 +1,15 @@
package test
public trait InheritedAndOverriddenAmbiguousAdapters : java.lang.Object {
public trait InheritedAndOverriddenAmbiguousAdapters {
public trait Sub : test.InheritedAndOverriddenAmbiguousAdapters.Super {
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 trait Super {
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
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public trait InheritedOverridden : java.lang.Object {
public trait InheritedOverridden {
public open class Sub : test.InheritedOverridden.Super {
public constructor Sub()
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 open class Super {
public constructor Super()
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.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public trait InheritedOverriddenAdapter : java.lang.Object {
public trait InheritedOverriddenAdapter {
public open class Sub : test.InheritedOverriddenAdapter.Super {
public constructor Sub()
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 open class Super {
public constructor Super()
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
+6 -6
View File
@@ -1,18 +1,18 @@
package test
public trait InheritedSameAdapters : java.lang.Object {
public trait InheritedSameAdapters {
public trait Sub : test.InheritedSameAdapters.Super1, test.InheritedSameAdapters.Super2 {
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 trait Super1 {
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 trait Super2 {
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/InheritedSameAdaptersWithSubstitution.txt
+7 -7
View File
@@ -1,22 +1,22 @@
package test
public trait InheritedSameAdaptersWithSubstitution : java.lang.Object {
public trait InheritedSameAdaptersWithSubstitution {
public trait Sub : test.InheritedSameAdaptersWithSubstitution.Super1, test.InheritedSameAdaptersWithSubstitution.Super2Substituted {
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 trait Super1 {
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 trait Super2</*0*/ T> {
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<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
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.txt
+4 -4
View File
@@ -1,13 +1,13 @@
package test
public trait InheritedSimple : java.lang.Object {
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 trait Super : java.lang.Object {
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
}
compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public trait OverriddenAmbiguousAdapters : java.lang.Object {
public trait OverriddenAmbiguousAdapters {
public trait Sub : test.OverriddenAmbiguousAdapters.Super {
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 trait Super {
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