From d0f6997e6d6b1d6a5c2827a022c71468fce3bf34 Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Tue, 30 Jun 2020 11:00:29 +0300 Subject: [PATCH] [FIR] Fix some of fir spec tests for real-literals #KT-38336 Fixed --- .../kotlin/fir/builder/BaseFirBuilder.kt | 2 +- .../real-literals/p-2/neg/1.1.fir.kt | 35 +++++++++---------- .../real-literals/p-2/neg/1.4.fir.kt | 35 +++++++++---------- .../real-literals/p-3/neg/1.1.fir.kt | 35 +++++++++---------- .../real-literals/p-3/neg/1.2.fir.kt | 35 +++++++++---------- .../real-literals/p-3/neg/2.1.fir.kt | 19 +++++----- .../real-literals/p-4/neg/1.1.fir.kt | 31 ++++++++-------- 7 files changed, 93 insertions(+), 99 deletions(-) diff --git a/compiler/fir/raw-fir/fir-common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt b/compiler/fir/raw-fir/fir-common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt index 7b0b0df1e92..21b2081d5a4 100644 --- a/compiler/fir/raw-fir/fir-common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt +++ b/compiler/fir/raw-fir/fir-common/src/org/jetbrains/kotlin/fir/builder/BaseFirBuilder.kt @@ -285,7 +285,7 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte buildConstOrErrorExpression( sourceElement, FirConstKind.Double, - convertedText as Double, + convertedText as? Double, ConeSimpleDiagnostic("Incorrect double: $text", DiagnosticKind.IllegalConstExpression) ) } diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.fir.kt index fa389fcbc1d..e110bc4cbe2 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.fir.kt @@ -1,51 +1,50 @@ -// FIR_IGNORE // TESTCASE NUMBER: 1 -val value_1 = 0.0E +val value_1 = 0.0E // TESTCASE NUMBER: 2 -val value_2 = 00.0e +val value_2 = 00.0e // TESTCASE NUMBER: 3 -val value_3 = 000.00e- +val value_3 = 000.00e- // TESTCASE NUMBER: 4 -val value_4 = 0000.000E+ +val value_4 = 0000.000E+ // TESTCASE NUMBER: 5 -val value_5 = 1.0e +val value_5 = 1.0e // TESTCASE NUMBER: 6 -val value_6 = 22.00E+ +val value_6 = 22.00E+ // TESTCASE NUMBER: 7 -val value_7 = 333.000e +val value_7 = 333.000e // TESTCASE NUMBER: 8 -val value_8 = 4444.0000E +val value_8 = 4444.0000E // TESTCASE NUMBER: 9 -val value_9 = 55555.0e+ +val value_9 = 55555.0e+ // TESTCASE NUMBER: 10 -val value_10 = 666666.00E- +val value_10 = 666666.00E- // TESTCASE NUMBER: 11 -val value_11 = 7777777.000e +val value_11 = 7777777.000e // TESTCASE NUMBER: 12 -val value_12 = 88888888.0000e +val value_12 = 88888888.0000e // TESTCASE NUMBER: 13 -val value_13 = 999999999.0E- +val value_13 = 999999999.0E- // TESTCASE NUMBER: 14 -val value_14 = 7.888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888e+ +val value_14 = 7.888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888e+ // TESTCASE NUMBER: 15 -val value_15 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e +val value_15 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e // TESTCASE NUMBER: 16 -val value_16 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e- +val value_16 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e- // TESTCASE NUMBER: 17 -val value_17 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+ +val value_17 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+ diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.fir.kt index 8ecced4785a..dab6ea87f28 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.fir.kt @@ -1,51 +1,50 @@ -// FIR_IGNORE // TESTCASE NUMBER: 1 -val value_1 = 0.0EF +val value_1 = 0.0EF // TESTCASE NUMBER: 2 -val value_2 = 00.0ef +val value_2 = 00.0ef // TESTCASE NUMBER: 3 -val value_3 = 000.00e-f +val value_3 = 000.00e-f // TESTCASE NUMBER: 4 -val value_4 = 0000.000E+F +val value_4 = 0000.000E+F // TESTCASE NUMBER: 5 -val value_5 = 1.0eF +val value_5 = 1.0eF // TESTCASE NUMBER: 6 -val value_6 = 22.00E+f +val value_6 = 22.00E+f // TESTCASE NUMBER: 7 -val value_7 = 333.000ef +val value_7 = 333.000ef // TESTCASE NUMBER: 8 -val value_8 = 4444.0000Ef +val value_8 = 4444.0000Ef // TESTCASE NUMBER: 9 -val value_9 = 55555.0e+F +val value_9 = 55555.0e+F // TESTCASE NUMBER: 10 -val value_10 = 666666.00E-F +val value_10 = 666666.00E-F // TESTCASE NUMBER: 11 -val value_11 = 7777777.000eF +val value_11 = 7777777.000eF // TESTCASE NUMBER: 12 -val value_12 = 88888888.0000ef +val value_12 = 88888888.0000ef // TESTCASE NUMBER: 13 -val value_13 = 999999999.0E-F +val value_13 = 999999999.0E-F // TESTCASE NUMBER: 14 -val value_14 = 7.888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888e+f +val value_14 = 7.888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888e+f // TESTCASE NUMBER: 15 -val value_15 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000eF +val value_15 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000eF // TESTCASE NUMBER: 16 -val value_16 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e-f +val value_16 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e-f // TESTCASE NUMBER: 17 -val value_17 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+F +val value_17 = 0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+F diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.fir.kt index 98d3ada927a..a47bbdde643 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.fir.kt @@ -1,51 +1,50 @@ -// FIR_IGNORE // TESTCASE NUMBER: 1 -val value_1 = .0E +val value_1 = .0E // TESTCASE NUMBER: 2 -val value_2 = .0e +val value_2 = .0e // TESTCASE NUMBER: 3 -val value_3 = .00e- +val value_3 = .00e- // TESTCASE NUMBER: 4 -val value_4 = .000E+ +val value_4 = .000E+ // TESTCASE NUMBER: 5 -val value_5 = .0e +val value_5 = .0e // TESTCASE NUMBER: 6 -val value_6 = .00E+ +val value_6 = .00E+ // TESTCASE NUMBER: 7 -val value_7 = .000e +val value_7 = .000e // TESTCASE NUMBER: 8 -val value_8 = .0000E +val value_8 = .0000E // TESTCASE NUMBER: 9 -val value_9 = .0e+ +val value_9 = .0e+ // TESTCASE NUMBER: 10 -val value_10 = .00E- +val value_10 = .00E- // TESTCASE NUMBER: 11 -val value_11 = .000e +val value_11 = .000e // TESTCASE NUMBER: 12 -val value_12 = .0000e +val value_12 = .0000e // TESTCASE NUMBER: 13 -val value_13 = .0E- +val value_13 = .0E- // TESTCASE NUMBER: 14 -val value_14 = .888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888e+ +val value_14 = .888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888e+ // TESTCASE NUMBER: 15 -val value_15 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e +val value_15 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e // TESTCASE NUMBER: 16 -val value_16 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e- +val value_16 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e- // TESTCASE NUMBER: 17 -val value_17 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+ +val value_17 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+ diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.fir.kt index 21e2a25b34a..89b08666ba6 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.fir.kt @@ -1,51 +1,50 @@ -// FIR_IGNORE // TESTCASE NUMBER: 1 -val value_1 = .0EF +val value_1 = .0EF // TESTCASE NUMBER: 2 -val value_2 = .0ef +val value_2 = .0ef // TESTCASE NUMBER: 3 -val value_3 = .00e-f +val value_3 = .00e-f // TESTCASE NUMBER: 4 -val value_4 = .000E+F +val value_4 = .000E+F // TESTCASE NUMBER: 5 -val value_5 = .0eF +val value_5 = .0eF // TESTCASE NUMBER: 6 -val value_6 = .00E+f +val value_6 = .00E+f // TESTCASE NUMBER: 7 -val value_7 = .000ef +val value_7 = .000ef // TESTCASE NUMBER: 8 -val value_8 = .0000Ef +val value_8 = .0000Ef // TESTCASE NUMBER: 9 -val value_9 = .0e+F +val value_9 = .0e+F // TESTCASE NUMBER: 10 -val value_10 = .00E-F +val value_10 = .00E-F // TESTCASE NUMBER: 11 -val value_11 = .000eF +val value_11 = .000eF // TESTCASE NUMBER: 12 -val value_12 = .0000ef +val value_12 = .0000ef // TESTCASE NUMBER: 13 -val value_13 = .0E-F +val value_13 = .0E-F // TESTCASE NUMBER: 14 -val value_14 = .888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888e+f +val value_14 = .888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888e+f // TESTCASE NUMBER: 15 -val value_15 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000eF +val value_15 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000eF // TESTCASE NUMBER: 16 -val value_16 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e-f +val value_16 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e-f // TESTCASE NUMBER: 17 -val value_17 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+F +val value_17 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+F diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.fir.kt index c877cc64b74..07cd9ef8692 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.fir.kt @@ -1,27 +1,26 @@ -// FIR_IGNORE // TESTCASE NUMBER: 1 -val value_1 = 0e +val value_1 = 0e // TESTCASE NUMBER: 2 -val value_2 = 00e- +val value_2 = 00e- // TESTCASE NUMBER: 3 -val value_3 = 000E+ +val value_3 = 000E+ // TESTCASE NUMBER: 4 -val value_4 = 0000e+ +val value_4 = 0000e+ // TESTCASE NUMBER: 5 -val value_5 = 00000000000000000000000000000000000000E +val value_5 = 00000000000000000000000000000000000000E // TESTCASE NUMBER: 6 -val value_6 = 34567E+ +val value_6 = 34567E+ // TESTCASE NUMBER: 7 -val value_7 = 456e- +val value_7 = 456e- // TESTCASE NUMBER: 8 -val value_8 = 55555e+f +val value_8 = 55555e+f // TESTCASE NUMBER: 9 -val value_9 = 666666E-F +val value_9 = 666666E-F diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.fir.kt index b65201b8d47..341f2c6cf27 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.fir.kt @@ -1,45 +1,44 @@ -// FIR_IGNORE // TESTCASE NUMBER: 1 -val value_1 = .0_0e- +val value_1 = .0_0e- // TESTCASE NUMBER: 2 -val value_2 = 0_0___0E+ +val value_2 = 0_0___0E+ // TESTCASE NUMBER: 3 -val value_3 = .0_0e-F +val value_3 = .0_0e-F // TESTCASE NUMBER: 4 -val value_4 = 0__________________________0E+ +val value_4 = 0__________________________0E+ // TESTCASE NUMBER: 5 -val value_5 = 0_00e +val value_5 = 0_00e // TESTCASE NUMBER: 6 -val value_6 = .0_0__0___0E +val value_6 = .0_0__0___0E // TESTCASE NUMBER: 7 -val value_7 = 0_1e+f +val value_7 = 0_1e+f // TESTCASE NUMBER: 8 -val value_8 = .0_0E- +val value_8 = .0_0E- // TESTCASE NUMBER: 9 -val value_9 = 0___0__0e +val value_9 = 0___0__0e // TESTCASE NUMBER: 10 -val value_10 = 0_00_0ef +val value_10 = 0_00_0ef // TESTCASE NUMBER: 11 -val value_11 = .0_5E-F +val value_11 = .0_5E-F // TESTCASE NUMBER: 12 -val value_12 = .8____8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888_____8888888888888888888e+f +val value_12 = .8____8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888_____8888888888888888888e+f // TESTCASE NUMBER: 13 -val value_13 = 0_0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000_0eF +val value_13 = 0_0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000_0eF // TESTCASE NUMBER: 14 -val value_14 = 0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_e-f +val value_14 = 0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_0_e-f // TESTCASE NUMBER: 15 -val value_15 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+ +val value_15 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+