From 92a51b979417ccc62954c41789930db2e217fcc9 Mon Sep 17 00:00:00 2001 From: Ivan Kylchik Date: Thu, 2 Jul 2020 16:33:46 +0300 Subject: [PATCH] [FIR] Add illegal underscore check in BaseFirBuilder --- .../kotlin/fir/builder/BaseFirBuilder.kt | 21 ++++++++----- .../illegalUnderscores.fir.kt | 17 ----------- .../illegalUnderscores.kt | 1 + .../noUnderscores.fir.kt | 4 +-- .../p-1/neg/2.1.fir.kt | 8 ++--- .../p-1/neg/2.3.fir.kt | 14 ++++----- .../p-1/neg/2.1.fir.kt | 8 ++--- .../p-1/neg/2.4.fir.kt | 14 ++++----- .../real-literals/p-4/neg/1.1.fir.kt | 2 +- .../real-literals/p-4/neg/1.2.fir.kt | 30 +++++++++---------- .../real-literals/p-4/neg/2.1.fir.kt | 28 ++++++++--------- .../real-literals/p-4/neg/2.2.fir.kt | 21 +++++++------ .../real-literals/p-4/neg/2.3.fir.kt | 21 +++++++------ .../p-1/neg/1.1.fir.kt | 8 ++--- .../p-1/neg/1.2.fir.kt | 8 ++--- 15 files changed, 96 insertions(+), 109 deletions(-) delete mode 100644 compiler/testData/diagnostics/tests/underscoresInNumericLiterals/illegalUnderscores.fir.kt 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 21b2081d5a4..8ef1555eeee 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 @@ -235,21 +235,26 @@ abstract class BaseFirBuilder(val baseSession: FirSession, val context: Conte val type = expression.elementType val text: String = expression.asText val sourceElement = expression.toFirSourceElement() + + fun reportIncorrectConstant(kind: DiagnosticKind): FirErrorExpression { + return buildErrorExpression { + source = sourceElement + diagnostic = ConeSimpleDiagnostic("Incorrect constant expression: $text", kind) + } + } + val convertedText: Any? = when (type) { - INTEGER_CONSTANT, FLOAT_CONSTANT -> parseNumericLiteral(text, type) + INTEGER_CONSTANT, FLOAT_CONSTANT -> when { + hasIllegalUnderscore(text, type) -> return reportIncorrectConstant(DiagnosticKind.IllegalUnderscore) + else -> parseNumericLiteral(text, type) + } BOOLEAN_CONSTANT -> parseBoolean(text) else -> null } return when (type) { INTEGER_CONSTANT -> { val kind = when { - convertedText !is Long -> return buildErrorExpression { - source = sourceElement - diagnostic = ConeSimpleDiagnostic( - "Incorrect constant expression: $text", - DiagnosticKind.IllegalConstExpression - ) - } + convertedText !is Long -> return reportIncorrectConstant(DiagnosticKind.IllegalConstExpression) hasUnsignedLongSuffix(text) -> { FirConstKind.UnsignedLong diff --git a/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/illegalUnderscores.fir.kt b/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/illegalUnderscores.fir.kt deleted file mode 100644 index 1833301d78a..00000000000 --- a/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/illegalUnderscores.fir.kt +++ /dev/null @@ -1,17 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_EXPRESSION - -fun foo() { - 1_ - 0x_f - 0X_f - 0b_1 - 0B_1 - 1.0_ - 1_.1 - 1.0_e1 - 1.0E_1 - 0Xe_ - 1.1_e-1_23 - 1.0e+_0 - 1.0e-_0 -} \ No newline at end of file diff --git a/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/illegalUnderscores.kt b/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/illegalUnderscores.kt index 82c0a85ddaa..7f72b3a937a 100644 --- a/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/illegalUnderscores.kt +++ b/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/illegalUnderscores.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_EXPRESSION fun foo() { diff --git a/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/noUnderscores.fir.kt b/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/noUnderscores.fir.kt index 2de40181060..16e730c26eb 100644 --- a/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/noUnderscores.fir.kt +++ b/compiler/testData/diagnostics/tests/underscoresInNumericLiterals/noUnderscores.fir.kt @@ -3,7 +3,7 @@ fun foo() { 100_1 - 3_.1 + 3_.1 2___4 - 123_ + 123_ } \ No newline at end of file diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.fir.kt index cb7d053635a..4efcae35a14 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.fir.kt @@ -1,11 +1,11 @@ // TESTCASE NUMBER: 1 -val value_1 = 0b_1110100000 +val value_1 = 0b_1110100000 // TESTCASE NUMBER: 2 -val value_2 = 0B_______11010000 +val value_2 = 0B_______11010000 // TESTCASE NUMBER: 3 -val value_3 = 0B_1_1_0_1_0_0_0_0 +val value_3 = 0B_1_1_0_1_0_0_0_0 // TESTCASE NUMBER: 4 -val value_4 = 0b_ +val value_4 = 0b_ diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.fir.kt index e10f2b06b00..beaf7f16e65 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.fir.kt @@ -1,20 +1,20 @@ // TESTCASE NUMBER: 1 -val value_1 = 0b0_1_1_0_1_1_____ +val value_1 = 0b0_1_1_0_1_1_____ // TESTCASE NUMBER: 2 -val value_2 = 0B1_______1_______0_______1_ +val value_2 = 0B1_______1_______0_______1_ // TESTCASE NUMBER: 3 -val value_3 = 0B000000000_ +val value_3 = 0B000000000_ // TESTCASE NUMBER: 4 -val value_4 = 0b_ +val value_4 = 0b_ // TESTCASE NUMBER: 5 -val value_5 = 0B______________ +val value_5 = 0B______________ // TESTCASE NUMBER: 6 -val value_6 = 0B0_ +val value_6 = 0B0_ // TESTCASE NUMBER: 7 -val value_7 = 0B10_ +val value_7 = 0B10_ diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.fir.kt index 388121aba12..43238c53d5c 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.fir.kt @@ -1,11 +1,11 @@ // TESTCASE NUMBER: 1 -val value_1 = 0x_1234567890 +val value_1 = 0x_1234567890 // TESTCASE NUMBER: 2 -val value_2 = 0X_______23456789 +val value_2 = 0X_______23456789 // TESTCASE NUMBER: 3 -val value_3 = 0X_2_3_4_5_6_7_8_9 +val value_3 = 0X_2_3_4_5_6_7_8_9 // TESTCASE NUMBER: 4 -val value_4 = 0x_ +val value_4 = 0x_ diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.fir.kt index 322ea313c4c..89f9d1af5a1 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.fir.kt @@ -1,20 +1,20 @@ // TESTCASE NUMBER: 1 -val value_1 = 0x3_4_5_6_7_8_____ +val value_1 = 0x3_4_5_6_7_8_____ // TESTCASE NUMBER: 2 -val value_2 = 0X4_______5_______6_______7_ +val value_2 = 0X4_______5_______6_______7_ // TESTCASE NUMBER: 3 -val value_3 = 0X000000000_ +val value_3 = 0X000000000_ // TESTCASE NUMBER: 5 -val value_5 = 0x_ +val value_5 = 0x_ // TESTCASE NUMBER: 6 -val value_6 = 0X______________ +val value_6 = 0X______________ // TESTCASE NUMBER: 7 -val value_7 = 0X0_ +val value_7 = 0X0_ // TESTCASE NUMBER: 8 -val value_8 = 0X10_ +val value_8 = 0X10_ 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 341f2c6cf27..855dc5eda15 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 @@ -38,7 +38,7 @@ val value_12 = .8____8888888888888888888888888888888 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+ diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.fir.kt index e800d66076f..578ba08ce08 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.fir.kt @@ -1,44 +1,44 @@ // TESTCASE NUMBER: 1 -val value_1= .0_0e-0___ +val value_1= .0_0e-0___ // TESTCASE NUMBER: 2 -val value_2 = 0_0___0E+10_ +val value_2 = 0_0___0E+10_ // TESTCASE NUMBER: 3 -val value_3 = .0_0e-0_F +val value_3 = .0_0e-0_F // TESTCASE NUMBER: 4 -val value_4 = 0__________________________0E+3___ +val value_4 = 0__________________________0E+3___ // TESTCASE NUMBER: 5 -val value_5 = 0_00e1_ +val value_5 = 0_00e1_ // TESTCASE NUMBER: 6 -val value_6 = .0_0__0___0E0_______________ +val value_6 = .0_0__0___0E0_______________ // TESTCASE NUMBER: 7 -val value_7 = 0_1e+100_____f +val value_7 = 0_1e+100_____f // TESTCASE NUMBER: 8 -val value_8 = .0_0E-0001___ +val value_8 = .0_0E-0001___ // TESTCASE NUMBER: 9 -val value_9 = 0___0__0e4___ +val value_9 = 0___0__0e4___ // TESTCASE NUMBER: 10 -val value_10 = 0_00_0e99_f +val value_10 = 0_00_0e99_f // TESTCASE NUMBER: 11 -val value_11 = .0_5E-93_______F +val value_11 = .0_5E-93_______F // TESTCASE NUMBER: 12 -val value_12 = .8____8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888_____8888888888888888888e+5_f +val value_12 = .8____8888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888888_____8888888888888888888e+5_f // TESTCASE NUMBER: 13 -val value_13 = 0_0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000_0e40_F +val value_13 = 0_0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000_0e40_F // 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-10_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-10_f // TESTCASE NUMBER: 15 -val value_15 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+75_ +val value_15 = .000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e+75_ diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.1.fir.kt index 90919897c15..3f817a3a7b8 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.1.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.1.fir.kt @@ -1,41 +1,41 @@ // TESTCASE NUMBER: 1 -val value_1 = 0_E0 +val value_1 = 0_E0 // TESTCASE NUMBER: 2 -val value_2 = 1.1_E2 +val value_2 = 1.1_E2 // TESTCASE NUMBER: 3 -val value_3 = .0__0_e-0___0 +val value_3 = .0__0_e-0___0 // TESTCASE NUMBER: 4 -val value_4 = 0__0.0_____e0f +val value_4 = 0__0.0_____e0f // TESTCASE NUMBER: 5 -val value_5 = 9_______9______9_____9____9___9__9_9.0___E-1 +val value_5 = 9_______9______9_____9____9___9__9_9.0___E-1 // TESTCASE NUMBER: 6 -val value_6 = 0_0_0_0_0_0_0_0_0_0.12345678___e+90F +val value_6 = 0_0_0_0_0_0_0_0_0_0.12345678___e+90F // TESTCASE NUMBER: 7 -val value_7 = 1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9_e-0 +val value_7 = 1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9_e-0 // TESTCASE NUMBER: 8 -val value_8 = 456.5__e0_6 +val value_8 = 456.5__e0_6 // TESTCASE NUMBER: 9 -val value_9 = 5.6_0_E+05F +val value_9 = 5.6_0_E+05F // TESTCASE NUMBER: 10 -val value_10 = 6_54.76_5__e-4 +val value_10 = 6_54.76_5__e-4 // TESTCASE NUMBER: 11 -val value_11 = 9_____________87654321.0__e-9_8765432_____________1F +val value_11 = 9_____________87654321.0__e-9_8765432_____________1F // TESTCASE NUMBER: 12 -val value_12 = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000___0.000000000000000000000000_e000000000000000000000000000000000000000000000000000000000000000_0F +val value_12 = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000___0.000000000000000000000000_e000000000000000000000000000000000000000000000000000000000000000_0F // TESTCASE NUMBER: 13 -val value_13 = 0_000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0____E-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 +val value_13 = 0_000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0____E-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 // TESTCASE NUMBER: 14 -val value_14 = 9999999999999999999999999999999999999999999_______________999999999999999999999999999999999999999999999.33333333333333333333333333333333333333333333333_333333333333333333333333333333333333333_e3_3f +val value_14 = 9999999999999999999999999999999999999999999_______________999999999999999999999999999999999999999999999.33333333333333333333333333333333333333333333333_333333333333333333333333333333333333333_e3_3f diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.fir.kt index 60eedbdcd85..ebcba03e8ad 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.fir.kt @@ -1,4 +1,3 @@ -// FIR_IGNORE // TESTCASE NUMBER: 1 val value_1 = 0e___0 @@ -18,10 +17,10 @@ val value_5 = 1E-_2F val value_6 = 3e+_0f // TESTCASE NUMBER: 7 -val value_7 = 5E_-0 +val value_7 = 5E_-0 // TESTCASE NUMBER: 8 -val value_8 = 5e_-0F +val value_8 = 5e_-0F // TESTCASE NUMBER: 9 val value_9 = 5e_00000000 @@ -30,7 +29,7 @@ val value_9 = 5e_00000000 val value_10 = 0.0_0e_1_0f // TESTCASE NUMBER: 11 -val value_11 = 0.0_0E____-0__0_0F +val value_11 = 0.0_0E____-0__0_0F // TESTCASE NUMBER: 12 val value_12 = .0_0E__0_0 @@ -54,16 +53,16 @@ val value_17 = 666_666.0__________________________________ val value_18 = 8888888_8.000e_____0f // TESTCASE NUMBER: 19 -val value_19 = 9_______9______9_____9____9___9__9_9.0E__-1 +val value_19 = 9_______9______9_____9____9___9__9_9.0E__-1 // TESTCASE NUMBER: 20 -val value_20 = 0_0_0_0_0_0_0_0_0_0.12345678e+__90F +val value_20 = 0_0_0_0_0_0_0_0_0_0.12345678e+__90F // TESTCASE NUMBER: 21 -val value_21 = 1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9e_-_0 +val value_21 = 1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9e_-_0 // TESTCASE NUMBER: 22 -val value_22 = .345______________6e_____7_______8f +val value_22 = .345______________6e_____7_______8f // TESTCASE NUMBER: 23 val value_23 = .45_6E_7f @@ -72,10 +71,10 @@ val value_23 = .45_6E_7f val value_24 = 6_54.765e-_4 // TESTCASE NUMBER: 25 -val value_25 = 7_6543.8E____7654_3 +val value_25 = 7_6543.8E____7654_3 // TESTCASE NUMBER: 26 -val value_26 = .9E+_______0_____________8765432f +val value_26 = .9E+_______0_____________8765432f // TESTCASE NUMBER: 27 val value_27 = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000___0.000000000000000000000000e_000000000000000000000000000000000000000000000000000000000000000_0F @@ -84,4 +83,4 @@ val value_27 = 0000000000000000000000000000000000000000000 val value_28 = 0_000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0E-_0___000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 // TESTCASE NUMBER: 29 -val value_29 = 9999999999999999999999999999999999999999999_______________999999999999999999999999999999999999999999999.33333333333333333333333333333333333333333333333_333333333333333333333333333333333333333e___3_3f +val value_29 = 9999999999999999999999999999999999999999999_______________999999999999999999999999999999999999999999999.33333333333333333333333333333333333333333333333_333333333333333333333333333333333333333e___3_3f diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.fir.kt index c5ba12b6a9a..8e6fb5d6d54 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.fir.kt @@ -1,4 +1,3 @@ -// FIR_IGNORE // TESTCASE NUMBER: 1 val value_1 = .0__e_0 @@ -12,16 +11,16 @@ val value_3 = 1_E-_2F val value_4 = 3_e+_0f // TESTCASE NUMBER: 5 -val value_5 = 5_E_-0 +val value_5 = 5_E_-0 // TESTCASE NUMBER: 6 -val value_6 = 5_e_-0F +val value_6 = 5_e_-0F // TESTCASE NUMBER: 7 val value_7 = 5_e_00000000 // TESTCASE NUMBER: 8 -val value_8 = 0.0_0___E____-0__0_0F +val value_8 = 0.0_0___E____-0__0_0F // TESTCASE NUMBER: 9 val value_9 = 0__0.0_____e___0f @@ -39,19 +38,19 @@ val value_12 = 33__3.0_e_10__0 val value_13 = .0_E_0______00F // TESTCASE NUMBER: 14 -val value_14 = 5_________555_________5.0____e____-____9 +val value_14 = 5_________555_________5.0____e____-____9 // TESTCASE NUMBER: 15 val value_15 = 666_666.0__________________________________________________1_E+_2___________________________________________________________________0F // TESTCASE NUMBER: 16 -val value_16 = 9_______9______9_____9____9___9__9_9.0___E__-1 +val value_16 = 9_______9______9_____9____9___9__9_9.0___E__-1 // TESTCASE NUMBER: 17 -val value_17 = 0_0_0_0_0_0_0_0_0_0.12345678___e+__90F +val value_17 = 0_0_0_0_0_0_0_0_0_0.12345678___e+__90F // TESTCASE NUMBER: 18 -val value_18 = 1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9_e_-_0 +val value_18 = 1_2_3_4_5_6_7_8_9.2_3_4_5_6_7_8_9_e_-_0 // TESTCASE NUMBER: 19 val value_19 = .45_6_E_7f @@ -63,10 +62,10 @@ val value_20 = 456.5__e_0_6 val value_21 = 6_54.76_5_e-_4 // TESTCASE NUMBER: 22 -val value_22 = 7_6543.8____E____7654_3 +val value_22 = 7_6543.8____E____7654_3 // TESTCASE NUMBER: 23 -val value_23 = 9_____________87654321.0__e__-9_8765432_____________1F +val value_23 = 9_____________87654321.0__e__-9_8765432_____________1F // TESTCASE NUMBER: 24 val value_24 = 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000___0.000000000000000000000000_e_000000000000000000000000000000000000000000000000000000000000000_0F @@ -75,4 +74,4 @@ val value_24 = 0000000000000000000000000000000000000000000 val value_25 = 0_000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.0_E-_0___000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 // TESTCASE NUMBER: 26 -val value_26 = 9999999999999999999999999999999999999999999_______________999999999999999999999999999999999999999999999.33333333333333333333333333333333333333333333333_333333333333333333333333333333333333333_e_3_3f +val value_26 = 9999999999999999999999999999999999999999999_______________999999999999999999999999999999999999999999999.33333333333333333333333333333333333333333333333_333333333333333333333333333333333333333_e_3_3f diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.fir.kt index c280773ebf5..08221a9fcb5 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.fir.kt @@ -11,13 +11,13 @@ val value_3 = 0Xl val value_4 = 0xL // TESTCASE NUMBER: 5 -val value_5 = 0b_l +val value_5 = 0b_l // TESTCASE NUMBER: 6 -val value_6 = 0B_L +val value_6 = 0B_L // TESTCASE NUMBER: 7 -val value_7 = 0X____l +val value_7 = 0X____l // TESTCASE NUMBER: 8 -val value_8 = 0x_L +val value_8 = 0x_L diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.fir.kt index 71f5a62b2e6..1355982b3bc 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.fir.kt @@ -1,11 +1,11 @@ // TESTCASE NUMBER: 1 -val value_1 = 0b0_l +val value_1 = 0b0_l // TESTCASE NUMBER: 2 -val value_2 = 0B12_L +val value_2 = 0B12_L // TESTCASE NUMBER: 3 -val value_3 = 0X234_l +val value_3 = 0X234_l // TESTCASE NUMBER: 4 -val value_4 = 0x3567_L +val value_4 = 0x3567_L