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

Types are no more rendered for annotation arguments + a swarm of tests corrected accordingly

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-06-29 19:54:43 +03:00
parent dde295011b
commit bae9a7d7f8
213 changed files with 604 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt
Vendored
+2 -2
View File
@@ -5,11 +5,11 @@ internal final annotation class AnnotationArray : kotlin.Annotation {
internal final val annotationArray: kotlin.Array<test.JustAnnotation>
}
test.JustAnnotation(annotation = test.Empty(): test.Empty) test.AnnotationArray(annotationArray = {}: kotlin.Array<test.JustAnnotation>) internal final class C1 {
test.JustAnnotation(annotation = test.Empty()) test.AnnotationArray(annotationArray = {}) internal final class C1 {
public constructor C1()
}
test.AnnotationArray(annotationArray = {test.JustAnnotation(annotation = test.Empty(): test.Empty), test.JustAnnotation(annotation = test.Empty(): test.Empty)}: kotlin.Array<test.JustAnnotation>) internal final class C2 {
test.AnnotationArray(annotationArray = {test.JustAnnotation(annotation = test.Empty()), test.JustAnnotation(annotation = test.Empty())}) internal final class C2 {
public constructor C2()
}
compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
Vendored
+2 -2
View File
@@ -1,10 +1,10 @@
package test
test.JustEnum(weapon = Weapon.SCISSORS: test.Weapon) test.EnumArray(enumArray = {}: kotlin.Array<test.Weapon>) internal final class C1 {
test.JustEnum(weapon = Weapon.SCISSORS) test.EnumArray(enumArray = {}) internal final class C1 {
public constructor C1()
}
test.EnumArray(enumArray = {Weapon.PAPER, Weapon.ROCK}: kotlin.Array<test.Weapon>) internal final class C2 {
test.EnumArray(enumArray = {Weapon.PAPER, Weapon.ROCK}) internal final class C2 {
public constructor C2()
}
compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt
Vendored
+2 -2
View File
@@ -1,10 +1,10 @@
package test
test.PrimitiveArrays(booleanArray = {true, false, true}: kotlin.BooleanArray, byteArray = {-7.toByte(), 7.toByte()}: kotlin.ByteArray, charArray = {\u0025 ('%'), \u007A ('z')}: kotlin.CharArray, doubleArray = {-3.14.toDouble()}: kotlin.DoubleArray, floatArray = {2.72.toFloat(), 0.0.toFloat()}: kotlin.FloatArray, intArray = {239017, -1}: kotlin.IntArray, longArray = {123456789123456789.toLong()}: kotlin.LongArray, shortArray = {239.toShort()}: kotlin.ShortArray) internal final class C1 {
test.PrimitiveArrays(booleanArray = {true, false, true}, byteArray = {-7.toByte(), 7.toByte()}, charArray = {\u0025 ('%'), \u007A ('z')}, doubleArray = {-3.14.toDouble()}, floatArray = {2.72.toFloat(), 0.0.toFloat()}, intArray = {239017, -1}, longArray = {123456789123456789.toLong()}, shortArray = {239.toShort()}) internal final class C1 {
public constructor C1()
}
test.PrimitiveArrays(booleanArray = {}: kotlin.BooleanArray, byteArray = {}: kotlin.ByteArray, charArray = {}: kotlin.CharArray, doubleArray = {}: kotlin.DoubleArray, floatArray = {}: kotlin.FloatArray, intArray = {}: kotlin.IntArray, longArray = {}: kotlin.LongArray, shortArray = {}: kotlin.ShortArray) internal final class C2 {
test.PrimitiveArrays(booleanArray = {}, byteArray = {}, charArray = {}, doubleArray = {}, floatArray = {}, intArray = {}, longArray = {}, shortArray = {}) internal final class C2 {
public constructor C2()
}
compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt
Vendored
+2 -2
View File
@@ -1,10 +1,10 @@
package test
test.Primitives(boolean = true: kotlin.Boolean, byte = 7.toByte(): kotlin.Byte, char = \u0025 ('%'): kotlin.Char, double = -3.14.toDouble(): kotlin.Double, float = 2.72.toFloat(): kotlin.Float, int = 239017: kotlin.Int, long = 123456789123456789.toLong(): kotlin.Long, short = 239.toShort(): kotlin.Short) internal final class C {
test.Primitives(boolean = true, byte = 7.toByte(), char = \u0025 ('%'), double = -3.14.toDouble(), float = 2.72.toFloat(), int = 239017, long = 123456789123456789.toLong(), short = 239.toShort()) internal final class C {
public constructor C()
}
test.Primitives(boolean = true: kotlin.Boolean, byte = 7.toByte(): kotlin.Byte, char = \u0025 ('%'): kotlin.Char, double = -3.14.toDouble(): kotlin.Double, float = 2.72.toFloat(): kotlin.Float, int = 239017: kotlin.Int, long = 123456789123456789.toLong(): kotlin.Long, short = 239.toShort(): kotlin.Short) internal final class D {
test.Primitives(boolean = true, byte = 7.toByte(), char = \u0025 ('%'), double = -3.14.toDouble(), float = 2.72.toFloat(), int = 239017, long = 123456789123456789.toLong(), short = 239.toShort()) internal final class D {
public constructor D()
}
compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt
Vendored
+2 -2
View File
@@ -1,10 +1,10 @@
package test
test.JustString(string = "kotlin": kotlin.String) test.StringArray(stringArray = {}: kotlin.Array<kotlin.String>) internal final class C1 {
test.JustString(string = "kotlin") test.StringArray(stringArray = {}) internal final class C1 {
public constructor C1()
}
test.StringArray(stringArray = {"java", ""}: kotlin.Array<kotlin.String>) internal final class C2 {
test.StringArray(stringArray = {"java", ""}) internal final class C2 {
public constructor C2()
}
compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.kt
Vendored
+7
View File
@@ -0,0 +1,7 @@
package test
enum class My { ALPHA, BETA, OMEGA }
annotation class ann(vararg val m: My)
ann(My.ALPHA, My.BETA) annotation class annotated
compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
Vendored
+42
View File
@@ -0,0 +1,42 @@
package test
internal final enum class My : kotlin.Enum<test.My> {
public enum entry ALPHA : test.My {
private constructor ALPHA()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
public enum entry BETA : test.My {
private constructor BETA()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
public enum entry OMEGA : test.My {
private constructor OMEGA()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
}
private constructor My()
public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: test.My): kotlin.Int
public final override /*1*/ /*fake_override*/ fun name(): kotlin.String
public final override /*1*/ /*fake_override*/ fun ordinal(): kotlin.Int
// Static members
public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): test.My
public final /*synthesized*/ fun values(): kotlin.Array<test.My>
}
internal final annotation class ann : kotlin.Annotation {
public constructor ann(/*0*/ vararg m: test.My /*kotlin.Array<out test.My>*/)
internal final val m: kotlin.Array<out test.My>
}
test.ann(m = {My.ALPHA, My.BETA}) internal final annotation class annotated : kotlin.Annotation {
public constructor annotated()
}
compiler/testData/serialization/builtinsSerializer/annotationTargets.txt
Vendored
+12 -12
View File
@@ -1,22 +1,22 @@
package test
test.anno(x = "top level property": kotlin.String) internal val p1: kotlin.Nothing?
test.anno(x = "extension property": kotlin.String) internal val kotlin.Double.p2: kotlin.Double
test.anno(x = "top level function": kotlin.String) internal fun f1(/*0*/ test.anno(x = "top level function parameter": kotlin.String) p: kotlin.Int): kotlin.Unit
test.anno(x = "extension function": kotlin.String) internal fun kotlin.Long.f2(/*0*/ test.anno(x = "extension function parameter": kotlin.String) p: kotlin.Int): kotlin.Unit
test.anno(x = "top level property") internal val p1: kotlin.Nothing?
test.anno(x = "extension property") internal val kotlin.Double.p2: kotlin.Double
test.anno(x = "top level function") internal fun f1(/*0*/ test.anno(x = "top level function parameter") p: kotlin.Int): kotlin.Unit
test.anno(x = "extension function") internal fun kotlin.Long.f2(/*0*/ test.anno(x = "extension function parameter") p: kotlin.Int): kotlin.Unit
test.anno(x = "top level class": kotlin.String) internal final class C1 {
test.anno(x = "constructor": kotlin.String) public constructor C1()
test.anno(x = "member property": kotlin.String) internal final val p3: kotlin.Nothing?
test.anno(x = "member extension property": kotlin.String) internal final val kotlin.Int.v4: kotlin.Int
test.anno(x = "member function": kotlin.String) internal final fun f3(/*0*/ test.anno(x = "member function parameter": kotlin.String) p: kotlin.Int): kotlin.Unit
test.anno(x = "member extension function": kotlin.String) internal final fun kotlin.String.f4(): kotlin.Unit
test.anno(x = "top level class") internal final class C1 {
test.anno(x = "constructor") public constructor C1()
test.anno(x = "member property") internal final val p3: kotlin.Nothing?
test.anno(x = "member extension property") internal final val kotlin.Int.v4: kotlin.Int
test.anno(x = "member function") internal final fun f3(/*0*/ test.anno(x = "member function parameter") p: kotlin.Int): kotlin.Unit
test.anno(x = "member extension function") internal final fun kotlin.String.f4(): kotlin.Unit
test.anno(x = "nested class": kotlin.String) internal final class C2 {
test.anno(x = "nested class") internal final class C2 {
public constructor C2()
}
test.anno(x = "companion object": kotlin.String) public companion object Companion {
test.anno(x = "companion object") public companion object Companion {
private constructor Companion()
}
}