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

Adjusted tests to the new DescriptorRenderer behaviour

Browse Source
This commit is contained in:
Michał Sapalski
2013-04-15 07:43:51 +02:00
committed by Andrey Breslav
parent 2352d86932
commit 7deec28b9c
406 changed files with 2360 additions and 2361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/compiledJava/JavaEnum.txt
+6 -6
View File
@@ -2,14 +2,14 @@ package test
public final enum class JavaEnum : jet.Enum<test.JavaEnum> {
private constructor JavaEnum()
public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
public class object <class-object-for-JavaEnum> {
private constructor <class-object-for-JavaEnum>()
public final val ANOTHER : test.JavaEnum
public final val ENTRY : test.JavaEnum
public final fun valueOf(/*0*/ value : jet.String) : test.JavaEnum
public final fun values() : jet.Array<test.JavaEnum>
public final val ANOTHER: test.JavaEnum
public final val ENTRY: test.JavaEnum
public final fun valueOf(/*0*/ value: jet.String): test.JavaEnum
public final fun values(): jet.Array<test.JavaEnum>
}
}
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 : jet.String?
protected/*protected and package*/ final var accessibleContext: jet.String?
}
compiler/testData/loadJava/compiledJava/annotations/AnnotationWithAnnotationInParam.txt
+13 -13
View File
@@ -15,33 +15,33 @@ public trait AnnotationWithAnnotationInParam : java.lang.Object {
}
public final annotation class MyAnnotation : jet.Annotation {
public constructor MyAnnotation(/*0*/ value : jet.String?)
public abstract fun value() : jet.String?
public constructor MyAnnotation(/*0*/ value: jet.String?)
public abstract fun value(): jet.String?
}
public final annotation class MyAnnotation2 : jet.Annotation {
public constructor MyAnnotation2(/*0*/ vararg value : jet.String? /*jet.Array<jet.String>?*/)
public abstract fun value() : jet.Array<jet.String>?
public constructor MyAnnotation2(/*0*/ vararg value: jet.String? /*jet.Array<jet.String>?*/)
public abstract fun value(): jet.Array<jet.String>?
}
public final annotation class MyAnnotation3 : jet.Annotation {
public constructor MyAnnotation3(/*0*/ first : jet.String?, /*1*/ second : jet.String?)
public abstract fun first() : jet.String?
public abstract fun second() : jet.String?
public constructor MyAnnotation3(/*0*/ first: jet.String?, /*1*/ second: jet.String?)
public abstract fun first(): jet.String?
public abstract fun second(): jet.String?
}
public final annotation class MyAnnotationWithParam : jet.Annotation {
public constructor MyAnnotationWithParam(/*0*/ value : test.AnnotationWithAnnotationInParam.MyAnnotation?)
public abstract fun value() : test.AnnotationWithAnnotationInParam.MyAnnotation?
public constructor MyAnnotationWithParam(/*0*/ value: test.AnnotationWithAnnotationInParam.MyAnnotation?)
public abstract fun value(): test.AnnotationWithAnnotationInParam.MyAnnotation?
}
public final annotation class MyAnnotationWithParam2 : jet.Annotation {
public constructor MyAnnotationWithParam2(/*0*/ value : test.AnnotationWithAnnotationInParam.MyAnnotation2?)
public abstract fun value() : test.AnnotationWithAnnotationInParam.MyAnnotation2?
public constructor MyAnnotationWithParam2(/*0*/ value: test.AnnotationWithAnnotationInParam.MyAnnotation2?)
public abstract fun value(): test.AnnotationWithAnnotationInParam.MyAnnotation2?
}
public final annotation class MyAnnotationWithParam3 : jet.Annotation {
public constructor MyAnnotationWithParam3(/*0*/ value : test.AnnotationWithAnnotationInParam.MyAnnotation3?)
public abstract fun value() : test.AnnotationWithAnnotationInParam.MyAnnotation3?
public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationWithAnnotationInParam.MyAnnotation3?)
public abstract fun value(): test.AnnotationWithAnnotationInParam.MyAnnotation3?
}
}
compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfEnumInParam.txt
+2 -2
View File
@@ -3,7 +3,7 @@ package test
public trait AnnotationWithArrayOfEnumInParam : java.lang.Object {
java.lang.annotation.Target(value = [ElementType.FIELD, ElementType.CONSTRUCTOR]: jet.Array<java.lang.annotation.ElementType>?) public final annotation class targetAnnotation : jet.Annotation {
public constructor targetAnnotation(/*0*/ value : jet.String?)
public abstract fun value() : jet.String?
public constructor targetAnnotation(/*0*/ value: jet.String?)
public abstract fun value(): jet.String?
}
}
compiler/testData/loadJava/compiledJava/annotations/AnnotationWithArrayOfStringInParam.txt
+2 -2
View File
@@ -7,7 +7,7 @@ public trait AnnotationWithArrayOfStringInParam : java.lang.Object {
}
public final annotation class MyAnnotation : jet.Annotation {
public constructor MyAnnotation(/*0*/ vararg value : jet.String? /*jet.Array<jet.String>?*/)
public abstract fun value() : jet.Array<jet.String>?
public constructor MyAnnotation(/*0*/ vararg value: jet.String? /*jet.Array<jet.String>?*/)
public abstract fun value(): jet.Array<jet.String>?
}
}
compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEmptyArrayInParam.txt
+2 -2
View File
@@ -7,7 +7,7 @@ public trait AnnotationWithEmptyArrayInParam : java.lang.Object {
}
public final annotation class MyAnnotation : jet.Annotation {
public constructor MyAnnotation(/*0*/ vararg value : jet.String? /*jet.Array<jet.String>?*/)
public abstract fun value() : jet.Array<jet.String>?
public constructor MyAnnotation(/*0*/ vararg value: jet.String? /*jet.Array<jet.String>?*/)
public abstract fun value(): jet.Array<jet.String>?
}
}
compiler/testData/loadJava/compiledJava/annotations/AnnotationWithEnumInParam.txt
+2 -2
View File
@@ -3,7 +3,7 @@ package test
public trait AnnotationWithEnumInParam : java.lang.Object {
java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) public final annotation class RetentionAnnotation : jet.Annotation {
public constructor RetentionAnnotation(/*0*/ value : jet.String?)
public abstract fun value() : jet.String?
public constructor RetentionAnnotation(/*0*/ value: jet.String?)
public abstract fun value(): jet.String?
}
}
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+7 -7
View File
@@ -3,20 +3,20 @@ package test
public trait CustomAnnotation : java.lang.Object {
public final annotation class MyAnnotation : jet.Annotation {
public constructor MyAnnotation(/*0*/ value : test.CustomAnnotation.MyEnum?)
public abstract fun value() : test.CustomAnnotation.MyEnum?
public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum?)
public abstract fun value(): test.CustomAnnotation.MyEnum?
}
public final enum class MyEnum : jet.Enum<test.CustomAnnotation.MyEnum> {
private constructor MyEnum()
public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
public class object <class-object-for-MyEnum> {
private constructor <class-object-for-MyEnum>()
public final val ONE : test.CustomAnnotation.MyEnum
public final fun valueOf(/*0*/ value : jet.String) : test.CustomAnnotation.MyEnum
public final fun values() : jet.Array<test.CustomAnnotation.MyEnum>
public final val ONE: test.CustomAnnotation.MyEnum
public final fun valueOf(/*0*/ value: jet.String): test.CustomAnnotation.MyEnum
public final fun values(): jet.Array<test.CustomAnnotation.MyEnum>
}
}
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
+3 -3
View File
@@ -3,9 +3,9 @@ package test
public trait CustomAnnotationWithDefaultParameter : java.lang.Object {
public final annotation class MyAnnotation : jet.Annotation {
public constructor MyAnnotation(/*0*/ first : jet.String?, /*1*/ second : jet.String? = ...)
public abstract fun first() : jet.String?
public abstract fun second() : jet.String?
public constructor MyAnnotation(/*0*/ first: jet.String?, /*1*/ second: jet.String? = ...)
public abstract fun first(): jet.String?
public abstract fun second(): jet.String?
}
test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": jet.String, second = "s": jet.String) public open class MyTest : java.lang.Object {
compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
+4 -4
View File
@@ -3,12 +3,12 @@ package test
public trait RecursiveAnnotation : java.lang.Object {
test.RecursiveAnnotation.B(value = A[value = "test"]: test.RecursiveAnnotation.A) public final annotation class A : jet.Annotation {
public constructor A(/*0*/ value : jet.String?)
public abstract fun value() : jet.String?
public constructor A(/*0*/ value: jet.String?)
public abstract fun value(): jet.String?
}
test.RecursiveAnnotation.B(value = A[value = "test"]: test.RecursiveAnnotation.A) public final annotation class B : jet.Annotation {
public constructor B(/*0*/ value : test.RecursiveAnnotation.A?)
public abstract fun value() : test.RecursiveAnnotation.A?
public constructor B(/*0*/ value: test.RecursiveAnnotation.A?)
public abstract fun value(): test.RecursiveAnnotation.A?
}
}
compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
+4 -4
View File
@@ -3,12 +3,12 @@ package test
public trait RecursiveAnnotation2 : java.lang.Object {
public final annotation class A : jet.Annotation {
public constructor A(/*0*/ value : test.RecursiveAnnotation2.B?)
public abstract fun value() : test.RecursiveAnnotation2.B?
public constructor A(/*0*/ value: test.RecursiveAnnotation2.B?)
public abstract fun value(): test.RecursiveAnnotation2.B?
}
test.RecursiveAnnotation2.A(value = B[value = "test"]: test.RecursiveAnnotation2.B) public final annotation class B : jet.Annotation {
public constructor B(/*0*/ value : jet.String?)
public abstract fun value() : jet.String?
public constructor B(/*0*/ value: jet.String?)
public abstract fun value(): jet.String?
}
}
compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class ProtectedPackageFun : java.lang.Object {
public constructor ProtectedPackageFun()
protected/*protected and package*/ open fun foo() : jet.Unit
protected/*protected and package*/ open fun foo(): jet.Unit
}
compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.txt
+1 -1
View File
@@ -2,5 +2,5 @@ package test
public open class ProtectedPackageProperty : java.lang.Object {
public constructor ProtectedPackageProperty()
protected/*protected and package*/ final var foo : jet.Int
protected/*protected and package*/ final var foo: jet.Int
}
compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.txt
+6 -6
View File
@@ -3,14 +3,14 @@ package test
public trait ArraysInSubtypes : java.lang.Object {
public trait Sub</*0*/ T> : test.ArraysInSubtypes.Super {
public abstract override /*1*/ fun array() : jet.Array<jet.String>?
public abstract override /*1*/ fun listOfArray() : jet.MutableList<out jet.Array<jet.String>?>?
public abstract override /*1*/ fun objArray() : jet.Array<T>?
public abstract override /*1*/ fun array(): jet.Array<jet.String>?
public abstract override /*1*/ fun listOfArray(): jet.MutableList<out jet.Array<jet.String>?>?
public abstract override /*1*/ fun objArray(): jet.Array<T>?
}
public trait Super : java.lang.Object {
public abstract fun array() : jet.Array<jet.CharSequence>?
public abstract fun listOfArray() : jet.MutableList<out jet.Array<jet.CharSequence>?>?
public abstract fun objArray() : jet.Array<jet.Any>?
public abstract fun array(): jet.Array<jet.CharSequence>?
public abstract fun listOfArray(): jet.MutableList<out jet.Array<jet.CharSequence>?>?
public abstract fun objArray(): jet.Array<jet.Any>?
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.txt
+2 -2
View File
@@ -3,11 +3,11 @@ package test
public trait MethodTypeParameterErased : java.lang.Object {
public trait Bug</*0*/ T> : java.lang.Object {
public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T>?> save() : RET?
public abstract fun </*0*/ RET : test.MethodTypeParameterErased.Bug<T>?> save(): RET?
}
public open class SubBug : test.MethodTypeParameterErased.Bug<jet.Any> {
public constructor SubBug()
public open fun save() : test.MethodTypeParameterErased.SubBug?
public open fun save(): test.MethodTypeParameterErased.SubBug?
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.txt
+3 -3
View File
@@ -5,14 +5,14 @@ public open class RawSuperType : java.lang.Object {
public open inner class Derived : test.RawSuperType.Super<jet.Any?> {
public constructor Derived()
public open override /*1*/ fun foo(/*0*/ p0 : jet.Any?) : jet.Unit
public open override /*1*/ fun foo(/*0*/ p0: jet.Any?): jet.Unit
}
public trait Super</*0*/ T> : java.lang.Object {
public abstract fun foo(/*0*/ p0 : T?) : jet.Unit
public abstract fun foo(/*0*/ p0: T?): jet.Unit
}
}
package RawSuperType {
public /*synthesized*/ fun </*0*/ T> Super(/*0*/ function : (T?) -> jet.Unit) : test.RawSuperType.Super<T>
public /*synthesized*/ fun </*0*/ T> Super(/*0*/ function: (T?) -> jet.Unit): test.RawSuperType.Super<T>
}
compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.txt
+2 -2
View File
@@ -7,7 +7,7 @@ public trait ReturnInnerSubclassOfSupersInner : java.lang.Object {
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 : java.lang.Object {
public/*package*/ open inner class Inner : java.lang.Object {
public/*package*/ constructor Inner()
public/*package*/ open fun get() : test.ReturnInnerSubclassOfSupersInner.Super<A>?
public/*package*/ open fun get(): test.ReturnInnerSubclassOfSupersInner.Super<A>?
}
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.txt
+16 -16
View File
@@ -3,24 +3,24 @@ package test
public trait SubclassWithRawType : java.lang.Object {
public trait Sub : test.SubclassWithRawType.Super {
public abstract override /*1*/ fun array1() : jet.Array<jet.List<jet.String?>>?
public abstract override /*1*/ fun array2() : jet.Array<jet.List<jet.Any>>?
public abstract override /*1*/ fun boundWildcard1() : jet.MutableList<out jet.List<jet.String?>?>?
public abstract override /*1*/ fun boundWildcard2() : jet.MutableList<in jet.List<jet.Any>?>?
public abstract override /*1*/ fun simple1() : jet.MutableList<out jet.String?>?
public abstract override /*1*/ fun simple2() : jet.MutableList<out jet.List<jet.String>?>?
public abstract override /*1*/ fun simple3() : jet.MutableList<out jet.Any>?
public abstract override /*1*/ fun wildcard() : jet.MutableList<out jet.Any?>?
public abstract override /*1*/ fun array1(): jet.Array<jet.List<jet.String?>>?
public abstract override /*1*/ fun array2(): jet.Array<jet.List<jet.Any>>?
public abstract override /*1*/ fun boundWildcard1(): jet.MutableList<out jet.List<jet.String?>?>?
public abstract override /*1*/ fun boundWildcard2(): jet.MutableList<in jet.List<jet.Any>?>?
public abstract override /*1*/ fun simple1(): jet.MutableList<out jet.String?>?
public abstract override /*1*/ fun simple2(): jet.MutableList<out jet.List<jet.String>?>?
public abstract override /*1*/ fun simple3(): jet.MutableList<out jet.Any>?
public abstract override /*1*/ fun wildcard(): jet.MutableList<out jet.Any?>?
}
public trait Super : java.lang.Object {
public abstract fun array1() : jet.Array<jet.List<jet.Any?>>?
public abstract fun array2() : jet.Array<jet.List<jet.String>>?
public abstract fun boundWildcard1() : jet.MutableList<out jet.List<jet.Any?>?>?
public abstract fun boundWildcard2() : jet.MutableList<in jet.List<jet.String>?>?
public abstract fun simple1() : jet.MutableList<out jet.Any?>?
public abstract fun simple2() : jet.MutableList<out jet.Any?>?
public abstract fun simple3() : jet.MutableList<jet.String>?
public abstract fun wildcard() : jet.MutableList<out jet.Any?>?
public abstract fun array1(): jet.Array<jet.List<jet.Any?>>?
public abstract fun array2(): jet.Array<jet.List<jet.String>>?
public abstract fun boundWildcard1(): jet.MutableList<out jet.List<jet.Any?>?>?
public abstract fun boundWildcard2(): jet.MutableList<in jet.List<jet.String>?>?
public abstract fun simple1(): jet.MutableList<out jet.Any?>?
public abstract fun simple2(): jet.MutableList<out jet.Any?>?
public abstract fun simple3(): jet.MutableList<jet.String>?
public abstract fun wildcard(): jet.MutableList<out jet.Any?>?
}
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.txt
+5 -5
View File
@@ -1,20 +1,20 @@
package test
public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function : () -> jet.MutableList<jet.String?>) : test.TwoSuperclassesInconsistentGenericTypes
public /*synthesized*/ fun TwoSuperclassesInconsistentGenericTypes(/*0*/ function: () -> jet.MutableList<jet.String?>): test.TwoSuperclassesInconsistentGenericTypes
public trait TwoSuperclassesInconsistentGenericTypes : java.lang.Object {
public abstract fun foo() : jet.MutableList<jet.String?>
public abstract fun foo(): jet.MutableList<jet.String?>
public trait Other : java.lang.Object {
public abstract fun foo() : jet.MutableList<jet.String>?
public abstract fun foo(): jet.MutableList<jet.String>?
}
public open class Sub : test.TwoSuperclassesInconsistentGenericTypes, test.TwoSuperclassesInconsistentGenericTypes.Other {
public constructor Sub()
public open override /*2*/ fun foo() : jet.MutableList<jet.String>
public open override /*2*/ fun foo(): jet.MutableList<jet.String>
}
}
package TwoSuperclassesInconsistentGenericTypes {
public /*synthesized*/ fun Other(/*0*/ function : () -> jet.MutableList<jet.String>?) : test.TwoSuperclassesInconsistentGenericTypes.Other
public /*synthesized*/ fun Other(/*0*/ function: () -> jet.MutableList<jet.String>?): test.TwoSuperclassesInconsistentGenericTypes.Other
}
compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.txt
+6 -6
View File
@@ -3,20 +3,20 @@ package test
public trait TwoSuperclassesVarargAndNot : java.lang.Object {
public trait Sub : test.TwoSuperclassesVarargAndNot.Super1, test.TwoSuperclassesVarargAndNot.Super2 {
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : jet.Unit
public abstract override /*1*/ fun foo(/*0*/ p0 : jet.Array<out jet.String?>?) : jet.Unit
public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Unit
public abstract override /*1*/ fun foo(/*0*/ p0: jet.Array<out jet.String?>?): jet.Unit
}
public trait Super1 : java.lang.Object {
public abstract fun foo(/*0*/ vararg p0 : jet.String? /*jet.Array<jet.String?>*/) : jet.Unit
public abstract fun foo(/*0*/ vararg p0: jet.String? /*jet.Array<jet.String?>*/): jet.Unit
}
public trait Super2 : java.lang.Object {
public abstract fun foo(/*0*/ p0 : jet.Array<out jet.String?>?) : jet.Unit
public abstract fun foo(/*0*/ p0: jet.Array<out jet.String?>?): jet.Unit
}
}
package TwoSuperclassesVarargAndNot {
public /*synthesized*/ fun Super1(/*0*/ function : (jet.Array<jet.String?>) -> jet.Unit) : test.TwoSuperclassesVarargAndNot.Super1
public /*synthesized*/ fun Super2(/*0*/ function : (jet.Array<out jet.String?>?) -> jet.Unit) : test.TwoSuperclassesVarargAndNot.Super2
public /*synthesized*/ fun Super1(/*0*/ function: (jet.Array<jet.String?>) -> jet.Unit): test.TwoSuperclassesVarargAndNot.Super1
public /*synthesized*/ fun Super2(/*0*/ function: (jet.Array<out jet.String?>?) -> jet.Unit): test.TwoSuperclassesVarargAndNot.Super2
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/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?) -> jet.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?): jet.Int
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/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?, jet.String?) -> jet.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: jet.String?): jet.Boolean
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParameterWithSelfBound.txt
+2 -2
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>?> : java.lang.Object {
public abstract fun method(/*0*/ p0 : T?) : T?
public abstract fun method(/*0*/ p0: T?): T?
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParametersWithBounds.txt
+3 -3
View File
@@ -1,7 +1,7 @@
package test
public /*synthesized*/ fun </*0*/ A, /*1*/ B : jet.List<A>?> GenericInterfaceParametersWithBounds(/*0*/ function : (jet.Array<out A>?, B?) -> jet.Unit) : test.GenericInterfaceParametersWithBounds<A, B> where A : jet.Comparable<A>?, A : java.lang.Cloneable?
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 trait GenericInterfaceParametersWithBounds</*0*/ A, /*1*/ B : jet.List<A>?> : java.lang.Object where A : jet.Comparable<A>?, A : java.lang.Cloneable? {
public abstract fun method(/*0*/ p0 : jet.Array<out A>?, /*1*/ p1 : B?) : jet.Unit
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
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/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 : jet.CharSequence?, /*1*/ B : jet.List<A>?> method(/*0*/ p0: jet.Array<out A>?, /*1*/ p1: B?): jet.Unit
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/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(): jet.Unit
public abstract fun run2(): jet.Unit
}
}
public trait Deeper2 : java.lang.Object {
public trait Runnable : java.lang.Object {
public abstract fun run() : jet.Unit
public abstract fun run(): jet.Unit
}
}
public trait Runnable : java.lang.Object {
public abstract fun run() : jet.Unit
public abstract fun run(): jet.Unit
}
}
package Nested {
public /*synthesized*/ fun Runnable(/*0*/ function : () -> jet.Unit) : test.Nested.Runnable
public /*synthesized*/ fun Runnable(/*0*/ function: () -> jet.Unit): test.Nested.Runnable
package Deeper2 {
public /*synthesized*/ fun Runnable(/*0*/ function : () -> jet.Unit) : test.Nested.Deeper2.Runnable
public /*synthesized*/ fun Runnable(/*0*/ function: () -> jet.Unit): test.Nested.Deeper2.Runnable
}
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/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: () -> jet.Unit): test.Runnable
public trait Runnable : java.lang.Object {
public abstract fun run() : jet.Unit
public abstract fun run(): jet.Unit
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Basic.txt
+4 -4
View File
@@ -2,11 +2,11 @@ package test
public open class Basic : java.lang.Object {
public constructor Basic()
public open /*synthesized*/ fun foo(/*0*/ p0 : (() -> jet.Unit)?) : jet.Unit
public open fun foo(/*0*/ p0 : java.lang.Runnable?) : jet.Unit
public open /*synthesized*/ fun foo(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public open fun foo(/*0*/ p0: java.lang.Runnable?): jet.Unit
}
package Basic {
public open /*synthesized*/ fun bar(/*0*/ p0 : (() -> jet.Unit)?) : jet.Unit
public open fun bar(/*0*/ p0 : java.lang.Runnable?) : jet.Unit
public open /*synthesized*/ fun bar(/*0*/ p0: (() -> jet.Unit)?): jet.Unit
public open fun bar(/*0*/ p0: java.lang.Runnable?): jet.Unit
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/NonTrivialFunctionType.txt
+7 -7
View File
@@ -2,11 +2,11 @@ package test
public open class NonTrivialFunctionType : java.lang.Object {
public constructor NonTrivialFunctionType()
public open /*synthesized*/ fun foo(/*0*/ p0 : ((java.io.File?, jet.String?) -> jet.Boolean)?) : jet.Unit
public open /*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 open /*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 open /*synthesized*/ fun foo(/*0*/ p0: ((java.io.File?, jet.String?) -> jet.Boolean)?): jet.Unit
public open /*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 open /*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
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SeveralSamParameters.txt
+2 -2
View File
@@ -5,6 +5,6 @@ public open class SeveralSamParameters : java.lang.Object {
}
package SeveralSamParameters {
public open /*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 open /*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?
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/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 open /*synthesized*/ fun foo(/*0*/ p0 : ((T?, T?) -> jet.Int)?) : jet.Unit
public open fun foo(/*0*/ p0 : java.util.Comparator<T>?) : jet.Unit
public open /*synthesized*/ fun foo(/*0*/ p0: ((T?, T?) -> jet.Int)?): jet.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<T>?): jet.Unit
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfMethod.txt
+6 -6
View File
@@ -5,10 +5,10 @@ public open class TypeParameterOfMethod : java.lang.Object {
}
package TypeParameterOfMethod {
public open /*synthesized*/ fun </*0*/ T> max(/*0*/ p0 : ((T?, T?) -> jet.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 open /*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 open /*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 open /*synthesized*/ fun </*0*/ T> max(/*0*/ p0: ((T?, T?) -> jet.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 open /*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 open /*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
}
compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/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 open /*synthesized*/ fun foo(/*0*/ p0 : ((T?, T?) -> jet.Int)?) : jet.Unit
public open fun foo(/*0*/ p0 : java.util.Comparator<T>?) : jet.Unit
public open /*synthesized*/ fun foo(/*0*/ p0: ((T?, T?) -> jet.Int)?): jet.Unit
public open fun foo(/*0*/ p0: java.util.Comparator<T>?): jet.Unit
}
}
compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.txt
+3 -3
View File
@@ -5,15 +5,15 @@ public open class DeeplyInnerClass : java.lang.Object {
public/*package*/ open inner class A : java.lang.Object {
public/*package*/ constructor A()
public/*package*/ open fun a() : jet.Unit
public/*package*/ open fun a(): jet.Unit
public/*package*/ open inner class B : java.lang.Object {
public/*package*/ constructor B()
public/*package*/ open fun b() : jet.Unit
public/*package*/ open fun b(): jet.Unit
public/*package*/ open inner class C : java.lang.Object {
public/*package*/ constructor C()
public/*package*/ open fun c() : jet.Unit
public/*package*/ open fun c(): jet.Unit
}
}
}
compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.txt
+1 -1
View File
@@ -17,7 +17,7 @@ package DeeplyNestedStatic {
package Foo {
package Bar {
public open fun method() : jet.Unit
public open fun method(): jet.Unit
}
}
}
compiler/testData/loadJava/compiledJava/static/Enum.txt
+11 -11
View File
@@ -2,27 +2,27 @@ package test
public final enum class Enum : jet.Enum<test.Enum> {
private constructor Enum()
public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
public class object <class-object-for-Enum> {
private constructor <class-object-for-Enum>()
public final val A : test.Enum
public final val B : test.Enum
public final val C : test.Enum
public final fun valueOf(/*0*/ value : jet.String) : test.Enum
public final fun values() : jet.Array<test.Enum>
public final val A: test.Enum
public final val B: test.Enum
public final val C: test.Enum
public final fun valueOf(/*0*/ value: jet.String): test.Enum
public final fun values(): jet.Array<test.Enum>
}
public open inner class Inner : java.lang.Object {
public constructor Inner()
public/*package*/ open fun bar() : jet.Unit
public/*package*/ open fun valueOf(/*0*/ p0 : jet.String?) : jet.Unit
public/*package*/ open fun bar(): jet.Unit
public/*package*/ open fun valueOf(/*0*/ p0: jet.String?): jet.Unit
}
public open class Nested : java.lang.Object {
public constructor Nested()
public/*package*/ open fun foo() : jet.Unit
public/*package*/ open fun values() : jet.Unit
public/*package*/ open fun foo(): jet.Unit
public/*package*/ open fun values(): jet.Unit
}
}
compiler/testData/loadJava/compiledJava/static/InnerClass.txt
+2 -2
View File
@@ -5,11 +5,11 @@ public open class InnerClass : java.lang.Object {
public open inner class Inner : java.lang.Object {
public constructor Inner()
public open fun foo() : jet.Unit
public open fun foo(): jet.Unit
}
public open class Nested : java.lang.Object {
public constructor Nested()
public open fun bar() : jet.Unit
public open fun bar(): jet.Unit
}
}
compiler/testData/loadJava/compiledJava/static/Simple.txt
+2 -2
View File
@@ -2,9 +2,9 @@ package test
public open class Simple : java.lang.Object {
public constructor Simple()
public open fun foo() : jet.Unit
public open fun foo(): jet.Unit
}
package Simple {
public open fun bar() : jet.Unit
public open fun bar(): jet.Unit
}
compiler/testData/loadJava/compiledJava/static/StaticFinal.txt
+1 -1
View File
@@ -5,5 +5,5 @@ public open class StaticFinal : java.lang.Object {
}
package StaticFinal {
public val foo : jet.String
public val foo: jet.String
}
compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.txt
+10 -10
View File
@@ -2,21 +2,21 @@ package test
public final enum class StaticMembersInEnum : jet.Enum<test.StaticMembersInEnum> {
private constructor StaticMembersInEnum()
public final override /*1*/ /*fake_override*/ fun name() : jet.String
public final override /*1*/ /*fake_override*/ fun ordinal() : jet.Int
public final override /*1*/ /*fake_override*/ fun name(): jet.String
public final override /*1*/ /*fake_override*/ fun ordinal(): jet.Int
public class object <class-object-for-StaticMembersInEnum> {
private constructor <class-object-for-StaticMembersInEnum>()
public final val ENTRY : test.StaticMembersInEnum
public final fun valueOf(/*0*/ value : jet.String) : test.StaticMembersInEnum
public final fun values() : jet.Array<test.StaticMembersInEnum>
public final val ENTRY: test.StaticMembersInEnum
public final fun valueOf(/*0*/ value: jet.String): test.StaticMembersInEnum
public final fun values(): jet.Array<test.StaticMembersInEnum>
}
}
package StaticMembersInEnum {
public val CONSTANT : test.StaticMembersInEnum
public var STATIC_FIELD : jet.Int
public open fun foo() : jet.Unit
public open fun valueOf(/*0*/ p0 : jet.Int) : jet.Unit
public open fun values(/*0*/ p0 : jet.Int) : jet.Unit
public val CONSTANT: test.StaticMembersInEnum
public var STATIC_FIELD: jet.Int
public open fun foo(): jet.Unit
public open fun valueOf(/*0*/ p0: jet.Int): jet.Unit
public open fun values(/*0*/ p0: jet.Int): jet.Unit
}