diff --git a/toolchain/check/handle_lambda.cpp b/toolchain/check/handle_lambda.cpp index a934a0d2081c..b4dd6abf7a3d 100644 --- a/toolchain/check/handle_lambda.cpp +++ b/toolchain/check/handle_lambda.cpp @@ -133,6 +133,9 @@ auto HandleParseNode(Context& context, Parse::LambdaDefinitionStartId node_id) } auto HandleParseNode(Context& context, Parse::LambdaId node_id) -> bool { + if (context.node_stack().PeekIs(Parse::NodeCategory::Expr)) { + return context.TODO(node_id, "terse lambda body"); + } auto function_id = context.node_stack().Pop(); CheckFunctionReturnOnFinish(context, node_id, function_id); @@ -143,9 +146,4 @@ auto HandleParseNode(Context& context, Parse::LambdaId node_id) -> bool { return true; } -auto HandleParseNode(Context& context, Parse::TerseBodyArrowId node_id) - -> bool { - return context.TODO(node_id, "HandleTerseBodyArrow"); -} - } // namespace Carbon::Check diff --git a/toolchain/check/node_stack.h b/toolchain/check/node_stack.h index 0c6a2ab9ef2f..0888c51426ec 100644 --- a/toolchain/check/node_stack.h +++ b/toolchain/check/node_stack.h @@ -546,7 +546,6 @@ class NodeStack { case Parse::NodeKind::StructLiteralComma: case Parse::NodeKind::StructFieldDesignator: case Parse::NodeKind::StructTypeLiteralComma: - case Parse::NodeKind::TerseBodyArrow: case Parse::NodeKind::TupleLiteralComma: case Parse::NodeKind::TypeOfExprKeyword: case Parse::NodeKind::TypeOfExprOpenParen: diff --git a/toolchain/check/testdata/function/declaration/fail_todo_no_params.carbon b/toolchain/check/testdata/function/declaration/fail_todo_no_params.carbon index e4b5b582d946..0b2bcc8460f3 100644 --- a/toolchain/check/testdata/function/declaration/fail_todo_no_params.carbon +++ b/toolchain/check/testdata/function/declaration/fail_todo_no_params.carbon @@ -57,9 +57,9 @@ library "[[@TEST_NAME]]"; // CHECK:STDERR: fn A => 0; // CHECK:STDERR: ^~~~~~~ // CHECK:STDERR: -// CHECK:STDERR: fail_todo_arrow_body.carbon:[[@LINE+4]]:6: error: semantics TODO: `HandleTerseBodyArrow` [SemanticsTodo] +// CHECK:STDERR: fail_todo_arrow_body.carbon:[[@LINE+4]]:1: error: semantics TODO: `HandleFunctionTerseDefinition` [SemanticsTodo] // CHECK:STDERR: fn A => 0; -// CHECK:STDERR: ^~ +// CHECK:STDERR: ^~~~~~~~~~ // CHECK:STDERR: fn A => 0; diff --git a/toolchain/check/testdata/lambda/lambda.carbon b/toolchain/check/testdata/lambda/lambda.carbon index 9a90f441d73e..926156d35c0e 100644 --- a/toolchain/check/testdata/lambda/lambda.carbon +++ b/toolchain/check/testdata/lambda/lambda.carbon @@ -344,9 +344,9 @@ fn F() { library "[[@TEST_NAME]]"; fn F() { - // CHECK:STDERR: fail_todo_terse_body.carbon:[[@LINE+4]]:16: error: semantics TODO: `HandleTerseBodyArrow` [SemanticsTodo] + // CHECK:STDERR: fail_todo_terse_body.carbon:[[@LINE+4]]:4: error: semantics TODO: `terse lambda body` [SemanticsTodo] // CHECK:STDERR: (fn (x: i32) => x); - // CHECK:STDERR: ^~ + // CHECK:STDERR: ^~~~~~~~~~~~~~~~ // CHECK:STDERR: (fn (x: i32) => x); } diff --git a/toolchain/language_server/testdata/document_symbol/fn_definition.carbon b/toolchain/language_server/testdata/document_symbol/fn_definition.carbon index d24872fef54f..7e2d4c2a82c5 100644 --- a/toolchain/language_server/testdata/document_symbol/fn_definition.carbon +++ b/toolchain/language_server/testdata/document_symbol/fn_definition.carbon @@ -48,7 +48,7 @@ fn Builtin() = "int.make_type_32"; // CHECK:STDOUT: "typeDefinitionProvider": true // CHECK:STDOUT: } // CHECK:STDOUT: } -// CHECK:STDOUT: }Content-Length: 482{{\r}} +// CHECK:STDOUT: }Content-Length: 490{{\r}} // CHECK:STDOUT: {{\r}} // CHECK:STDOUT: { // CHECK:STDOUT: "jsonrpc": "2.0", @@ -56,14 +56,14 @@ fn Builtin() = "int.make_type_32"; // CHECK:STDOUT: "params": { // CHECK:STDOUT: "diagnostics": [ // CHECK:STDOUT: { -// CHECK:STDOUT: "message": "semantics TODO: `HandleTerseBodyArrow`", +// CHECK:STDOUT: "message": "semantics TODO: `HandleFunctionTerseDefinition`", // CHECK:STDOUT: "range": { // CHECK:STDOUT: "end": { -// CHECK:STDOUT: "character": 13, +// CHECK:STDOUT: "character": 17, // CHECK:STDOUT: "line": 2 // CHECK:STDOUT: }, // CHECK:STDOUT: "start": { -// CHECK:STDOUT: "character": 11, +// CHECK:STDOUT: "character": 0, // CHECK:STDOUT: "line": 2 // CHECK:STDOUT: } // CHECK:STDOUT: }, diff --git a/toolchain/parse/handle_function.cpp b/toolchain/parse/handle_function.cpp index 28e06d9ff866..004945530423 100644 --- a/toolchain/parse/handle_function.cpp +++ b/toolchain/parse/handle_function.cpp @@ -63,7 +63,6 @@ auto HandleFunctionSignatureFinish(Context& context) -> void { } case Lex::TokenKind::EqualGreater: { context.AddFunctionDefinitionStart(context.Consume(), state.has_error); - context.AddLeafNode(NodeKind::TerseBodyArrow, *(context.position() - 1)); context.PushState(state, StateKind::FunctionTerseBodyFinish); context.PushStateForExpr(PrecedenceGroup::ForTopLevelExpr()); break; diff --git a/toolchain/parse/handle_lambda.cpp b/toolchain/parse/handle_lambda.cpp index 37a2cf976382..8f30f32b22a4 100644 --- a/toolchain/parse/handle_lambda.cpp +++ b/toolchain/parse/handle_lambda.cpp @@ -45,11 +45,9 @@ static auto ParseLambdaBody(Context& context, Context::State state, bool has_return_type) -> void { if (context.PositionIs(Lex::TokenKind::EqualGreater)) { // Terse body `=> expr` - auto arrow_token = context.Consume(); - context.AddNode(NodeKind::LambdaDefinitionStart, arrow_token, + context.AddNode(NodeKind::LambdaDefinitionStart, context.Consume(), state.has_error); state.has_error = false; - context.AddLeafNode(NodeKind::TerseBodyArrow, arrow_token); context.PushState(state, StateKind::LambdaBodyFinish); context.PushStateForExpr(PrecedenceGroup::ForTopLevelExpr()); } else if (context.PositionIs(Lex::TokenKind::OpenCurlyBrace)) { diff --git a/toolchain/parse/node_kind.def b/toolchain/parse/node_kind.def index dfb8e6dd7999..46017d80e9e1 100644 --- a/toolchain/parse/node_kind.def +++ b/toolchain/parse/node_kind.def @@ -203,7 +203,6 @@ CARBON_PARSE_NODE_KIND_DECLARATION(FunctionTerseDefinition) CARBON_PARSE_NODE_KIND_DECLARATION(FunctionDecl) CARBON_PARSE_NODE_KIND_DECLARATION(LambdaDefinitionStart) CARBON_PARSE_NODE_KIND_DECLARATION(Lambda) -CARBON_PARSE_NODE_KIND_DECLARATION(TerseBodyArrow) CARBON_PARSE_NODE_KIND_DECLARATION(BuiltinFunctionDefinitionStart) CARBON_PARSE_NODE_KIND_DECLARATION(BuiltinName) CARBON_PARSE_NODE_KIND_DECLARATION(BuiltinFunctionDefinition) diff --git a/toolchain/parse/testdata/function/default_values.carbon b/toolchain/parse/testdata/function/default_values.carbon index f3575860adc7..39c7131e6d20 100644 --- a/toolchain/parse/testdata/function/default_values.carbon +++ b/toolchain/parse/testdata/function/default_values.carbon @@ -86,7 +86,6 @@ var b: auto = fn (x: i32 = 0) => x; // CHECK:STDOUT: │ │ │ ├─DefaultValuePattern '=' // CHECK:STDOUT: │ │ ├─ExplicitParamList ')' // CHECK:STDOUT: │ │ ╭─LambdaDefinitionStart '=>' -// CHECK:STDOUT: │ │ ├─TerseBodyArrow '=>' // CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'x' // CHECK:STDOUT: │ ├─Lambda 'fn' // CHECK:STDOUT: ├─VariableDecl ';' diff --git a/toolchain/parse/testdata/function/terse.carbon b/toolchain/parse/testdata/function/terse.carbon index 1904fc6f97d6..148f240250a2 100644 --- a/toolchain/parse/testdata/function/terse.carbon +++ b/toolchain/parse/testdata/function/terse.carbon @@ -23,7 +23,6 @@ fn G(x: i32) -> i32 => x; // CHECK:STDOUT: │ │ ├─LetBindingPattern ':' // CHECK:STDOUT: │ ├─ExplicitParamList ')' // CHECK:STDOUT: │ ╭─FunctionDefinitionStart '=>' -// CHECK:STDOUT: │ ├─TerseBodyArrow '=>' // CHECK:STDOUT: │ ├─IdentifierNameExpr 'x' // CHECK:STDOUT: ├─FunctionTerseDefinition ';' // CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn' @@ -37,7 +36,6 @@ fn G(x: i32) -> i32 => x; // CHECK:STDOUT: │ │ ╭─IntTypeLiteral 'i32' // CHECK:STDOUT: │ ├─ReturnType '->' // CHECK:STDOUT: │ ╭─FunctionDefinitionStart '=>' -// CHECK:STDOUT: │ ├─TerseBodyArrow '=>' // CHECK:STDOUT: │ ├─IdentifierNameExpr 'x' // CHECK:STDOUT: ├─FunctionTerseDefinition ';' // CHECK:STDOUT: ├─FileEnd '' diff --git a/toolchain/parse/testdata/lambda/lambda.carbon b/toolchain/parse/testdata/lambda/lambda.carbon index 113ffb2f2806..7ca001728d25 100644 --- a/toolchain/parse/testdata/lambda/lambda.carbon +++ b/toolchain/parse/testdata/lambda/lambda.carbon @@ -111,7 +111,6 @@ fn G() { // CHECK:STDOUT: │ │ │ ├─LetBindingPattern ':' // CHECK:STDOUT: │ │ ├─ExplicitParamList ')' // CHECK:STDOUT: │ │ ╭─LambdaDefinitionStart '=>' -// CHECK:STDOUT: │ │ ├─TerseBodyArrow '=>' // CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'x' // CHECK:STDOUT: │ ├─Lambda 'fn' // CHECK:STDOUT: ├─VariableDecl ';' diff --git a/toolchain/parse/typed_nodes.h b/toolchain/parse/typed_nodes.h index e8d66c69942b..ffef3015426c 100644 --- a/toolchain/parse/typed_nodes.h +++ b/toolchain/parse/typed_nodes.h @@ -627,7 +627,6 @@ struct FunctionTerseDefinition { .bracketed_by = FunctionDefinitionStart::Kind}); FunctionDefinitionStartId signature; - TerseBodyArrowId arrow; AnyExprId body; Lex::SemiTokenIndex token; }; @@ -776,9 +775,6 @@ struct VariablePattern { using CodeBlockStart = LeafNode; -using TerseBodyArrow = - LeafNode; - // A code block: `{ statement; statement; ... }`. struct CodeBlock { static constexpr auto Kind = @@ -809,7 +805,6 @@ struct Lambda { .bracketed_by = LambdaDefinitionStart::Kind}); LambdaDefinitionStartId signature; - std::optional arrow; std::optional terse_body; llvm::SmallVector body; // Use a generic token index because the token might be `}` or `fn`.