From 427750ba03abae034ca121f0934e46c8e7aaee77 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 26 Feb 2020 19:17:16 +0300 Subject: [PATCH] Update builtins test data --- .../testData/builtIns/kotlin.txt | 32 +++++++++++++------ .../builtin-classes/default/kotlin.txt | 28 ++++++++++------ .../testData/builtin-classes/java6/kotlin.txt | 28 ++++++++++------ .../testData/builtin-classes/java8/kotlin.txt | 28 ++++++++++------ .../builtin-classes/newMethods/kotlin.txt | 28 ++++++++++------ 5 files changed, 94 insertions(+), 50 deletions(-) diff --git a/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt b/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt index 612256ff7c3..c3c8fb40c56 100644 --- a/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt +++ b/compiler/fir/analysis-tests/testData/builtIns/kotlin.txt @@ -470,21 +470,27 @@ public final class Double : R|kotlin/Number|, R|kotlin/Comparable private constructor(): R|kotlin/Double| public final companion object Companion : R|kotlin/Any| { - public final val MAX_VALUE: R|kotlin/Double| + public final const val MAX_VALUE: R|kotlin/Double| public get(): R|kotlin/Double| - public final val MIN_VALUE: R|kotlin/Double| + public final const val MIN_VALUE: R|kotlin/Double| public get(): R|kotlin/Double| - public final val NEGATIVE_INFINITY: R|kotlin/Double| + public final const val NEGATIVE_INFINITY: R|kotlin/Double| public get(): R|kotlin/Double| - public final val NaN: R|kotlin/Double| + public final const val NaN: R|kotlin/Double| public get(): R|kotlin/Double| - public final val POSITIVE_INFINITY: R|kotlin/Double| + public final const val POSITIVE_INFINITY: R|kotlin/Double| public get(): R|kotlin/Double| + @R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BITS: R|kotlin/Int| + public get(): R|kotlin/Int| + + @R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BYTES: R|kotlin/Int| + public get(): R|kotlin/Int| + private constructor(): R|kotlin/Double.Companion| } @@ -643,21 +649,27 @@ public final class Float : R|kotlin/Number|, R|kotlin/Comparable| private constructor(): R|kotlin/Float| public final companion object Companion : R|kotlin/Any| { - public final val MAX_VALUE: R|kotlin/Float| + public final const val MAX_VALUE: R|kotlin/Float| public get(): R|kotlin/Float| - public final val MIN_VALUE: R|kotlin/Float| + public final const val MIN_VALUE: R|kotlin/Float| public get(): R|kotlin/Float| - public final val NEGATIVE_INFINITY: R|kotlin/Float| + public final const val NEGATIVE_INFINITY: R|kotlin/Float| public get(): R|kotlin/Float| - public final val NaN: R|kotlin/Float| + public final const val NaN: R|kotlin/Float| public get(): R|kotlin/Float| - public final val POSITIVE_INFINITY: R|kotlin/Float| + public final const val POSITIVE_INFINITY: R|kotlin/Float| public get(): R|kotlin/Float| + @R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BITS: R|kotlin/Int| + public get(): R|kotlin/Int| + + @R|kotlin/SinceKotlin|(version = String(1.4)) public final const val SIZE_BYTES: R|kotlin/Int| + public get(): R|kotlin/Int| + private constructor(): R|kotlin/Float.Companion| } diff --git a/compiler/testData/builtin-classes/default/kotlin.txt b/compiler/testData/builtin-classes/default/kotlin.txt index d4ef749bd06..85b17fec0e6 100644 --- a/compiler/testData/builtin-classes/default/kotlin.txt +++ b/compiler/testData/builtin-classes/default/kotlin.txt @@ -277,16 +277,20 @@ public final class Double : kotlin.Number, kotlin.Comparable { public companion object Companion { /*primary*/ private constructor Companion() - public final val MAX_VALUE: kotlin.Double + public const final val MAX_VALUE: kotlin.Double public final fun (): kotlin.Double - public final val MIN_VALUE: kotlin.Double + public const final val MIN_VALUE: kotlin.Double public final fun (): kotlin.Double - public final val NEGATIVE_INFINITY: kotlin.Double + public const final val NEGATIVE_INFINITY: kotlin.Double public final fun (): kotlin.Double - public final val NaN: kotlin.Double + public const final val NaN: kotlin.Double public final fun (): kotlin.Double - public final val POSITIVE_INFINITY: kotlin.Double + public const final val POSITIVE_INFINITY: kotlin.Double public final fun (): kotlin.Double + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BITS: kotlin.Int + public final fun (): kotlin.Int + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BYTES: kotlin.Int + public final fun (): kotlin.Int } } @@ -374,16 +378,20 @@ public final class Float : kotlin.Number, kotlin.Comparable { public companion object Companion { /*primary*/ private constructor Companion() - public final val MAX_VALUE: kotlin.Float + public const final val MAX_VALUE: kotlin.Float public final fun (): kotlin.Float - public final val MIN_VALUE: kotlin.Float + public const final val MIN_VALUE: kotlin.Float public final fun (): kotlin.Float - public final val NEGATIVE_INFINITY: kotlin.Float + public const final val NEGATIVE_INFINITY: kotlin.Float public final fun (): kotlin.Float - public final val NaN: kotlin.Float + public const final val NaN: kotlin.Float public final fun (): kotlin.Float - public final val POSITIVE_INFINITY: kotlin.Float + public const final val POSITIVE_INFINITY: kotlin.Float public final fun (): kotlin.Float + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BITS: kotlin.Int + public final fun (): kotlin.Int + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BYTES: kotlin.Int + public final fun (): kotlin.Int } } diff --git a/compiler/testData/builtin-classes/java6/kotlin.txt b/compiler/testData/builtin-classes/java6/kotlin.txt index 599659187e8..dfb27f05aeb 100644 --- a/compiler/testData/builtin-classes/java6/kotlin.txt +++ b/compiler/testData/builtin-classes/java6/kotlin.txt @@ -287,16 +287,20 @@ public final class Double : kotlin.Number, kotlin.Comparable, jav public companion object Companion { /*primary*/ private constructor Companion() - public final val MAX_VALUE: kotlin.Double + public const final val MAX_VALUE: kotlin.Double public final fun (): kotlin.Double - public final val MIN_VALUE: kotlin.Double + public const final val MIN_VALUE: kotlin.Double public final fun (): kotlin.Double - public final val NEGATIVE_INFINITY: kotlin.Double + public const final val NEGATIVE_INFINITY: kotlin.Double public final fun (): kotlin.Double - public final val NaN: kotlin.Double + public const final val NaN: kotlin.Double public final fun (): kotlin.Double - public final val POSITIVE_INFINITY: kotlin.Double + public const final val POSITIVE_INFINITY: kotlin.Double public final fun (): kotlin.Double + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BITS: kotlin.Int + public final fun (): kotlin.Int + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BYTES: kotlin.Int + public final fun (): kotlin.Int } } @@ -387,16 +391,20 @@ public final class Float : kotlin.Number, kotlin.Comparable, java. public companion object Companion { /*primary*/ private constructor Companion() - public final val MAX_VALUE: kotlin.Float + public const final val MAX_VALUE: kotlin.Float public final fun (): kotlin.Float - public final val MIN_VALUE: kotlin.Float + public const final val MIN_VALUE: kotlin.Float public final fun (): kotlin.Float - public final val NEGATIVE_INFINITY: kotlin.Float + public const final val NEGATIVE_INFINITY: kotlin.Float public final fun (): kotlin.Float - public final val NaN: kotlin.Float + public const final val NaN: kotlin.Float public final fun (): kotlin.Float - public final val POSITIVE_INFINITY: kotlin.Float + public const final val POSITIVE_INFINITY: kotlin.Float public final fun (): kotlin.Float + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BITS: kotlin.Int + public final fun (): kotlin.Int + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BYTES: kotlin.Int + public final fun (): kotlin.Int } } diff --git a/compiler/testData/builtin-classes/java8/kotlin.txt b/compiler/testData/builtin-classes/java8/kotlin.txt index 9cdc7725853..f758574735f 100644 --- a/compiler/testData/builtin-classes/java8/kotlin.txt +++ b/compiler/testData/builtin-classes/java8/kotlin.txt @@ -289,16 +289,20 @@ public final class Double : kotlin.Number, kotlin.Comparable, jav public companion object Companion { /*primary*/ private constructor Companion() - public final val MAX_VALUE: kotlin.Double + public const final val MAX_VALUE: kotlin.Double public final fun (): kotlin.Double - public final val MIN_VALUE: kotlin.Double + public const final val MIN_VALUE: kotlin.Double public final fun (): kotlin.Double - public final val NEGATIVE_INFINITY: kotlin.Double + public const final val NEGATIVE_INFINITY: kotlin.Double public final fun (): kotlin.Double - public final val NaN: kotlin.Double + public const final val NaN: kotlin.Double public final fun (): kotlin.Double - public final val POSITIVE_INFINITY: kotlin.Double + public const final val POSITIVE_INFINITY: kotlin.Double public final fun (): kotlin.Double + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BITS: kotlin.Int + public final fun (): kotlin.Int + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BYTES: kotlin.Int + public final fun (): kotlin.Int } } @@ -389,16 +393,20 @@ public final class Float : kotlin.Number, kotlin.Comparable, java. public companion object Companion { /*primary*/ private constructor Companion() - public final val MAX_VALUE: kotlin.Float + public const final val MAX_VALUE: kotlin.Float public final fun (): kotlin.Float - public final val MIN_VALUE: kotlin.Float + public const final val MIN_VALUE: kotlin.Float public final fun (): kotlin.Float - public final val NEGATIVE_INFINITY: kotlin.Float + public const final val NEGATIVE_INFINITY: kotlin.Float public final fun (): kotlin.Float - public final val NaN: kotlin.Float + public const final val NaN: kotlin.Float public final fun (): kotlin.Float - public final val POSITIVE_INFINITY: kotlin.Float + public const final val POSITIVE_INFINITY: kotlin.Float public final fun (): kotlin.Float + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BITS: kotlin.Int + public final fun (): kotlin.Int + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BYTES: kotlin.Int + public final fun (): kotlin.Int } } diff --git a/compiler/testData/builtin-classes/newMethods/kotlin.txt b/compiler/testData/builtin-classes/newMethods/kotlin.txt index 0a8350e5d5f..100bdbe7013 100644 --- a/compiler/testData/builtin-classes/newMethods/kotlin.txt +++ b/compiler/testData/builtin-classes/newMethods/kotlin.txt @@ -287,16 +287,20 @@ public final class Double : kotlin.Number, kotlin.Comparable, jav public companion object Companion { /*primary*/ private constructor Companion() - public final val MAX_VALUE: kotlin.Double + public const final val MAX_VALUE: kotlin.Double public final fun (): kotlin.Double - public final val MIN_VALUE: kotlin.Double + public const final val MIN_VALUE: kotlin.Double public final fun (): kotlin.Double - public final val NEGATIVE_INFINITY: kotlin.Double + public const final val NEGATIVE_INFINITY: kotlin.Double public final fun (): kotlin.Double - public final val NaN: kotlin.Double + public const final val NaN: kotlin.Double public final fun (): kotlin.Double - public final val POSITIVE_INFINITY: kotlin.Double + public const final val POSITIVE_INFINITY: kotlin.Double public final fun (): kotlin.Double + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BITS: kotlin.Int + public final fun (): kotlin.Int + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BYTES: kotlin.Int + public final fun (): kotlin.Int } } @@ -387,16 +391,20 @@ public final class Float : kotlin.Number, kotlin.Comparable, java. public companion object Companion { /*primary*/ private constructor Companion() - public final val MAX_VALUE: kotlin.Float + public const final val MAX_VALUE: kotlin.Float public final fun (): kotlin.Float - public final val MIN_VALUE: kotlin.Float + public const final val MIN_VALUE: kotlin.Float public final fun (): kotlin.Float - public final val NEGATIVE_INFINITY: kotlin.Float + public const final val NEGATIVE_INFINITY: kotlin.Float public final fun (): kotlin.Float - public final val NaN: kotlin.Float + public const final val NaN: kotlin.Float public final fun (): kotlin.Float - public final val POSITIVE_INFINITY: kotlin.Float + public const final val POSITIVE_INFINITY: kotlin.Float public final fun (): kotlin.Float + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BITS: kotlin.Int + public final fun (): kotlin.Int + @kotlin.SinceKotlin(version = "1.4") public const final val SIZE_BYTES: kotlin.Int + public final fun (): kotlin.Int } }