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

FIR: support class annotations in JVM deserialized

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-04-22 15:31:50 +03:00
parent a9db64989b
commit 48cd9e3251
27 changed files with 196 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public final class AnnotationInAnnotationArguments : R|kotlin/Any| {
@R|test/OptionGroups|(o1 = @R|test/StringOptions|(option = <implicitArrayOf>(String(abc), String(d), String(ef))) , o2 = @R|test/EnumOption|(option = R|test/E.ENTRY|()) ) public final class AnnotationInAnnotationArguments : R|kotlin/Any| {
public constructor(): R|test/AnnotationInAnnotationArguments|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class Klass : R|kotlin/Any| {
@R|test/Anno|(klass = <getClass>(<getClass>(R|kotlin/String|)), klasses = <implicitArrayOf>(<getClass>(R|kotlin/Int|), <getClass>(R|kotlin/String|), <getClass>(R|kotlin/Float|)), sarKlass = <getClass>(<getClass>(R|kotlin/String|)), d2arKlass = <getClass>(<getClass>(R|kotlin/DoubleArray|))) public final class Klass : R|kotlin/Any| {
public constructor(): R|test/Klass|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class Klass : R|kotlin/Any| {
@R|test/Anno|(bytes = ERROR_EXPR(Unknown value in JavaLiteralAnnotationArgument: [B@1ab59349), shorts = ERROR_EXPR(Unknown value in JavaLiteralAnnotationArgument: [S@3a9e0124), ints = ERROR_EXPR(Unknown value in JavaLiteralAnnotationArgument: [I@472931b8), longs = ERROR_EXPR(Unknown value in JavaLiteralAnnotationArgument: [J@44b10709), chars = ERROR_EXPR(Unknown value in JavaLiteralAnnotationArgument: [C@72a8fb0d), floats = ERROR_EXPR(Unknown value in JavaLiteralAnnotationArgument: [F@3875435d), doubles = ERROR_EXPR(Unknown value in JavaLiteralAnnotationArgument: [D@365f111a), booleans = ERROR_EXPR(Unknown value in JavaLiteralAnnotationArgument: [Z@7a1ac197)) public final class Klass : R|kotlin/Any| {
public constructor(): R|test/Klass|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public final annotation class TargetedAnnotation : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.CLASS|())) public final annotation class TargetedAnnotation : R|kotlin/Annotation| {
public constructor(): R|test/TargetedAnnotation|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
Vendored
+1 -1
View File
@@ -23,7 +23,7 @@ public final class A : R|kotlin/Any| {
}
public final class C : R|kotlin/Any| {
@R|test/A.Companion.Anno1|() @R|test/A.Companion.B.Anno2|() public final class C : R|kotlin/Any| {
public constructor(): R|test/C|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ public final class Class : R|kotlin/Any| {
public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Class.Companion|
public final class Nested : R|kotlin/Any| {
@R|test/Anno|() public final class Nested : R|kotlin/Any| {
public constructor(): R|test/Class.Companion.Nested|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
public final companion object Companion : R|kotlin/Any| {
@R|test/Anno|() public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Class.Companion|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
Vendored
+4 -4
View File
@@ -1,17 +1,17 @@
public final class Class : R|kotlin/Any| {
@R|kotlin/Deprecated|(message = String(Class)) public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
public final companion object Companion : R|kotlin/Any| {
@R|kotlin/Deprecated|(message = String(companion object)) public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Class.Companion|
}
public final inner class Inner : R|kotlin/Any| {
@R|kotlin/Deprecated|(message = String(Inner)) public final inner class Inner : R|kotlin/Any| {
public constructor(): R|test/Class.Inner|
}
public final class Nested : R|kotlin/Any| {
@R|kotlin/Deprecated|(message = String(Nested)) public final class Nested : R|kotlin/Any| {
public constructor(): R|test/Class.Nested|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ public final annotation class $$$$$$ : R|kotlin/Annotation| {
}
public final class A : R|kotlin/Any| {
@R|test/$$$$$$|() public final class A : R|kotlin/Any| {
public constructor(): R|test/A|
}
@@ -13,7 +13,7 @@ public final annotation class Anno$tation : R|kotlin/Annotation| {
}
public final class Cla$s : R|kotlin/Any| {
@R|test/Anno$tation|() public final class Cla$s : R|kotlin/Any| {
public constructor(): R|test/Cla$s|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
Vendored
+4 -4
View File
@@ -6,20 +6,20 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class Class : R|kotlin/Any| {
@R|test/Anno|(t = R|java/lang/annotation/ElementType.METHOD|()) public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
public final companion object Companion : R|kotlin/Any| {
@R|test/Anno|(t = R|java/lang/annotation/ElementType.ANNOTATION_TYPE|()) public final companion object Companion : R|kotlin/Any| {
private constructor(): R|test/Class.Companion|
}
public final inner class Inner : R|kotlin/Any| {
@R|test/Anno|(t = R|java/lang/annotation/ElementType.PARAMETER|()) public final inner class Inner : R|kotlin/Any| {
public constructor(): R|test/Class.Inner|
}
public final class Nested : R|kotlin/Any| {
@R|test/Anno|(t = R|java/lang/annotation/ElementType.TYPE|()) public final class Nested : R|kotlin/Any| {
public constructor(): R|test/Class.Nested|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ public final annotation class A3 : R|kotlin/Annotation| {
}
public final class Class : R|kotlin/Any| {
@R|test/A1|() @R|test/A2|() @R|test/A3|() public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ public final class A : R|kotlin/Any| {
}
public final class B : R|kotlin/Any| {
@R|test/A.Anno|() public final class B : R|kotlin/Any| {
public final fun f(): R|kotlin/Unit|
public constructor(): R|test/B|
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
Vendored
+2 -2
View File
@@ -6,12 +6,12 @@ public final annotation class Anno : R|kotlin/Annotation| {
public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
public final inner class Inner : R|kotlin/Any| {
@R|test/Anno|() public final inner class Inner : R|kotlin/Any| {
public constructor(): R|test/Class.Inner|
}
public final class Nested : R|kotlin/Any| {
@R|test/Anno|() public final class Nested : R|kotlin/Any| {
public constructor(): R|test/Class.Nested|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public final annotation class Anno : R|kotlin/Annotation| {
@R|kotlin/annotation/Retention|(value = R|kotlin/annotation/AnnotationRetention.RUNTIME|()) public final annotation class Anno : R|kotlin/Annotation| {
public constructor(): R|test/Anno|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class X : R|kotlin/Any| {
@R|test/Anno|() public final class X : R|kotlin/Any| {
public constructor(): R|test/X|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt
Vendored
+1 -1
View File
@@ -22,7 +22,7 @@ public final annotation class CharAnno : R|kotlin/Annotation| {
}
public final class Class : R|kotlin/Any| {
@R|test/IntAnno|(value = Int(42)) @R|test/ShortAnno|(value = Short(42)) @R|test/ByteAnno|(value = Byte(42)) @R|test/LongAnno|(value = Long(42)) @R|test/CharAnno|(value = Char(A)) @R|test/BooleanAnno|(value = Boolean(false)) @R|test/FloatAnno|(value = Float(3.14)) @R|test/DoubleAnno|(value = Double(3.14)) public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ public final annotation class Anno : R|kotlin/Annotation| {
}
public final class Class : R|kotlin/Any| {
@R|test/Anno|(int = Int(42), string = String(OK), double = Double(3.14)) public final class Class : R|kotlin/Any| {
public constructor(): R|test/Class|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
public final fun typeAnnotation(): R|kotlin/Unit|
public final annotation class A : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|(), R|kotlin/annotation/AnnotationTarget.TYPEALIAS|(), R|kotlin/annotation/AnnotationTarget.TYPE|())) @R|kotlin/annotation/Retention|(value = R|kotlin/annotation/AnnotationRetention.SOURCE|()) public final annotation class A : R|kotlin/Annotation| {
public constructor(): R|test/A|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public final annotation class Ann : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.TYPE|())) public final annotation class Ann : R|kotlin/Annotation| {
public final val x: R|kotlin/String|
public get(): R|kotlin/String|
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
public final fun foo(bar: R|kotlin/collections/Map<kotlin/String, kotlin/collections/List<kotlin/Int>>|): R|kotlin/Unit|
public final annotation class A : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.TYPE|())) public final annotation class A : R|kotlin/Annotation| {
public constructor(): R|test/A|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public final annotation class A : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|())) public final annotation class A : R|kotlin/Annotation| {
public constructor(): R|test/A|
}
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public final annotation class A : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.TYPE_PARAMETER|())) public final annotation class A : R|kotlin/Annotation| {
public final val x: R|kotlin/String|
public get(): R|kotlin/String|
compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ public final class A : R|kotlin/Any| {
}
public final annotation class Ann : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.VALUE_PARAMETER|())) public final annotation class Ann : R|kotlin/Annotation| {
public constructor(): R|test/Ann|
}
compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
public final annotation class Ann : R|kotlin/Annotation| {
@R|kotlin/annotation/Target|(allowedTargets = <implicitArrayOf>(R|kotlin/annotation/AnnotationTarget.TYPEALIAS|())) public final annotation class Ann : R|kotlin/Annotation| {
public final val value: R|kotlin/String|
public get(): R|kotlin/String|