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

fix tests in org.jetbrains.kotlin.serialization.builtins

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-09-04 19:34:19 +03:00
parent ece8bb07b2
commit 84b5a57c15
11 changed files with 135 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/serialization/builtinsSerializer/annotationArguments/annotation.txt
Vendored
+7 -7
View File
@@ -1,23 +1,23 @@
package test package test
kotlin.annotation.annotation() internal final class AnnotationArray : kotlin.Annotation { kotlin.annotation.annotation() public final class AnnotationArray : kotlin.Annotation {
public constructor AnnotationArray(/*0*/ annotationArray: kotlin.Array<test.JustAnnotation>) public constructor AnnotationArray(/*0*/ annotationArray: kotlin.Array<test.JustAnnotation>)
internal final val annotationArray: kotlin.Array<test.JustAnnotation> public final val annotationArray: kotlin.Array<test.JustAnnotation>
} }
test.JustAnnotation(annotation = test.Empty()) test.AnnotationArray(annotationArray = {}) internal final class C1 { test.JustAnnotation(annotation = test.Empty()) test.AnnotationArray(annotationArray = {}) public final class C1 {
public constructor C1() public constructor C1()
} }
test.AnnotationArray(annotationArray = {test.JustAnnotation(annotation = test.Empty()), test.JustAnnotation(annotation = test.Empty())}) internal final class C2 { test.AnnotationArray(annotationArray = {test.JustAnnotation(annotation = test.Empty()), test.JustAnnotation(annotation = test.Empty())}) public final class C2 {
public constructor C2() public constructor C2()
} }
kotlin.annotation.annotation() internal final class Empty : kotlin.Annotation { kotlin.annotation.annotation() public final class Empty : kotlin.Annotation {
public constructor Empty() public constructor Empty()
} }
kotlin.annotation.annotation() internal final class JustAnnotation : kotlin.Annotation { kotlin.annotation.annotation() public final class JustAnnotation : kotlin.Annotation {
public constructor JustAnnotation(/*0*/ annotation: test.Empty) public constructor JustAnnotation(/*0*/ annotation: test.Empty)
internal final val annotation: test.Empty public final val annotation: test.Empty
} }
compiler/testData/serialization/builtinsSerializer/annotationArguments/enum.txt
Vendored
+7 -7
View File
@@ -1,24 +1,24 @@
package test package test
test.JustEnum(weapon = Weapon.SCISSORS) test.EnumArray(enumArray = {}) internal final class C1 { test.JustEnum(weapon = Weapon.SCISSORS) test.EnumArray(enumArray = {}) public final class C1 {
public constructor C1() public constructor C1()
} }
test.EnumArray(enumArray = {Weapon.PAPER, Weapon.ROCK}) internal final class C2 { test.EnumArray(enumArray = {Weapon.PAPER, Weapon.ROCK}) public final class C2 {
public constructor C2() public constructor C2()
} }
kotlin.annotation.annotation() internal final class EnumArray : kotlin.Annotation { kotlin.annotation.annotation() public final class EnumArray : kotlin.Annotation {
public constructor EnumArray(/*0*/ enumArray: kotlin.Array<test.Weapon>) public constructor EnumArray(/*0*/ enumArray: kotlin.Array<test.Weapon>)
internal final val enumArray: kotlin.Array<test.Weapon> public final val enumArray: kotlin.Array<test.Weapon>
} }
kotlin.annotation.annotation() internal final class JustEnum : kotlin.Annotation { kotlin.annotation.annotation() public final class JustEnum : kotlin.Annotation {
public constructor JustEnum(/*0*/ weapon: test.Weapon) public constructor JustEnum(/*0*/ weapon: test.Weapon)
internal final val weapon: test.Weapon public final val weapon: test.Weapon
} }
internal final enum class Weapon : kotlin.Enum<test.Weapon> { public final enum class Weapon : kotlin.Enum<test.Weapon> {
enum entry ROCK enum entry ROCK
enum entry PAPER enum entry PAPER
compiler/testData/serialization/builtinsSerializer/annotationArguments/primitiveArrays.txt
Vendored
+11 -11
View File
@@ -1,21 +1,21 @@
package test package test
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 { 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()}) public final class C1 {
public constructor C1() public constructor C1()
} }
test.PrimitiveArrays(booleanArray = {}, byteArray = {}, charArray = {}, doubleArray = {}, floatArray = {}, intArray = {}, longArray = {}, shortArray = {}) internal final class C2 { test.PrimitiveArrays(booleanArray = {}, byteArray = {}, charArray = {}, doubleArray = {}, floatArray = {}, intArray = {}, longArray = {}, shortArray = {}) public final class C2 {
public constructor C2() public constructor C2()
} }
kotlin.annotation.annotation() internal final class PrimitiveArrays : kotlin.Annotation { kotlin.annotation.annotation() public final class PrimitiveArrays : kotlin.Annotation {
public constructor PrimitiveArrays(/*0*/ byteArray: kotlin.ByteArray, /*1*/ charArray: kotlin.CharArray, /*2*/ shortArray: kotlin.ShortArray, /*3*/ intArray: kotlin.IntArray, /*4*/ longArray: kotlin.LongArray, /*5*/ floatArray: kotlin.FloatArray, /*6*/ doubleArray: kotlin.DoubleArray, /*7*/ booleanArray: kotlin.BooleanArray) public constructor PrimitiveArrays(/*0*/ byteArray: kotlin.ByteArray, /*1*/ charArray: kotlin.CharArray, /*2*/ shortArray: kotlin.ShortArray, /*3*/ intArray: kotlin.IntArray, /*4*/ longArray: kotlin.LongArray, /*5*/ floatArray: kotlin.FloatArray, /*6*/ doubleArray: kotlin.DoubleArray, /*7*/ booleanArray: kotlin.BooleanArray)
internal final val booleanArray: kotlin.BooleanArray public final val booleanArray: kotlin.BooleanArray
internal final val byteArray: kotlin.ByteArray public final val byteArray: kotlin.ByteArray
internal final val charArray: kotlin.CharArray public final val charArray: kotlin.CharArray
internal final val doubleArray: kotlin.DoubleArray public final val doubleArray: kotlin.DoubleArray
internal final val floatArray: kotlin.FloatArray public final val floatArray: kotlin.FloatArray
internal final val intArray: kotlin.IntArray public final val intArray: kotlin.IntArray
internal final val longArray: kotlin.LongArray public final val longArray: kotlin.LongArray
internal final val shortArray: kotlin.ShortArray public final val shortArray: kotlin.ShortArray
} }
compiler/testData/serialization/builtinsSerializer/annotationArguments/primitives.txt
Vendored
+11 -11
View File
@@ -1,21 +1,21 @@
package test package test
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 { 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()) public final class C {
public constructor C() public constructor 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 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()) public final class D {
public constructor D() public constructor D()
} }
kotlin.annotation.annotation() internal final class Primitives : kotlin.Annotation { kotlin.annotation.annotation() public final class Primitives : kotlin.Annotation {
public constructor Primitives(/*0*/ byte: kotlin.Byte, /*1*/ char: kotlin.Char, /*2*/ short: kotlin.Short, /*3*/ int: kotlin.Int, /*4*/ long: kotlin.Long, /*5*/ float: kotlin.Float, /*6*/ double: kotlin.Double, /*7*/ boolean: kotlin.Boolean) public constructor Primitives(/*0*/ byte: kotlin.Byte, /*1*/ char: kotlin.Char, /*2*/ short: kotlin.Short, /*3*/ int: kotlin.Int, /*4*/ long: kotlin.Long, /*5*/ float: kotlin.Float, /*6*/ double: kotlin.Double, /*7*/ boolean: kotlin.Boolean)
internal final val boolean: kotlin.Boolean public final val boolean: kotlin.Boolean
internal final val byte: kotlin.Byte public final val byte: kotlin.Byte
internal final val char: kotlin.Char public final val char: kotlin.Char
internal final val double: kotlin.Double public final val double: kotlin.Double
internal final val float: kotlin.Float public final val float: kotlin.Float
internal final val int: kotlin.Int public final val int: kotlin.Int
internal final val long: kotlin.Long public final val long: kotlin.Long
internal final val short: kotlin.Short public final val short: kotlin.Short
} }
compiler/testData/serialization/builtinsSerializer/annotationArguments/string.txt
Vendored
+6 -6
View File
@@ -1,19 +1,19 @@
package test package test
test.JustString(string = "kotlin") test.StringArray(stringArray = {}) internal final class C1 { test.JustString(string = "kotlin") test.StringArray(stringArray = {}) public final class C1 {
public constructor C1() public constructor C1()
} }
test.StringArray(stringArray = {"java", ""}) internal final class C2 { test.StringArray(stringArray = {"java", ""}) public final class C2 {
public constructor C2() public constructor C2()
} }
kotlin.annotation.annotation() internal final class JustString : kotlin.Annotation { kotlin.annotation.annotation() public final class JustString : kotlin.Annotation {
public constructor JustString(/*0*/ string: kotlin.String) public constructor JustString(/*0*/ string: kotlin.String)
internal final val string: kotlin.String public final val string: kotlin.String
} }
kotlin.annotation.annotation() internal final class StringArray : kotlin.Annotation { kotlin.annotation.annotation() public final class StringArray : kotlin.Annotation {
public constructor StringArray(/*0*/ stringArray: kotlin.Array<kotlin.String>) public constructor StringArray(/*0*/ stringArray: kotlin.Array<kotlin.String>)
internal final val stringArray: kotlin.Array<kotlin.String> public final val stringArray: kotlin.Array<kotlin.String>
} }
compiler/testData/serialization/builtinsSerializer/annotationArguments/varargs.txt
Vendored
+4 -4
View File
@@ -1,6 +1,6 @@
package test package test
internal final enum class My : kotlin.Enum<test.My> { public final enum class My : kotlin.Enum<test.My> {
enum entry ALPHA enum entry ALPHA
enum entry BETA enum entry BETA
@@ -18,11 +18,11 @@ internal final enum class My : kotlin.Enum<test.My> {
public final /*synthesized*/ fun values(): kotlin.Array<test.My> public final /*synthesized*/ fun values(): kotlin.Array<test.My>
} }
kotlin.annotation.annotation() internal final class ann : kotlin.Annotation { kotlin.annotation.annotation() public final class ann : kotlin.Annotation {
public constructor ann(/*0*/ vararg m: test.My /*kotlin.Array<out test.My>*/) public constructor ann(/*0*/ vararg m: test.My /*kotlin.Array<out test.My>*/)
internal final val m: kotlin.Array<out test.My> public final val m: kotlin.Array<out test.My>
} }
test.ann(m = {My.ALPHA, My.BETA}) kotlin.annotation.annotation() internal final class annotated : kotlin.Annotation { test.ann(m = {My.ALPHA, My.BETA}) kotlin.annotation.annotation() public final class annotated : kotlin.Annotation {
public constructor annotated() public constructor annotated()
} }
compiler/testData/serialization/builtinsSerializer/annotationTargets.txt
Vendored
+12 -12
View File
@@ -1,18 +1,18 @@
package test package test
test.anno(x = "top level property") internal val p1: kotlin.Nothing? test.anno(x = "top level property") public val p1: kotlin.Nothing?
test.anno(x = "extension property") internal val kotlin.Double.p2: kotlin.Double test.anno(x = "extension property") public 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 = "top level function") public 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 = "extension function") public fun kotlin.Long.f2(/*0*/ test.anno(x = "extension function parameter") p: kotlin.Int): kotlin.Unit
test.anno(x = "top level class") internal final class C1 { test.anno(x = "top level class") public final class C1 {
test.anno(x = "constructor") public constructor C1() test.anno(x = "constructor") public constructor C1()
test.anno(x = "member property") internal final val p3: kotlin.Nothing? test.anno(x = "member property") public final val p3: kotlin.Nothing?
test.anno(x = "member extension property") internal final val kotlin.Int.v4: kotlin.Int test.anno(x = "member extension property") public 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 function") public 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 = "member extension function") public final fun kotlin.String.f4(): kotlin.Unit
test.anno(x = "nested class") internal final class C2 { test.anno(x = "nested class") public final class C2 {
public constructor C2() public constructor C2()
} }
@@ -21,7 +21,7 @@ test.anno(x = "top level class") internal final class C1 {
} }
} }
kotlin.annotation.annotation() internal final class anno : kotlin.Annotation { kotlin.annotation.annotation() public final class anno : kotlin.Annotation {
public constructor anno(/*0*/ x: kotlin.String) public constructor anno(/*0*/ x: kotlin.String)
internal final val x: kotlin.String public final val x: kotlin.String
} }
compiler/testData/serialization/builtinsSerializer/compileTimeConstants.txt
Vendored
+28 -28
View File
@@ -1,37 +1,37 @@
package test package test
internal val a: kotlin.Int = 10 public val a: kotlin.Int = 10
internal val arrayConst: kotlin.Any = {1.toByte(), 2.toByte()} public val arrayConst: kotlin.Any = {1.toByte(), 2.toByte()}
internal val b: kotlin.Int = 30 public val b: kotlin.Int = 30
internal val booleanConst: kotlin.Boolean = true public val booleanConst: kotlin.Boolean = true
internal val byteConst: kotlin.Byte = 10.toByte() public val byteConst: kotlin.Byte = 10.toByte()
internal val charConst: kotlin.Char = \u0041 ('A') public val charConst: kotlin.Char = \u0041 ('A')
internal val doubleConst: kotlin.Double = 3.0.toDouble() public val doubleConst: kotlin.Double = 3.0.toDouble()
internal val enumConst: test.Weapon? = Weapon.ROCK public val enumConst: test.Weapon? = Weapon.ROCK
internal val floatConst: kotlin.Float = 2.0.toFloat() public val floatConst: kotlin.Float = 2.0.toFloat()
internal val intConst: kotlin.Int = 30 public val intConst: kotlin.Int = 30
internal val longConst: kotlin.Long = 40.toLong() public val longConst: kotlin.Long = 40.toLong()
internal val shortConst: kotlin.Short = 20.toShort() public val shortConst: kotlin.Short = 20.toShort()
internal val stringConst: kotlin.String = "abcd" public val stringConst: kotlin.String = "abcd"
internal final class Class { public final class Class {
public constructor Class() public constructor Class()
internal final val a: kotlin.Int = 10 public final val a: kotlin.Int = 10
internal final val arrayConst: kotlin.Any = {1.toByte(), 2.toByte()} public final val arrayConst: kotlin.Any = {1.toByte(), 2.toByte()}
internal final val b: kotlin.Int = 30 public final val b: kotlin.Int = 30
internal final val booleanConst: kotlin.Boolean = true public final val booleanConst: kotlin.Boolean = true
internal final val byteConst: kotlin.Byte = 10.toByte() public final val byteConst: kotlin.Byte = 10.toByte()
internal final val charConst: kotlin.Char = \u0041 ('A') public final val charConst: kotlin.Char = \u0041 ('A')
internal final val doubleConst: kotlin.Double = 3.0.toDouble() public final val doubleConst: kotlin.Double = 3.0.toDouble()
internal final val enumConst: test.Weapon? = Weapon.ROCK public final val enumConst: test.Weapon? = Weapon.ROCK
internal final val floatConst: kotlin.Float = 2.0.toFloat() public final val floatConst: kotlin.Float = 2.0.toFloat()
internal final val intConst: kotlin.Int = 30 public final val intConst: kotlin.Int = 30
internal final val longConst: kotlin.Long = 40.toLong() public final val longConst: kotlin.Long = 40.toLong()
internal final val shortConst: kotlin.Short = 20.toShort() public final val shortConst: kotlin.Short = 20.toShort()
internal final val stringConst: kotlin.String = "abcd" public final val stringConst: kotlin.String = "abcd"
} }
internal final enum class Weapon : kotlin.Enum<test.Weapon> { public final enum class Weapon : kotlin.Enum<test.Weapon> {
enum entry ROCK enum entry ROCK
enum entry PAPER enum entry PAPER
compiler/testData/serialization/builtinsSerializer/nestedClassesAndObjects.txt
Vendored
+18 -18
View File
@@ -1,50 +1,50 @@
package test package test
internal final class ClassA { public final class ClassA {
public constructor ClassA() public constructor ClassA()
public companion object Companion { public companion object Companion {
private constructor Companion() private constructor Companion()
internal final val stat: kotlin.Int public final val stat: kotlin.Int
internal final class D { public final class D {
public constructor D() public constructor D()
internal final val memberFromD: kotlin.Int = 275 public final val memberFromD: kotlin.Int = 275
} }
} }
internal object ObjA { public object ObjA {
private constructor ObjA() private constructor ObjA()
internal final val memberFromObjA: kotlin.Int = 300 public final val memberFromObjA: kotlin.Int = 300
} }
internal final class classB { public final class classB {
public constructor classB() public constructor classB()
internal final fun memberFromB(): kotlin.Int public final fun memberFromB(): kotlin.Int
internal final class BC { public final class BC {
public constructor BC() public constructor BC()
internal final val memberFromBB: kotlin.Int = 150 public final val memberFromBB: kotlin.Int = 150
} }
internal object BO { public object BO {
private constructor BO() private constructor BO()
internal final val memberFromBO: kotlin.Int = 175 public final val memberFromBO: kotlin.Int = 175
} }
} }
internal final inner class classC { public final inner class classC {
public constructor classC() public constructor classC()
internal final val memberFromC: kotlin.Int = 200 public final val memberFromC: kotlin.Int = 200
internal final class CC { public final class CC {
public constructor CC() public constructor CC()
internal final val memberFromCC: kotlin.Int = 250 public final val memberFromCC: kotlin.Int = 250
} }
internal object CO { public object CO {
private constructor CO() private constructor CO()
internal final val memberFromCO: kotlin.Int = 265 public final val memberFromCO: kotlin.Int = 265
} }
} }
} }
compiler/testData/serialization/builtinsSerializer/simple.txt
Vendored
+5 -5
View File
@@ -1,10 +1,10 @@
package test package test
internal val property: kotlin.Unit public val property: kotlin.Unit
internal fun function(/*0*/ int: kotlin.Int, /*1*/ string: kotlin.String = ...): test.Class public fun function(/*0*/ int: kotlin.Int, /*1*/ string: kotlin.String = ...): test.Class
internal fun </*0*/ T> T.extension(): T? public fun </*0*/ T> T.extension(): T?
internal final class Class { public final class Class {
public constructor Class() public constructor Class()
internal final fun member(): kotlin.Nothing? public final fun member(): kotlin.Nothing?
} }
compiler/testData/serialization/js/dynamicConstants.txt
Vendored
+26 -26
View File
@@ -1,35 +1,35 @@
package test package test
internal val arrayConst: dynamic = {1.toByte(), 2.toByte()} public val arrayConst: dynamic = {1.toByte(), 2.toByte()}
internal val booleanConst: dynamic = true public val booleanConst: dynamic = true
internal val byteConst: dynamic = 10.toByte() public val byteConst: dynamic = 10.toByte()
internal val charConst: dynamic = \u0041 ('A') public val charConst: dynamic = \u0041 ('A')
internal val doubleConst: dynamic = 3.0.toDouble() public val doubleConst: dynamic = 3.0.toDouble()
internal val dynamicConst: dynamic = 100 public val dynamicConst: dynamic = 100
internal val enumConst: dynamic = Weapon.ROCK public val enumConst: dynamic = Weapon.ROCK
internal val floatConst: dynamic = 2.0.toFloat() public val floatConst: dynamic = 2.0.toFloat()
internal val intConst: dynamic = 30 public val intConst: dynamic = 30
internal val longConst: dynamic = 40.toLong() public val longConst: dynamic = 40.toLong()
internal val shortConst: dynamic = 20.toShort() public val shortConst: dynamic = 20.toShort()
internal val stringConst: dynamic = "abcd" public val stringConst: dynamic = "abcd"
internal final class Class { public final class Class {
public constructor Class() public constructor Class()
internal final val arrayConst: dynamic = {1.toByte(), 2.toByte()} public final val arrayConst: dynamic = {1.toByte(), 2.toByte()}
internal final val booleanConst: dynamic = true public final val booleanConst: dynamic = true
internal final val byteConst: dynamic = 10.toByte() public final val byteConst: dynamic = 10.toByte()
internal final val charConst: dynamic = \u0041 ('A') public final val charConst: dynamic = \u0041 ('A')
internal final val doubleConst: dynamic = 3.0.toDouble() public final val doubleConst: dynamic = 3.0.toDouble()
internal final val dynamicConst: dynamic = 100 public final val dynamicConst: dynamic = 100
internal final val enumConst: dynamic = Weapon.ROCK public final val enumConst: dynamic = Weapon.ROCK
internal final val floatConst: dynamic = 2.0.toFloat() public final val floatConst: dynamic = 2.0.toFloat()
internal final val intConst: dynamic = 30 public final val intConst: dynamic = 30
internal final val longConst: dynamic = 40.toLong() public final val longConst: dynamic = 40.toLong()
internal final val shortConst: dynamic = 20.toShort() public final val shortConst: dynamic = 20.toShort()
internal final val stringConst: dynamic = "abcd" public final val stringConst: dynamic = "abcd"
} }
internal final enum class Weapon : kotlin.Enum<test.Weapon> { public final enum class Weapon : kotlin.Enum<test.Weapon> {
enum entry ROCK enum entry ROCK
enum entry PAPER enum entry PAPER