From c0b2cc592163a2057df9c681800cdf181990fa0b Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 13 Nov 2026 22:45:00 +0000 Subject: [PATCH] Parse `where` assignment declarations in impl definitions (#8136) These were introduced in proposal #5168. Details: https://github.com/carbon-language/carbon-lang/blob/b7ea32c3a49620fae12f0b2298c81d429a20eab3/proposals/p005168-forward-impl-declaration-of-an-incomplete-interface.md#associated-constants-may-be-assigned-in-the-body-of-an-impl-definition --- toolchain/check/handle_where.cpp | 35 ++++ toolchain/check/node_stack.h | 2 + .../testdata/impl/use_assoc_entity.carbon | 23 +-- .../testdata/impl/where_assignment.carbon | 99 +++++++++ toolchain/diagnostics/kind.def | 5 + toolchain/parse/handle_decl_scope_loop.cpp | 3 + toolchain/parse/handle_statement.cpp | 3 +- toolchain/parse/handle_where.cpp | 59 ++++++ toolchain/parse/node_kind.def | 4 + toolchain/parse/state.def | 27 ++- .../testdata/where_assignment/basic.carbon | 41 ++++ .../testdata/where_assignment/invalid.carbon | 190 ++++++++++++++++++ .../testdata/where_assignment/nested.carbon | 37 ++++ toolchain/parse/typed_nodes.h | 23 +++ 14 files changed, 529 insertions(+), 22 deletions(-) create mode 100644 toolchain/check/testdata/impl/where_assignment.carbon create mode 100644 toolchain/parse/handle_where.cpp create mode 100644 toolchain/parse/testdata/where_assignment/basic.carbon create mode 100644 toolchain/parse/testdata/where_assignment/invalid.carbon create mode 100644 toolchain/parse/testdata/where_assignment/nested.carbon diff --git a/toolchain/check/handle_where.cpp b/toolchain/check/handle_where.cpp index 4383317502de..07a70ec5a35a 100644 --- a/toolchain/check/handle_where.cpp +++ b/toolchain/check/handle_where.cpp @@ -626,4 +626,39 @@ auto HandleParseNode(Context& context, Parse::WhereExprId node_id) -> bool { return true; } +auto HandleParseNode(Context& context, + Parse::WhereAssignmentIntroducerId node_id) -> bool { + auto scope_inst_id = context.scope_stack().PeekInstId(); + if (!context.insts().Is(scope_inst_id)) { + CARBON_DIAGNOSTIC(WhereAssignmentInWrongScope, Error, + "`where` assignment declaration found in invalid scope; " + "must be in `impl` definition"); + context.emitter().Emit(node_id, WhereAssignmentInWrongScope); + scope_inst_id = SemIR::ErrorInst::InstId; + } + + context.node_stack().Push(node_id, scope_inst_id); + return true; +} + +auto HandleParseNode(Context& /*context*/, + Parse::WhereAssignmentOperatorId /*node_id*/) -> bool { + return true; +} + +auto HandleParseNode(Context& context, Parse::WhereAssignmentDeclId node_id) + -> bool { + [[maybe_unused]] auto rhs_inst_id = context.node_stack().PopExpr(); + [[maybe_unused]] auto lhs_name_id = + context.node_stack() + .Pop(); + auto scope_inst_id = + context.node_stack().Pop(); + if (scope_inst_id == SemIR::ErrorInst::InstId) { + return true; + } + + return context.TODO(node_id, "where assignment decl"); +} + } // namespace Carbon::Check diff --git a/toolchain/check/node_stack.h b/toolchain/check/node_stack.h index 74e691f521f9..bcc957898052 100644 --- a/toolchain/check/node_stack.h +++ b/toolchain/check/node_stack.h @@ -423,6 +423,7 @@ class NodeStack { case Parse::NodeKind::ShortCircuitOperandOr: case Parse::NodeKind::StructLiteralField: case Parse::NodeKind::StructPatternDesignatedField: + case Parse::NodeKind::WhereAssignmentIntroducer: return Id::KindFor(); case Parse::NodeKind::ExplicitParamList: case Parse::NodeKind::IfCondition: @@ -552,6 +553,7 @@ class NodeStack { case Parse::NodeKind::TupleLiteralComma: case Parse::NodeKind::TypeOfExprKeyword: case Parse::NodeKind::TypeOfExprOpenParen: + case Parse::NodeKind::WhereAssignmentOperator: case Parse::NodeKind::WhereOperand: case Parse::NodeKind::WhileCondition: return Id::Kind::Invalid; diff --git a/toolchain/check/testdata/impl/use_assoc_entity.carbon b/toolchain/check/testdata/impl/use_assoc_entity.carbon index f549fe6df6c2..fdc00a5cd596 100644 --- a/toolchain/check/testdata/impl/use_assoc_entity.carbon +++ b/toolchain/check/testdata/impl/use_assoc_entity.carbon @@ -291,27 +291,14 @@ class A {} // CHECK:STDERR: ╰──── // CHECK:STDERR: impl A as J { - // CHECK:STDERR: ╭─┤ fail_todo_associated_constant_use_before_value_known.carbon:[[@LINE+13]]:3 - // CHECK:STDERR: -> │ where .U = T; - // CHECK:STDERR: · ━━┳━━ - // CHECK:STDERR: · ┗━━┫ error: unrecognized declaration introducer [UnrecognizedDecl] - // CHECK:STDERR: ╰──── - // CHECK:STDERR: - // CHECK:STDERR: ╭─┤ fail_todo_associated_constant_use_before_value_known.carbon:[[@LINE+7]]:3 - // CHECK:STDERR: -> │ where .U = T; - // CHECK:STDERR: · ━━┳━━ - // CHECK:STDERR: · ┗━━┫ error: semantics TODO: `handle invalid parse trees in `check`` - // CHECK:STDERR: · ┃ [SemanticsTodo] - // CHECK:STDERR: ╰──── - // CHECK:STDERR: - where .U = T; // CHECK:STDERR: ╭─┤ fail_todo_associated_constant_use_before_value_known.carbon:[[@LINE+6]]:3 - // CHECK:STDERR: -> │ where .T = (); - // CHECK:STDERR: · ━━┳━━ - // CHECK:STDERR: · ┗━━┫ error: unrecognized declaration introducer [UnrecognizedDecl] + // CHECK:STDERR: -> │ where U = T; + // CHECK:STDERR: · ━━━━━━┳━━━━━ + // CHECK:STDERR: · ┗━━┫ error: semantics TODO: `where assignment decl` [SemanticsTodo] // CHECK:STDERR: ╰──── // CHECK:STDERR: - where .T = (); + where U = T; + where T = (); } // --- associated_fn_use_in_def_before_decl.carbon diff --git a/toolchain/check/testdata/impl/where_assignment.carbon b/toolchain/check/testdata/impl/where_assignment.carbon new file mode 100644 index 000000000000..38e64b5b017c --- /dev/null +++ b/toolchain/check/testdata/impl/where_assignment.carbon @@ -0,0 +1,99 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/primitives.carbon +// +// AUTOUPDATE +// TIP: To test this file alone, run: +// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/impl/where_assignment.carbon +// TIP: To dump output, run: +// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/impl/where_assignment.carbon + +// --- fail_todo_basic.carbon +library "[[@TEST_NAME]]"; + +interface Z { + let Z1: type; +} + +// CHECK:STDERR: ╭─┤ fail_todo_basic.carbon:[[@LINE+11]]:1 +// CHECK:STDERR: │ let Z1: type; +// CHECK:STDERR: · ────┬─── +// CHECK:STDERR: · ╰──┤ associated constant declared here [AssociatedConstantHere] +// CHECK:STDERR: ┆ +// CHECK:STDERR: -> │ impl () as Z { +// CHECK:STDERR: · ━━━━━┳━━━━━━━━ +// CHECK:STDERR: · ┗━━┫ error: associated constant Z1 not given a value in impl of interface Z +// CHECK:STDERR: · ┃ [ImplAssociatedConstantNeedsValue] +// CHECK:STDERR: ╰──── +// CHECK:STDERR: +impl () as Z { + // CHECK:STDERR: ╭─┤ fail_todo_basic.carbon:[[@LINE+6]]:3 + // CHECK:STDERR: -> │ where Z1 = type; + // CHECK:STDERR: · ━━━━━━━━┳━━━━━━━ + // CHECK:STDERR: · ┗━━┫ error: semantics TODO: `where assignment decl` [SemanticsTodo] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + where Z1 = type; +} + +// --- fail_todo_basic_in_class.carbon +library "[[@TEST_NAME]]"; + +interface Z { + let Z1: type; +} + +class C { + // CHECK:STDERR: ╭─┤ fail_todo_basic_in_class.carbon:[[@LINE+11]]:3 + // CHECK:STDERR: │ let Z1: type; + // CHECK:STDERR: · ────┬─── + // CHECK:STDERR: · ╰──┤ associated constant declared here [AssociatedConstantHere] + // CHECK:STDERR: ┆ + // CHECK:STDERR: -> │ impl as Z { + // CHECK:STDERR: · ━━━┳━━━━━━━ + // CHECK:STDERR: · ┗━━┫ error: associated constant Z1 not given a value in impl of interface Z + // CHECK:STDERR: · ┃ [ImplAssociatedConstantNeedsValue] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + impl as Z { + // CHECK:STDERR: ╭─┤ fail_todo_basic_in_class.carbon:[[@LINE+6]]:5 + // CHECK:STDERR: -> │ where Z1 = type; + // CHECK:STDERR: · ━━━━━━━━┳━━━━━━━ + // CHECK:STDERR: · ┗━━┫ error: semantics TODO: `where assignment decl` [SemanticsTodo] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + where Z1 = type; + } +} + +// --- fail_invalid_scope.carbon +library "[[@TEST_NAME]]"; + +let Z1: type = type; +// CHECK:STDERR: ╭─┤ fail_invalid_scope.carbon:[[@LINE+8]]:1 +// CHECK:STDERR: -> │ where Z1 = type; +// CHECK:STDERR: · ┳━━━━ +// CHECK:STDERR: · ┗━━┫ error: `where` assignment declaration found in invalid scope; must be in +// CHECK:STDERR: · ┃ `impl` definition +// CHECK:STDERR: · ┃ [WhereAssignmentInWrongScope] +// CHECK:STDERR: ╰──── +// CHECK:STDERR: +where Z1 = type; + +// --- fail_class_invalid_scope.carbon +library "[[@TEST_NAME]]"; + +class C { + let Z1: type = type; + // CHECK:STDERR: ╭─┤ fail_class_invalid_scope.carbon:[[@LINE+8]]:3 + // CHECK:STDERR: -> │ where Z1 = type; + // CHECK:STDERR: · ┳━━━━ + // CHECK:STDERR: · ┗━━┫ error: `where` assignment declaration found in invalid scope; must be in + // CHECK:STDERR: · ┃ `impl` definition + // CHECK:STDERR: · ┃ [WhereAssignmentInWrongScope] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + where Z1 = type; +} diff --git a/toolchain/diagnostics/kind.def b/toolchain/diagnostics/kind.def index 82fbe010cb18..0b4ae0d18c06 100644 --- a/toolchain/diagnostics/kind.def +++ b/toolchain/diagnostics/kind.def @@ -202,6 +202,11 @@ CARBON_DIAGNOSTIC_KIND(ExpectedIdentifierForFriend) // Alias diagnostics. CARBON_DIAGNOSTIC_KIND(ExpectedAliasInitializer) +// Where assignment declaration diagnostics. +CARBON_DIAGNOSTIC_KIND(WhereAssignmentMissingIdentifier) +CARBON_DIAGNOSTIC_KIND(WhereAssignmentMissingEquals) +CARBON_DIAGNOSTIC_KIND(WhereAssignmentInWrongScope) + // Where requirement diagnostics. CARBON_DIAGNOSTIC_KIND(ExpectedRequirementOperator) CARBON_DIAGNOSTIC_KIND(RequirementEqualAfterNonDesignator) diff --git a/toolchain/parse/handle_decl_scope_loop.cpp b/toolchain/parse/handle_decl_scope_loop.cpp index bde08bbd8426..0517614fe456 100644 --- a/toolchain/parse/handle_decl_scope_loop.cpp +++ b/toolchain/parse/handle_decl_scope_loop.cpp @@ -150,6 +150,8 @@ static constexpr auto DeclIntroducers = [] { NodeKind::VariableIntroducer, StateKind::VarAsRegular); set_contextual(Lex::TokenKind::Var, ClassContext, NodeKind::VariableIntroducer, StateKind::VarAsRegular); + set(Lex::TokenKind::Where, NodeKind::WhereAssignmentIntroducer, + StateKind::WhereAssignment); set(Lex::TokenKind::Inline, NodeKind::InlineIntroducer, StateKind::InlineDeclAfterIntroducer); @@ -240,6 +242,7 @@ static auto ResolveAmbiguousTokenAsDeclaration(Context& context, case Lex::TokenKind::Namespace: case Lex::TokenKind::Require: case Lex::TokenKind::Var: + case Lex::TokenKind::Where: #define CARBON_PARSE_NODE_KIND(Name) #define CARBON_PARSE_NODE_KIND_TOKEN_MODIFIER(Name) case Lex::TokenKind::Name: #include "toolchain/parse/node_kind.def" diff --git a/toolchain/parse/handle_statement.cpp b/toolchain/parse/handle_statement.cpp index fc55a6f618a0..12d6d35d45bf 100644 --- a/toolchain/parse/handle_statement.cpp +++ b/toolchain/parse/handle_statement.cpp @@ -75,7 +75,8 @@ auto HandleStatement(Context& context) -> void { case Lex::TokenKind::Observe: // We intentionally don't handle Package here, because `package.` can be // used at the start of an expression, and it's not worth disambiguating it. - case Lex::TokenKind::Var: { + case Lex::TokenKind::Var: + case Lex::TokenKind::Where: { context.PushState(StateKind::DeclAsRegular); break; } diff --git a/toolchain/parse/handle_where.cpp b/toolchain/parse/handle_where.cpp new file mode 100644 index 000000000000..0073d13e1b54 --- /dev/null +++ b/toolchain/parse/handle_where.cpp @@ -0,0 +1,59 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception + +#include "toolchain/lex/token_kind.h" +#include "toolchain/parse/context.h" +#include "toolchain/parse/handle.h" +#include "toolchain/parse/node_kind.h" +#include "toolchain/parse/precedence.h" +#include "toolchain/parse/state.h" +#include "toolchain/parse/typed_nodes.h" + +namespace Carbon::Parse { + +auto HandleWhereAssignment(Context& context) -> void { + auto state = context.PopState(); + + if (!context.ConsumeAndAddLeafNodeIf( + Lex::TokenKind::Identifier, + NodeKind::IdentifierNameNotBeforeSignature)) { + if (!state.has_error) { + CARBON_DIAGNOSTIC( + WhereAssignmentMissingIdentifier, Error, + "expected identifier in `where` assignment declaration"); + context.emitter().Emit(context.PointAfterPreviousToken(), + WhereAssignmentMissingIdentifier); + } + context.RecoverFromDeclError(state, NodeKind::WhereAssignmentDecl, + /*skip_past_likely_end=*/true); + return; + } + + auto eq_token = context.ConsumeIf(Lex::TokenKind::Equal); + if (!eq_token) { + if (!state.has_error) { + CARBON_DIAGNOSTIC(WhereAssignmentMissingEquals, Error, + "missing `=` in `where` assignment"); + context.emitter().Emit(context.PointAfterPreviousToken(), + WhereAssignmentMissingEquals); + } + context.RecoverFromDeclError(state, NodeKind::WhereAssignmentDecl, + /*skip_past_likely_end=*/true); + return; + } + + state.token = *eq_token; + context.PushState(state, StateKind::WhereAssignmentDecl); + context.PushStateForExpr(PrecedenceGroup::ForRequirements()); +} + +auto HandleWhereAssignmentDecl(Context& context) -> void { + auto state = context.PopState(); + context.AddNode(NodeKind::WhereAssignmentOperator, state.token, + state.has_error); + context.AddNodeExpectingDeclSemi(state, NodeKind::WhereAssignmentDecl, + Lex::TokenKind::Where, + /*is_def_allowed=*/false); +} +} // namespace Carbon::Parse diff --git a/toolchain/parse/node_kind.def b/toolchain/parse/node_kind.def index c4146d051703..e5e7cd16f960 100644 --- a/toolchain/parse/node_kind.def +++ b/toolchain/parse/node_kind.def @@ -404,6 +404,10 @@ CARBON_PARSE_NODE_KIND_EXPRESSION(RequirementImpls) CARBON_PARSE_NODE_KIND_EXPRESSION(WhereExpr) CARBON_PARSE_NODE_KIND_EXPRESSION(WhereOperand) +CARBON_PARSE_NODE_KIND_EXPRESSION(WhereAssignmentIntroducer) +CARBON_PARSE_NODE_KIND_EXPRESSION(WhereAssignmentOperator) +CARBON_PARSE_NODE_KIND_EXPRESSION(WhereAssignmentDecl) + CARBON_PARSE_NODE_KIND_EXPRESSION(IfExprIf) CARBON_PARSE_NODE_KIND_EXPRESSION(IfExprThen) CARBON_PARSE_NODE_KIND_EXPRESSION(IfExprElse) diff --git a/toolchain/parse/state.def b/toolchain/parse/state.def index 825ef59d68ab..5217ee77297f 100644 --- a/toolchain/parse/state.def +++ b/toolchain/parse/state.def @@ -747,6 +747,27 @@ CARBON_PARSE_STATE(RequirementOperatorFinish) // (state done) CARBON_PARSE_STATE(WhereFinish) +// Handles a `where` assignment decl after the introducer. +// +// where = <...> +// ^~~~~~~~~~~~~~ +// 1. Expr +// 2. WhereAssignmentDecl +// +// where ; +// ^~~~~~~ +// (state done) +CARBON_PARSE_STATE(WhereAssignment) + +// Handles the end of a `where` assignment decl. +// +// where <...> ; +// ^ +// where ; +// ^~~~~~~ +// (state done) +CARBON_PARSE_STATE(WhereAssignmentDecl) + // Handles the `;` for an expression statement, which is different from most // keyword statements. // @@ -761,8 +782,8 @@ CARBON_PARSE_STATE(ExprStatementFinish) // // friend ; // ^~~~~~~~~~~~~~ -// friend ??? ; -// ^~~~~ +// friend ; +// ^~~~~~~ // (state done) CARBON_PARSE_STATE(FriendDecl) @@ -1032,7 +1053,7 @@ CARBON_PARSE_STATE(Package) // alias <...> // ^ // 1. DeclNameAndParams -// 2. AliasInitializer +// 2. AliasAfterName CARBON_PARSE_STATE(Alias) // Handles `alias` after the name. diff --git a/toolchain/parse/testdata/where_assignment/basic.carbon b/toolchain/parse/testdata/where_assignment/basic.carbon new file mode 100644 index 000000000000..1f9c8def88ab --- /dev/null +++ b/toolchain/parse/testdata/where_assignment/basic.carbon @@ -0,0 +1,41 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE +// TIP: To test this file alone, run: +// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/where_assignment/basic.carbon +// TIP: To dump output, run: +// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/where_assignment/basic.carbon + +impl C as Z { + where Z1 = D.(Y.Y1); + where Z2 = Z1; +} + +// CHECK:STDOUT: - filename: basic.carbon +// CHECK:STDOUT: ╭─FileStart '' +// CHECK:STDOUT: │ ╭─ImplIntroducer 'impl' +// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'C' +// CHECK:STDOUT: │ ├─ImplTypeAs 'as' +// CHECK:STDOUT: │ ├─IdentifierNameExpr 'Z' +// CHECK:STDOUT: │ ╭─ImplDefinitionStart '{' +// CHECK:STDOUT: │ │ ╭─WhereAssignmentIntroducer 'where' +// CHECK:STDOUT: │ │ │ ╭─IdentifierNameNotBeforeSignature 'Z1' +// CHECK:STDOUT: │ │ │ │ ╭─IdentifierNameExpr 'D' +// CHECK:STDOUT: │ │ │ │ │ ╭─ParenExprStart '(' +// CHECK:STDOUT: │ │ │ │ │ │ ╭─IdentifierNameExpr 'Y' +// CHECK:STDOUT: │ │ │ │ │ │ ├─IdentifierNameNotBeforeSignature 'Y1' +// CHECK:STDOUT: │ │ │ │ │ ├─MemberAccessExpr '.' +// CHECK:STDOUT: │ │ │ │ ├─ParenExpr ')' +// CHECK:STDOUT: │ │ │ ├─MemberAccessExpr '.' +// CHECK:STDOUT: │ │ ├─WhereAssignmentOperator '=' +// CHECK:STDOUT: │ ├─WhereAssignmentDecl ';' +// CHECK:STDOUT: │ │ ╭─WhereAssignmentIntroducer 'where' +// CHECK:STDOUT: │ │ │ ╭─IdentifierNameNotBeforeSignature 'Z2' +// CHECK:STDOUT: │ │ │ ├─IdentifierNameExpr 'Z1' +// CHECK:STDOUT: │ │ ├─WhereAssignmentOperator '=' +// CHECK:STDOUT: │ ├─WhereAssignmentDecl ';' +// CHECK:STDOUT: ├─ImplDefinition '}' +// CHECK:STDOUT: ├─FileEnd '' +// CHECK:STDOUT: (root) diff --git a/toolchain/parse/testdata/where_assignment/invalid.carbon b/toolchain/parse/testdata/where_assignment/invalid.carbon new file mode 100644 index 000000000000..668c256fa481 --- /dev/null +++ b/toolchain/parse/testdata/where_assignment/invalid.carbon @@ -0,0 +1,190 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE +// TIP: To test this file alone, run: +// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/where_assignment/invalid.carbon +// TIP: To dump output, run: +// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/where_assignment/invalid.carbon + +// --- fail_self.carbon + +impl C as Z { + // CHECK:STDERR: ╭─┤ fail_self.carbon:[[@LINE+7]]:8 + // CHECK:STDERR: -> │ where Self = 1; + // CHECK:STDERR: · ┳ + // CHECK:STDERR: · ┗━━┫ error: expected identifier in `where` assignment declaration + // CHECK:STDERR: · ┃ [WhereAssignmentMissingIdentifier] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + where Self = 1; +} + +// --- fail_keyword.carbon + +impl C as Z { + // CHECK:STDERR: ╭─┤ fail_keyword.carbon:[[@LINE+7]]:8 + // CHECK:STDERR: -> │ where and = 1; + // CHECK:STDERR: · ┳ + // CHECK:STDERR: · ┗━━┫ error: expected identifier in `where` assignment declaration + // CHECK:STDERR: · ┃ [WhereAssignmentMissingIdentifier] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + where and = 1; +} + +// --- fail_postfix_after_lhs.carbon + +impl C as Z { + // CHECK:STDERR: ╭─┤ fail_postfix_after_lhs.carbon:[[@LINE+7]]:11 + // CHECK:STDERR: -> │ where Z1* = 1; + // CHECK:STDERR: · ┳ + // CHECK:STDERR: · ┗━━┫ error: missing `=` in `where` assignment + // CHECK:STDERR: · ┃ [WhereAssignmentMissingEquals] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + where Z1* = 1; +} + +// --- fail_binary_op_after_lhs.carbon + +impl C as Z { + // CHECK:STDERR: ╭─┤ fail_binary_op_after_lhs.carbon:[[@LINE+7]]:11 + // CHECK:STDERR: -> │ where Z1 + Z2 = 1; + // CHECK:STDERR: · ┳ + // CHECK:STDERR: · ┗━━┫ error: missing `=` in `where` assignment + // CHECK:STDERR: · ┃ [WhereAssignmentMissingEquals] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + where Z1 + Z2 = 1; +} + +// --- fail_designator.carbon + +impl C as Z { + // CHECK:STDERR: ╭─┤ fail_designator.carbon:[[@LINE+7]]:8 + // CHECK:STDERR: -> │ where .Z1 = 1; + // CHECK:STDERR: · ┳ + // CHECK:STDERR: · ┗━━┫ error: expected identifier in `where` assignment declaration + // CHECK:STDERR: · ┃ [WhereAssignmentMissingIdentifier] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + where .Z1 = 1; +} + +// --- fail_lhs_in_parens.carbon + +impl C as Z { + // CHECK:STDERR: ╭─┤ fail_lhs_in_parens.carbon:[[@LINE+7]]:8 + // CHECK:STDERR: -> │ where (Z1) = 1; + // CHECK:STDERR: · ┳ + // CHECK:STDERR: · ┗━━┫ error: expected identifier in `where` assignment declaration + // CHECK:STDERR: · ┃ [WhereAssignmentMissingIdentifier] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + where (Z1) = 1; +} + +// --- fail_multiple_assignments.carbon + +impl C as Z { + // CHECK:STDERR: ╭─┤ fail_multiple_assignments.carbon:[[@LINE+7]]:15 + // CHECK:STDERR: -> │ where Z1 = 1 and Z2 = 2; + // CHECK:STDERR: · ┳ + // CHECK:STDERR: · ┗━━┫ error: `where` declarations must end with a `;` + // CHECK:STDERR: · ┃ [ExpectedDeclSemi] + // CHECK:STDERR: ╰──── + // CHECK:STDERR: + where Z1 = 1 and Z2 = 2; +} + +// CHECK:STDOUT: - filename: fail_self.carbon +// CHECK:STDOUT: ╭─FileStart '' +// CHECK:STDOUT: │ ╭─ImplIntroducer 'impl' +// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'C' +// CHECK:STDOUT: │ ├─ImplTypeAs 'as' +// CHECK:STDOUT: │ ├─IdentifierNameExpr 'Z' +// CHECK:STDOUT: │ ╭─ImplDefinitionStart '{' +// CHECK:STDOUT: │ │ ╭─WhereAssignmentIntroducer 'where' +// CHECK:STDOUT: │ ├─WhereAssignmentDecl ';' has_error +// CHECK:STDOUT: ├─ImplDefinition '}' +// CHECK:STDOUT: ├─FileEnd '' +// CHECK:STDOUT: (root) +// CHECK:STDOUT: - filename: fail_keyword.carbon +// CHECK:STDOUT: ╭─FileStart '' +// CHECK:STDOUT: │ ╭─ImplIntroducer 'impl' +// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'C' +// CHECK:STDOUT: │ ├─ImplTypeAs 'as' +// CHECK:STDOUT: │ ├─IdentifierNameExpr 'Z' +// CHECK:STDOUT: │ ╭─ImplDefinitionStart '{' +// CHECK:STDOUT: │ │ ╭─WhereAssignmentIntroducer 'where' +// CHECK:STDOUT: │ ├─WhereAssignmentDecl ';' has_error +// CHECK:STDOUT: ├─ImplDefinition '}' +// CHECK:STDOUT: ├─FileEnd '' +// CHECK:STDOUT: (root) +// CHECK:STDOUT: - filename: fail_postfix_after_lhs.carbon +// CHECK:STDOUT: ╭─FileStart '' +// CHECK:STDOUT: │ ╭─ImplIntroducer 'impl' +// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'C' +// CHECK:STDOUT: │ ├─ImplTypeAs 'as' +// CHECK:STDOUT: │ ├─IdentifierNameExpr 'Z' +// CHECK:STDOUT: │ ╭─ImplDefinitionStart '{' +// CHECK:STDOUT: │ │ ╭─WhereAssignmentIntroducer 'where' +// CHECK:STDOUT: │ │ ├─IdentifierNameNotBeforeSignature 'Z1' +// CHECK:STDOUT: │ ├─WhereAssignmentDecl ';' has_error +// CHECK:STDOUT: ├─ImplDefinition '}' +// CHECK:STDOUT: ├─FileEnd '' +// CHECK:STDOUT: (root) +// CHECK:STDOUT: - filename: fail_binary_op_after_lhs.carbon +// CHECK:STDOUT: ╭─FileStart '' +// CHECK:STDOUT: │ ╭─ImplIntroducer 'impl' +// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'C' +// CHECK:STDOUT: │ ├─ImplTypeAs 'as' +// CHECK:STDOUT: │ ├─IdentifierNameExpr 'Z' +// CHECK:STDOUT: │ ╭─ImplDefinitionStart '{' +// CHECK:STDOUT: │ │ ╭─WhereAssignmentIntroducer 'where' +// CHECK:STDOUT: │ │ ├─IdentifierNameNotBeforeSignature 'Z1' +// CHECK:STDOUT: │ ├─WhereAssignmentDecl ';' has_error +// CHECK:STDOUT: ├─ImplDefinition '}' +// CHECK:STDOUT: ├─FileEnd '' +// CHECK:STDOUT: (root) +// CHECK:STDOUT: - filename: fail_designator.carbon +// CHECK:STDOUT: ╭─FileStart '' +// CHECK:STDOUT: │ ╭─ImplIntroducer 'impl' +// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'C' +// CHECK:STDOUT: │ ├─ImplTypeAs 'as' +// CHECK:STDOUT: │ ├─IdentifierNameExpr 'Z' +// CHECK:STDOUT: │ ╭─ImplDefinitionStart '{' +// CHECK:STDOUT: │ │ ╭─WhereAssignmentIntroducer 'where' +// CHECK:STDOUT: │ ├─WhereAssignmentDecl ';' has_error +// CHECK:STDOUT: ├─ImplDefinition '}' +// CHECK:STDOUT: ├─FileEnd '' +// CHECK:STDOUT: (root) +// CHECK:STDOUT: - filename: fail_lhs_in_parens.carbon +// CHECK:STDOUT: ╭─FileStart '' +// CHECK:STDOUT: │ ╭─ImplIntroducer 'impl' +// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'C' +// CHECK:STDOUT: │ ├─ImplTypeAs 'as' +// CHECK:STDOUT: │ ├─IdentifierNameExpr 'Z' +// CHECK:STDOUT: │ ╭─ImplDefinitionStart '{' +// CHECK:STDOUT: │ │ ╭─WhereAssignmentIntroducer 'where' +// CHECK:STDOUT: │ ├─WhereAssignmentDecl ';' has_error +// CHECK:STDOUT: ├─ImplDefinition '}' +// CHECK:STDOUT: ├─FileEnd '' +// CHECK:STDOUT: (root) +// CHECK:STDOUT: - filename: fail_multiple_assignments.carbon +// CHECK:STDOUT: ╭─FileStart '' +// CHECK:STDOUT: │ ╭─ImplIntroducer 'impl' +// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'C' +// CHECK:STDOUT: │ ├─ImplTypeAs 'as' +// CHECK:STDOUT: │ ├─IdentifierNameExpr 'Z' +// CHECK:STDOUT: │ ╭─ImplDefinitionStart '{' +// CHECK:STDOUT: │ │ ╭─WhereAssignmentIntroducer 'where' +// CHECK:STDOUT: │ │ │ ╭─IdentifierNameNotBeforeSignature 'Z1' +// CHECK:STDOUT: │ │ │ ├─IntLiteral '1' +// CHECK:STDOUT: │ │ ├─WhereAssignmentOperator '=' +// CHECK:STDOUT: │ ├─WhereAssignmentDecl ';' has_error +// CHECK:STDOUT: ├─ImplDefinition '}' +// CHECK:STDOUT: ├─FileEnd '' +// CHECK:STDOUT: (root) diff --git a/toolchain/parse/testdata/where_assignment/nested.carbon b/toolchain/parse/testdata/where_assignment/nested.carbon new file mode 100644 index 000000000000..13d1eed32ca2 --- /dev/null +++ b/toolchain/parse/testdata/where_assignment/nested.carbon @@ -0,0 +1,37 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE +// TIP: To test this file alone, run: +// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/where_assignment/nested.carbon +// TIP: To dump output, run: +// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/where_assignment/nested.carbon + +impl C as Z { + where Z2 = (Y where .Y1 = Z1); +} + +// CHECK:STDOUT: - filename: nested.carbon +// CHECK:STDOUT: ╭─FileStart '' +// CHECK:STDOUT: │ ╭─ImplIntroducer 'impl' +// CHECK:STDOUT: │ │ ╭─IdentifierNameExpr 'C' +// CHECK:STDOUT: │ ├─ImplTypeAs 'as' +// CHECK:STDOUT: │ ├─IdentifierNameExpr 'Z' +// CHECK:STDOUT: │ ╭─ImplDefinitionStart '{' +// CHECK:STDOUT: │ │ ╭─WhereAssignmentIntroducer 'where' +// CHECK:STDOUT: │ │ │ ╭─IdentifierNameNotBeforeSignature 'Z2' +// CHECK:STDOUT: │ │ │ │ ╭─ParenExprStart '(' +// CHECK:STDOUT: │ │ │ │ │ ╭─IdentifierNameExpr 'Y' +// CHECK:STDOUT: │ │ │ │ │ ╭─WhereOperand 'where' +// CHECK:STDOUT: │ │ │ │ │ │ ╭─IdentifierNameNotBeforeSignature 'Y1' +// CHECK:STDOUT: │ │ │ │ │ │ ╭─DesignatorExpr '.' +// CHECK:STDOUT: │ │ │ │ │ │ ├─IdentifierNameExpr 'Z1' +// CHECK:STDOUT: │ │ │ │ │ ├─RequirementEqual '=' +// CHECK:STDOUT: │ │ │ │ ├─WhereExpr 'where' +// CHECK:STDOUT: │ │ │ ├─ParenExpr ')' +// CHECK:STDOUT: │ │ ├─WhereAssignmentOperator '=' +// CHECK:STDOUT: │ ├─WhereAssignmentDecl ';' +// CHECK:STDOUT: ├─ImplDefinition '}' +// CHECK:STDOUT: ├─FileEnd '' +// CHECK:STDOUT: (root) diff --git a/toolchain/parse/typed_nodes.h b/toolchain/parse/typed_nodes.h index a65a42e7c219..92ba151e5678 100644 --- a/toolchain/parse/typed_nodes.h +++ b/toolchain/parse/typed_nodes.h @@ -1490,6 +1490,29 @@ struct WhereExpr { CommaSeparatedList requirements; }; +// Where assignment declaration nodes +// -------------------------------- + +using WhereAssignmentIntroducer = + LeafNode; + +struct WhereAssignmentOperator { + static constexpr auto Kind = + NodeKind::WhereAssignmentOperator.Define({.child_count = 2}); + IdentifierNameNotBeforeSignatureId lhs; + Lex::EqualTokenIndex token; + AnyExprId rhs; +}; + +struct WhereAssignmentDecl { + static constexpr auto Kind = NodeKind::WhereAssignmentDecl.Define( + {.category = NodeCategory::Decl, + .bracketed_by = WhereAssignmentIntroducer::Kind}); + WhereAssignmentIntroducerId introducer; + WhereAssignmentOperatorId op; + Lex::SemiTokenIndex token; +}; + // Choice nodes // ------------