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/annotations/AnnotationInParam.txt
+13 -13
View File
@@ -1,45 +1,45 @@
package test
public trait AnnotationInParam : java.lang.Object {
test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": kotlin.String): test.AnnotationInParam.MyAnnotation) public open class A : java.lang.Object {
public trait AnnotationInParam {
test.AnnotationInParam.MyAnnotationWithParam(value = test.AnnotationInParam.MyAnnotation(value = "test": kotlin.String): test.AnnotationInParam.MyAnnotation) public open class A {
public constructor A()
}
test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"}: kotlin.Array<kotlin.String>): test.AnnotationInParam.MyAnnotation2) public open class B : java.lang.Object {
test.AnnotationInParam.MyAnnotationWithParam2(value = test.AnnotationInParam.MyAnnotation2(value = {"test", "test2"}: kotlin.Array<kotlin.String>): test.AnnotationInParam.MyAnnotation2) public open class B {
public constructor B()
}
test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f": kotlin.String, second = "s": kotlin.String): test.AnnotationInParam.MyAnnotation3) public open class C : java.lang.Object {
test.AnnotationInParam.MyAnnotationWithParam3(value = test.AnnotationInParam.MyAnnotation3(first = "f": kotlin.String, second = "s": kotlin.String): test.AnnotationInParam.MyAnnotation3) public open class C {
public constructor C()
}
public final annotation class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ value: kotlin.String)
public abstract fun value(): kotlin.String
}
public final annotation class MyAnnotation2 : kotlin.Annotation {
public constructor MyAnnotation2(/*0*/ vararg value: kotlin.String /*kotlin.Array<kotlin.String>*/)
public abstract fun value(): kotlin.Array<kotlin.String>
}
public final annotation class MyAnnotation3 : kotlin.Annotation {
public constructor MyAnnotation3(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String)
public abstract fun first(): kotlin.String
public abstract fun second(): kotlin.String
}
public final annotation class MyAnnotationWithParam : kotlin.Annotation {
public constructor MyAnnotationWithParam(/*0*/ value: test.AnnotationInParam.MyAnnotation)
public abstract fun value(): test.AnnotationInParam.MyAnnotation
}
public final annotation class MyAnnotationWithParam2 : kotlin.Annotation {
public constructor MyAnnotationWithParam2(/*0*/ value: test.AnnotationInParam.MyAnnotation2)
public abstract fun value(): test.AnnotationInParam.MyAnnotation2
}
public final annotation class MyAnnotationWithParam3 : kotlin.Annotation {
public constructor MyAnnotationWithParam3(/*0*/ value: test.AnnotationInParam.MyAnnotation3)
public abstract fun value(): test.AnnotationInParam.MyAnnotation3
compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public open class ArithmeticExpressionInParam : java.lang.Object {
public open class ArithmeticExpressionInParam {
public constructor ArithmeticExpressionInParam()
public final annotation class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.Int)
public abstract fun value(): kotlin.Int
}
test.ArithmeticExpressionInParam.Anno(value = 42: kotlin.Int) public open class Class : java.lang.Object {
test.ArithmeticExpressionInParam.Anno(value = 42: kotlin.Int) public open class Class {
public constructor Class()
}
}
compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.txt
+2 -2
View File
@@ -1,7 +1,7 @@
package test
public trait ArrayOfEnumInParam : java.lang.Object {
public trait ArrayOfEnumInParam {
java.lang.annotation.Target(value = {ElementType.FIELD, ElementType.CONSTRUCTOR}: kotlin.Array<java.lang.annotation.ElementType>) public final annotation class targetAnnotation : kotlin.Annotation {
public constructor targetAnnotation(/*0*/ value: kotlin.String)
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.txt
+4 -4
View File
@@ -1,11 +1,11 @@
package test
public trait ArrayOfStringInParam : java.lang.Object {
test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: kotlin.Array<kotlin.String>) public open class A : java.lang.Object {
public trait ArrayOfStringInParam {
test.ArrayOfStringInParam.MyAnnotation(value = {"a", "b", "c"}: kotlin.Array<kotlin.String>) public open class A {
public constructor A()
}
public final annotation class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array<kotlin.String>*/)
public abstract fun value(): kotlin.Array<kotlin.String>
compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public open class ClassObjectArrayInParam : java.lang.Object {
public open class ClassObjectArrayInParam {
public constructor ClassObjectArrayInParam()
public final annotation class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ vararg value: java.lang.Class<out kotlin.Any?> /*kotlin.Array<java.lang.Class<out kotlin.Any?>>*/)
public abstract fun value(): kotlin.Array<java.lang.Class<out kotlin.Any?>>
}
test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<java.lang.Class<out kotlin.Any?>>) public open class Nested : java.lang.Object {
test.ClassObjectArrayInParam.Anno(value = {test.ClassObjectArrayInParam.class, test.ClassObjectArrayInParam.Nested.class, kotlin.String.class}: kotlin.Array<java.lang.Class<out kotlin.Any?>>) public open class Nested {
public constructor Nested()
}
}
compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public open class ClassObjectInParam : java.lang.Object {
public open class ClassObjectInParam {
public constructor ClassObjectInParam()
public final annotation class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: java.lang.Class<out kotlin.Any?>)
public abstract fun value(): java.lang.Class<out kotlin.Any?>
}
test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class<test.ClassObjectInParam>) public open class Nested : java.lang.Object {
test.ClassObjectInParam.Anno(value = test.ClassObjectInParam.class: java.lang.Class<test.ClassObjectInParam>) public open class Nested {
public constructor Nested()
}
}
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.txt
+8 -8
View File
@@ -1,28 +1,28 @@
package test
public trait CustomAnnotation : java.lang.Object {
public trait CustomAnnotation {
public final annotation class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ value: test.CustomAnnotation.MyEnum)
public abstract fun value(): 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
public class object <class-object-for-MyEnum> {
private constructor <class-object-for-MyEnum>()
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.CustomAnnotation.MyEnum
public final /*synthesized*/ fun values(): kotlin.Array<test.CustomAnnotation.MyEnum>
}
public enum entry ONE : test.CustomAnnotation.MyEnum {
private constructor ONE()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
public class object <class-object-for-ONE> : test.CustomAnnotation.MyEnum.ONE {
private constructor <class-object-for-ONE>()
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
@@ -30,8 +30,8 @@ public trait CustomAnnotation : java.lang.Object {
}
}
}
test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE: test.CustomAnnotation.MyEnum) public open class MyTest : java.lang.Object {
test.CustomAnnotation.MyAnnotation(value = MyEnum.ONE: test.CustomAnnotation.MyEnum) public open class MyTest {
public constructor MyTest()
}
}
compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.txt
+4 -4
View File
@@ -1,14 +1,14 @@
package test
public trait CustomAnnotationWithDefaultParameter : java.lang.Object {
public trait CustomAnnotationWithDefaultParameter {
public final annotation class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ first: kotlin.String, /*1*/ second: kotlin.String = ...)
public abstract fun first(): kotlin.String
public abstract fun second(): kotlin.String
}
test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": kotlin.String, second = "s": kotlin.String) public open class MyTest : java.lang.Object {
test.CustomAnnotationWithDefaultParameter.MyAnnotation(first = "f": kotlin.String, second = "s": kotlin.String) public open class MyTest {
public constructor MyTest()
}
}
compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.txt
+4 -4
View File
@@ -1,11 +1,11 @@
package test
public trait EmptyArrayInParam : java.lang.Object {
test.EmptyArrayInParam.MyAnnotation(value = {}: kotlin.Array<kotlin.String>) public open class A : java.lang.Object {
public trait EmptyArrayInParam {
test.EmptyArrayInParam.MyAnnotation(value = {}: kotlin.Array<kotlin.String>) public open class A {
public constructor A()
}
public final annotation class MyAnnotation : kotlin.Annotation {
public constructor MyAnnotation(/*0*/ vararg value: kotlin.String /*kotlin.Array<kotlin.String>*/)
public abstract fun value(): kotlin.Array<kotlin.String>
compiler/testData/loadJava/compiledJava/annotations/EnumInParam.txt
+2 -2
View File
@@ -1,7 +1,7 @@
package test
public trait EnumInParam : java.lang.Object {
public trait EnumInParam {
java.lang.annotation.Retention(value = RetentionPolicy.RUNTIME: java.lang.annotation.RetentionPolicy) public final annotation class RetentionAnnotation : kotlin.Annotation {
public constructor RetentionAnnotation(/*0*/ value: kotlin.String)
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.txt
+4 -4
View File
@@ -1,11 +1,11 @@
package test
public trait PrimitiveValueInParam : java.lang.Object {
test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1: kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A : java.lang.Object {
public trait PrimitiveValueInParam {
test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1: kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A {
public constructor A()
}
public final annotation class Ann : kotlin.Annotation {
public constructor Ann(/*0*/ i: kotlin.Int, /*1*/ l: kotlin.Long, /*2*/ d: kotlin.Double, /*3*/ f: kotlin.Float, /*4*/ bool: kotlin.Boolean, /*5*/ str: kotlin.String)
public abstract fun bool(): kotlin.Boolean
compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.txt
+3 -3
View File
@@ -1,12 +1,12 @@
package test
public trait RecursiveAnnotation : java.lang.Object {
public trait RecursiveAnnotation {
test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": kotlin.String): test.RecursiveAnnotation.A) public final annotation class A : kotlin.Annotation {
public constructor A(/*0*/ value: kotlin.String)
public abstract fun value(): kotlin.String
}
test.RecursiveAnnotation.B(value = test.RecursiveAnnotation.A(value = "test": kotlin.String): test.RecursiveAnnotation.A) public final annotation class B : kotlin.Annotation {
public constructor B(/*0*/ value: test.RecursiveAnnotation.A)
public abstract fun value(): test.RecursiveAnnotation.A
compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.txt
+3 -3
View File
@@ -1,12 +1,12 @@
package test
public trait RecursiveAnnotation2 : java.lang.Object {
public trait RecursiveAnnotation2 {
public final annotation class A : kotlin.Annotation {
public constructor A(/*0*/ value: test.RecursiveAnnotation2.B)
public abstract fun value(): test.RecursiveAnnotation2.B
}
test.RecursiveAnnotation2.A(value = test.RecursiveAnnotation2.B(value = "test": kotlin.String): test.RecursiveAnnotation2.B) public final annotation class B : kotlin.Annotation {
public constructor B(/*0*/ value: kotlin.String)
public abstract fun value(): kotlin.String
compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.txt
+4 -4
View File
@@ -1,13 +1,13 @@
package test
public trait StringConcatenationInParam : java.lang.Object {
public trait StringConcatenationInParam {
public final annotation class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
public abstract fun value(): kotlin.String
}
test.StringConcatenationInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object {
test.StringConcatenationInParam.Anno(value = "hello": kotlin.String) public open class Class {
public constructor Class()
}
}
compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.txt
+4 -4
View File
@@ -1,13 +1,13 @@
package test
public trait StringConstantInParam : java.lang.Object {
public trait StringConstantInParam {
public final annotation class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
public abstract fun value(): kotlin.String
}
test.StringConstantInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object {
test.StringConstantInParam.Anno(value = "hello": kotlin.String) public open class Class {
public constructor Class()
}
}
compiler/testData/loadJava/compiledJava/annotations/StringInParam.txt
+4 -4
View File
@@ -1,13 +1,13 @@
package test
public trait StringInParam : java.lang.Object {
public trait StringInParam {
public final annotation class Anno : kotlin.Annotation {
public constructor Anno(/*0*/ value: kotlin.String)
public abstract fun value(): kotlin.String
}
test.StringInParam.Anno(value = "hello": kotlin.String) public open class Class : java.lang.Object {
test.StringInParam.Anno(value = "hello": kotlin.String) public open class Class {
public constructor Class()
}
}