From 161f46ed375aa113b800ad78a55d9608f2f9a7dc Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Wed, 29 Nov 2023 09:00:03 -0800 Subject: [PATCH] FloatingPointLiteral to RealLiteral fixup (#3430) --- toolchain/check/handle_literal.cpp | 3 +-- toolchain/parse/handle_expr.cpp | 2 +- toolchain/parse/node_kind.def | 3 +-- .../parse/testdata/basics/builtin_types.carbon | 2 +- .../parse/testdata/basics/numeric_literals.carbon | 14 +++++++------- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/toolchain/check/handle_literal.cpp b/toolchain/check/handle_literal.cpp index 8269cc4d8fa7..556bd04adb3d 100644 --- a/toolchain/check/handle_literal.cpp +++ b/toolchain/check/handle_literal.cpp @@ -34,8 +34,7 @@ auto HandleIntegerLiteral(Context& context, Parse::Node parse_node) -> bool { return true; } -auto HandleFloatingPointLiteral(Context& context, Parse::Node parse_node) - -> bool { +auto HandleRealLiteral(Context& context, Parse::Node parse_node) -> bool { context.AddInstAndPush( parse_node, SemIR::RealLiteral{ diff --git a/toolchain/parse/handle_expr.cpp b/toolchain/parse/handle_expr.cpp index 4b105fe2fab1..eb44aaf911ad 100644 --- a/toolchain/parse/handle_expr.cpp +++ b/toolchain/parse/handle_expr.cpp @@ -93,7 +93,7 @@ auto HandleExprInPostfix(Context& context) -> void { break; } case Lex::TokenKind::RealLiteral: { - context.AddLeafNode(NodeKind::FloatingPointLiteral, context.Consume()); + context.AddLeafNode(NodeKind::RealLiteral, context.Consume()); context.PushState(state); break; } diff --git a/toolchain/parse/node_kind.def b/toolchain/parse/node_kind.def index 157ca6c07a07..338d704a9e46 100644 --- a/toolchain/parse/node_kind.def +++ b/toolchain/parse/node_kind.def @@ -429,8 +429,7 @@ CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(BoolLiteralFalse, CARBON_TOKEN(False)) CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(BoolLiteralTrue, CARBON_TOKEN(True)) CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(IntegerLiteral, CARBON_TOKEN(IntegerLiteral)) -CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(FloatingPointLiteral, - CARBON_TOKEN(RealLiteral)) +CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(RealLiteral, CARBON_TOKEN(RealLiteral)) CARBON_PARSE_NODE_KIND_TOKEN_LITERAL(StringLiteral, CARBON_TOKEN(StringLiteral)) // A type literal. diff --git a/toolchain/parse/testdata/basics/builtin_types.carbon b/toolchain/parse/testdata/basics/builtin_types.carbon index d504fb5190ce..1782ae087172 100644 --- a/toolchain/parse/testdata/basics/builtin_types.carbon +++ b/toolchain/parse/testdata/basics/builtin_types.carbon @@ -23,7 +23,7 @@ var test_str: String = "Test"; // CHECK:STDOUT: {kind: 'FloatingPointTypeLiteral', text: 'f64'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, // CHECK:STDOUT: {kind: 'VariableInitializer', text: '='}, -// CHECK:STDOUT: {kind: 'FloatingPointLiteral', text: '0.1'}, +// CHECK:STDOUT: {kind: 'RealLiteral', text: '0.1'}, // CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 7}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'test_str'}, diff --git a/toolchain/parse/testdata/basics/numeric_literals.carbon b/toolchain/parse/testdata/basics/numeric_literals.carbon index eaa8af125e1c..e49494a554dd 100644 --- a/toolchain/parse/testdata/basics/numeric_literals.carbon +++ b/toolchain/parse/testdata/basics/numeric_literals.carbon @@ -65,19 +65,19 @@ fn F() { // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 7}, // CHECK:STDOUT: {kind: 'VariableInitializer', text: '='}, // CHECK:STDOUT: {kind: 'ParenExprOrTupleLiteralStart', text: '('}, -// CHECK:STDOUT: {kind: 'FloatingPointLiteral', text: '0.9'}, +// CHECK:STDOUT: {kind: 'RealLiteral', text: '0.9'}, // CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','}, -// CHECK:STDOUT: {kind: 'FloatingPointLiteral', text: '8.0'}, +// CHECK:STDOUT: {kind: 'RealLiteral', text: '8.0'}, // CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','}, -// CHECK:STDOUT: {kind: 'FloatingPointLiteral', text: '80.0'}, +// CHECK:STDOUT: {kind: 'RealLiteral', text: '80.0'}, // CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','}, -// CHECK:STDOUT: {kind: 'FloatingPointLiteral', text: '1.0e7'}, +// CHECK:STDOUT: {kind: 'RealLiteral', text: '1.0e7'}, // CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','}, -// CHECK:STDOUT: {kind: 'FloatingPointLiteral', text: '1.0e8'}, +// CHECK:STDOUT: {kind: 'RealLiteral', text: '1.0e8'}, // CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','}, -// CHECK:STDOUT: {kind: 'FloatingPointLiteral', text: '1.0e-8'}, +// CHECK:STDOUT: {kind: 'RealLiteral', text: '1.0e-8'}, // CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','}, -// CHECK:STDOUT: {kind: 'FloatingPointLiteral', text: '39999999999999999993.0e39999999999999999993'}, +// CHECK:STDOUT: {kind: 'RealLiteral', text: '39999999999999999993.0e39999999999999999993'}, // CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','}, // CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 16}, // CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 26},