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

Drop loading Java annotation methods as functions

Browse Source
This commit is contained in:
Yan Zhulanow
2015-10-15 16:27:11 +03:00
parent 25b40455ad
commit 9ae3b0fa9c
81 changed files with 30 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationClassMethodCall.kt
Vendored
-27
View File
@@ -1,27 +0,0 @@
// FILE: A.java
public @interface A {
String value();
int arg();
}
// FILE: b.kt
@A(value = "a", arg = 1) class MyClass
fun foo(ann: A) {
ann.<!DEPRECATED_ANNOTATION_METHOD_CALL!>value()<!>
ann.<!DEPRECATED_ANNOTATION_METHOD_CALL!>arg()<!>
ann.equals(ann)
ann.toString()
ann.hashCode()
MyClass::class.java.getAnnotation(A::class.java).<!DEPRECATED_ANNOTATION_METHOD_CALL!>value()<!>
MyClass::class.java.getAnnotation(A::class.java).<!DEPRECATED_ANNOTATION_METHOD_CALL!>arg()<!>
}
fun A.bar() {
<!DEPRECATED_ANNOTATION_METHOD_CALL!>value()<!>
<!DEPRECATED_ANNOTATION_METHOD_CALL!>arg()<!>
this.<!DEPRECATED_ANNOTATION_METHOD_CALL!>value()<!>
this.<!DEPRECATED_ANNOTATION_METHOD_CALL!>arg()<!>
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationClassMethodCall.txt
Vendored
-22
View File
@@ -1,22 +0,0 @@
package
public fun foo(/*0*/ ann: A): kotlin.Unit
public fun A.bar(): kotlin.Unit
public final class A : kotlin.Annotation {
public constructor A(/*0*/ value: kotlin.String, /*1*/ arg: kotlin.Int)
public final val arg: kotlin.Int
public final val value: kotlin.String
public abstract fun arg(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.String
}
@A(arg = 1, value = "a") public final class MyClass {
public constructor MyClass()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithValue.txt
Vendored
-6
View File
@@ -8,13 +8,7 @@ public final class A : kotlin.Annotation {
public final val x: kotlin.reflect.KClass<*>
public final val x1: kotlin.reflect.KClass<*>
public final val x2: kotlin.reflect.KClass<*>
public abstract fun a(): kotlin.Int
public abstract fun b(): kotlin.Double
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.String
public abstract fun x(): kotlin.reflect.KClass<*>
public abstract fun x1(): kotlin.reflect.KClass<*>
public abstract fun x2(): kotlin.reflect.KClass<*>
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/orderWithoutValue.txt
Vendored
-5
View File
@@ -7,12 +7,7 @@ public final class A : kotlin.Annotation {
public final val x: kotlin.reflect.KClass<*>
public final val x1: kotlin.reflect.KClass<*>
public final val x2: kotlin.reflect.KClass<*>
public abstract fun a(): kotlin.Int
public abstract fun b(): kotlin.Double
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun x(): kotlin.reflect.KClass<*>
public abstract fun x1(): kotlin.reflect.KClass<*>
public abstract fun x2(): kotlin.reflect.KClass<*>
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArray.txt
Vendored
-3
View File
@@ -17,7 +17,4 @@ public final class A : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.Array<kotlin.String>
public abstract fun x(): kotlin.reflect.KClass<*>
public abstract fun y(): kotlin.Int
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.txt
Vendored
-3
View File
@@ -20,7 +20,4 @@ public final class A : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.Array<kotlin.String>
public abstract fun x(): kotlin.reflect.KClass<*>
public abstract fun y(): kotlin.Int
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayOnly.txt
Vendored
-1
View File
@@ -12,5 +12,4 @@ public final class A : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.Array<kotlin.String>
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayWithDefault.txt
Vendored
-1
View File
@@ -12,5 +12,4 @@ public final class A : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.Array<kotlin.String>
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.txt
Vendored
-1
View File
@@ -8,5 +8,4 @@ public final class A : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.Array<kotlin.String>
}
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/annotationAsArgument.txt
Vendored
-5
View File
@@ -5,23 +5,18 @@ public final class A : kotlin.Annotation {
public final val arg: kotlin.reflect.KClass<*>
public final val b: B
public final val x: kotlin.Int
public abstract fun arg(): kotlin.reflect.KClass<*>
public abstract fun b(): B
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun x(): kotlin.Int
}
public final class B : kotlin.Annotation {
public constructor B(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ y: kotlin.Int = ...)
public final val arg: kotlin.reflect.KClass<*>
public final val y: kotlin.Int
public abstract fun arg(): kotlin.reflect.KClass<*>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun y(): kotlin.Int
}
@A(arg = kotlin.String::class, b = B(y = 1)) public final class MyClass1 {
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/arg.txt
Vendored
-1
View File
@@ -3,7 +3,6 @@ package
public final class A : kotlin.Annotation {
public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>)
public final val arg: kotlin.reflect.KClass<*>
public abstract fun arg(): kotlin.reflect.KClass<*>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argAndOtherDefault.txt
Vendored
-2
View File
@@ -4,11 +4,9 @@ public final class A : kotlin.Annotation {
public constructor A(/*0*/ arg: kotlin.reflect.KClass<*>, /*1*/ x: kotlin.Int = ...)
public final val arg: kotlin.reflect.KClass<*>
public final val x: kotlin.Int
public abstract fun arg(): kotlin.reflect.KClass<*>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun x(): kotlin.Int
}
@A(arg = kotlin.String::class) public final class MyClass1 {
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argArray.txt
Vendored
-1
View File
@@ -3,7 +3,6 @@ package
public final class A : kotlin.Annotation {
public constructor A(/*0*/ arg: kotlin.Array<kotlin.reflect.KClass<*>>)
public final val arg: kotlin.Array<kotlin.reflect.KClass<*>>
public abstract fun arg(): kotlin.Array<kotlin.reflect.KClass<*>>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefault.txt
Vendored
-1
View File
@@ -3,7 +3,6 @@ package
public final class A : kotlin.Annotation {
public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ...)
public final val arg: kotlin.reflect.KClass<*>
public abstract fun arg(): kotlin.reflect.KClass<*>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/argWithDefaultAndOther.txt
Vendored
-2
View File
@@ -4,11 +4,9 @@ public final class A : kotlin.Annotation {
public constructor A(/*0*/ arg: kotlin.reflect.KClass<*> = ..., /*1*/ x: kotlin.Int)
public final val arg: kotlin.reflect.KClass<*>
public final val x: kotlin.Int
public abstract fun arg(): kotlin.reflect.KClass<*>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun x(): kotlin.Int
}
@A(arg = kotlin.String::class, x = 4) public final class MyClass2 {
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/twoArgs.txt
Vendored
-2
View File
@@ -4,8 +4,6 @@ public final class A : kotlin.Annotation {
public constructor A(/*0*/ arg1: kotlin.reflect.KClass<*>, /*1*/ arg2: kotlin.reflect.KClass<*>)
public final val arg1: kotlin.reflect.KClass<*>
public final val arg2: kotlin.reflect.KClass<*>
public abstract fun arg1(): kotlin.reflect.KClass<*>
public abstract fun arg2(): kotlin.reflect.KClass<*>
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/value.txt
Vendored
-1
View File
@@ -6,7 +6,6 @@ public final class A : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.reflect.KClass<*>
}
@A(value = kotlin.String::class) public final class MyClass1 {
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueAndOtherDefault.txt
Vendored
-2
View File
@@ -7,8 +7,6 @@ public final class A : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.reflect.KClass<*>
public abstract fun x(): kotlin.Int
}
@A(value = kotlin.String::class) public final class MyClass1 {
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueArray.txt
Vendored
-1
View File
@@ -6,7 +6,6 @@ public final class A : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.Array<kotlin.reflect.KClass<*>>
}
@A(value = {kotlin.String::class, kotlin.Int::class}) public final class MyClass1 {
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefault.txt
Vendored
-1
View File
@@ -6,7 +6,6 @@ public final class A : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.reflect.KClass<*>
}
@A(value = kotlin.String::class) public final class MyClass1 {
compiler/testData/diagnostics/testsWithStdLib/annotations/javaAnnotationsWithKClassParameter/valueWithDefaultAndOther.txt
Vendored
-2
View File
@@ -7,8 +7,6 @@ public final class A : kotlin.Annotation {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.reflect.KClass<*>
public abstract fun x(): kotlin.Int
}
@A(value = kotlin.String::class, x = 2) public final class MyClass1 {
compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/tooManyArgs.txt
Vendored
-3
View File
@@ -7,10 +7,7 @@ public final class A : kotlin.Annotation {
public final val a: kotlin.Int
public final val b: kotlin.Double
public final val x: kotlin.Boolean
public abstract fun a(): kotlin.Int
public abstract fun b(): kotlin.Double
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun x(): kotlin.Boolean
}
compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/typeMismatch.txt
Vendored
-3
View File
@@ -8,10 +8,7 @@ public final class A : kotlin.Annotation {
public final val a: kotlin.Int
public final val b: kotlin.Double
public final val x: kotlin.Boolean
public abstract fun a(): kotlin.Int
public abstract fun b(): kotlin.Double
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun x(): kotlin.Boolean
}
compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withValue.txt
Vendored
-4
View File
@@ -11,11 +11,7 @@ public final class A : kotlin.Annotation {
public final val b: kotlin.Double
public final val value: kotlin.String
public final val x: kotlin.Boolean
public abstract fun a(): kotlin.Int
public abstract fun b(): kotlin.Double
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun value(): kotlin.String
public abstract fun x(): kotlin.Boolean
}
compiler/testData/diagnostics/testsWithStdLib/annotations/prohibitPositionedArgument/withoutValue.txt
Vendored
-3
View File
@@ -9,10 +9,7 @@ public final class A : kotlin.Annotation {
public final val a: kotlin.Int
public final val b: kotlin.Double
public final val x: kotlin.Boolean
public abstract fun a(): kotlin.Int
public abstract fun b(): kotlin.Double
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
public abstract fun x(): kotlin.Boolean
}