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

Annotations have now retention of "RUNTIME" by default. Java retention is generated as given by kotlin annotation. Annotation rendering changed.

Browse Source 
Annotation arguments with default values are rendered as ... if renderDefaultAnnotationArguments is true.
Tests: java retention does not taken into account by Descriptor comparator.
Java retentinon changed to kotlin retention in some tests + one new test with java retention added.
More accurate tests for intentions in byte code (visibility controlled).
This commit is contained in:
Mikhail Glukhikh
2015-07-03 12:11:08 +03:00
parent 4a27b4d614
commit 609d696202
68 changed files with 214 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt
Vendored
+2 -6
View File
@@ -1,12 +1,8 @@
// KT-5665
import java.lang.annotation.*
annotation(retention = AnnotationRetention.RUNTIME) class First
Retention(RetentionPolicy.RUNTIME)
annotation class First
Retention(RetentionPolicy.RUNTIME)
annotation class Second(val value: String)
annotation(retention = AnnotationRetention.RUNTIME) class Second(val value: String)
enum class E {
@First
compiler/testData/codegen/boxWithStdlib/annotations/annotatedLambda/funExpression.kt
Vendored
+1 -3
View File
@@ -1,10 +1,8 @@
import java.lang.annotation.*
import java.lang.reflect.Method
import kotlin.reflect.jvm.java
import kotlin.test.assertEquals
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(val x: String)
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val x: String)
fun foo0(block: () -> Unit) = block.javaClass
fun foo1(block: (String) -> Unit) = block.javaClass
compiler/testData/codegen/boxWithStdlib/annotations/annotationsOnDefault.kt
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
import java.lang.annotation.*
import kotlin.test.assertEquals
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(val x: Int)
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val x: Int)
class A {
Ann(1) fun foo(x: Int, y: Int = 2, z: Int) {}
compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt
Vendored
+1 -4
View File
@@ -1,10 +1,7 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
import kotlin.reflect.KClass
import kotlin.reflect.jvm.java
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val i: Int = 1,
val s: String = "a",
val a: Ann2 = Ann2(),
compiler/testData/codegen/boxWithStdlib/annotations/delegatedPropertySetter.kt
Vendored
+1 -4
View File
@@ -1,7 +1,4 @@
import java.lang.annotation.*
Retention(RetentionPolicy.RUNTIME)
annotation class First
annotation(retention = AnnotationRetention.RUNTIME) class First
class MyClass() {
public var x: String by Delegate()
compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt
Vendored
+1 -5
View File
@@ -1,6 +1,3 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Ann(Foo.i, Foo.s, Foo.f, Foo.d, Foo.l, Foo.b, Foo.bool, Foo.c, Foo.str) class MyClass
fun box(): String {
@@ -18,8 +15,7 @@ fun box(): String {
return "OK"
}
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val i: Int,
val s: Short,
val f: Float,
compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt
Vendored
+1 -5
View File
@@ -1,6 +1,3 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Ann(i, s, f, d, l, b, bool, c, str) class MyClass
fun box(): String {
@@ -18,8 +15,7 @@ fun box(): String {
return "OK"
}
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val i: Int,
val s: Short,
val f: Float,
compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt
Vendored
+1 -5
View File
@@ -1,6 +1,3 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Ann(A.B.i) class MyClass
fun box(): String {
@@ -10,8 +7,7 @@ fun box(): String {
return "OK"
}
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(val i: Int)
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val i: Int)
class A {
class B {
compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val b: Byte,
val s: Short,
val i: Int,
compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt
Vendored
+1 -5
View File
@@ -1,6 +1,3 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Ann(i) class MyClass
fun box(): String {
@@ -10,8 +7,7 @@ fun box(): String {
return "OK"
}
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(val i: Int)
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val i: Int)
val i2: Int = 1
val i: Int = i2
compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(vararg val p: Int)
annotation(retention = AnnotationRetention.RUNTIME) class Ann(vararg val p: Int)
Ann() class MyClass1
Ann(1) class MyClass2
compiler/testData/codegen/boxWithStdlib/evaluate/char.kt
Vendored
+1 -5
View File
@@ -1,10 +1,6 @@
package test
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(val c1: Int)
annotation(retention = AnnotationRetention.RUNTIME) class Ann(val c1: Int)
Ann('a' - 'a') class MyClass
compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val b: Byte,
val s: Short,
val i: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/infixCallBinary.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Int,
val p2: Int,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Int,
val p2: Short,
val p3: Byte,
compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Int,
val p2: Int,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Int,
val p2: Byte,
val p4: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Int,
val p2: Int,
val p4: Long,
compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Int,
val p2: Int,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt
Vendored
+1 -5
View File
@@ -1,8 +1,4 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
Retention(RetentionPolicy.RUNTIME)
annotation class Ann(
annotation(retention = AnnotationRetention.RUNTIME) class Ann(
val p1: Byte,
val p2: Short,
val p3: Int,
compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/array.kt
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
import kotlin.reflect.KClass
import java.lang.annotation.*
Retention(RetentionPolicy.RUNTIME)
annotation
annotation(retention = AnnotationRetention.RUNTIME)
class Ann(val args: Array<KClass<*>>)
class O
compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/basic.kt
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
import kotlin.reflect.KClass
import java.lang.annotation.*
Retention(RetentionPolicy.RUNTIME)
annotation
annotation(retention = AnnotationRetention.RUNTIME)
class Ann(val arg: KClass<*>)
class OK
compiler/testData/codegen/boxWithStdlib/reflection/kClassInAnnotation/vararg.kt
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
import kotlin.reflect.KClass
import java.lang.annotation.*
Retention(RetentionPolicy.RUNTIME)
annotation
annotation(retention = AnnotationRetention.RUNTIME)
class Ann(vararg val args: KClass<*>)
class O
compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
import java.lang.annotation.Retention
import java.lang.annotation.RetentionPolicy
import java.lang.annotation.Annotation
Retention(RetentionPolicy.RUNTIME) annotation class foo(val name : String)
annotation(retention = AnnotationRetention.RUNTIME) class foo(val name : String)
class Test() {
foo("OK") fun hello(input : String) {