From c53b248800773659bb2d938ca06cf5ab94b0bd66 Mon Sep 17 00:00:00 2001 From: josh11b Date: Mon, 13 Nov 2023 11:06:54 -0800 Subject: [PATCH] Abbreviate "parameter" -> "param" (#3392) Part of switching to the [abbreviations we've decided to use](https://docs.google.com/document/d/1RRYMm42osyqhI2LyjrjockYCutQ5dOf8Abu50kTrkX0/edit?resourcekey=0-kHyqOESbOHmzZphUbtLrTw#heading=h.pph7i5m5un7q). I will rename files in a follow-up PR. --------- Co-authored-by: Jon Ross-Perkins --- toolchain/check/context.cpp | 4 +- toolchain/check/convert.cpp | 4 +- toolchain/check/handle_function.cpp | 11 +- toolchain/check/handle_name.cpp | 2 +- toolchain/check/handle_parameter_list.cpp | 24 ++-- toolchain/check/handle_pattern_binding.cpp | 25 ++-- toolchain/check/node_stack.h | 8 +- .../testdata/basics/raw_and_textual_ir.carbon | 2 +- toolchain/check/testdata/basics/raw_ir.carbon | 2 +- .../check/testdata/class/fail_self.carbon | 2 +- .../pointer/fail_address_of_value.carbon | 6 +- toolchain/diagnostics/diagnostic_kind.def | 10 +- toolchain/lower/file_context.cpp | 4 +- toolchain/lower/handle.cpp | 9 +- toolchain/parse/context.h | 7 +- toolchain/parse/handle_brace_expr.cpp | 109 ++++++++---------- toolchain/parse/handle_call_expr.cpp | 6 +- .../parse/handle_decl_name_and_params.cpp | 15 ++- toolchain/parse/handle_function.cpp | 4 +- toolchain/parse/handle_parameter.cpp | 84 +++++++------- toolchain/parse/handle_paren_expr.cpp | 16 +-- toolchain/parse/handle_pattern.cpp | 18 +-- toolchain/parse/node_kind.def | 20 ++-- toolchain/parse/state.def | 68 +++++------ .../basics/fail_invalid_designators.carbon | 4 +- .../testdata/basics/function_call.carbon | 4 +- .../parse/testdata/basics/multifile.carbon | 8 +- .../testdata/basics/numeric_literals.carbon | 4 +- toolchain/parse/testdata/basics/parens.carbon | 4 +- toolchain/parse/testdata/class/basic.carbon | 4 +- .../testdata/class/fn_definitions.carbon | 20 ++-- .../for/fail_colon_instead_of_in.carbon | 4 +- .../testdata/for/fail_missing_cond.carbon | 4 +- .../parse/testdata/for/fail_missing_in.carbon | 4 +- .../testdata/for/fail_missing_var.carbon | 4 +- .../testdata/for/fail_returned_var.carbon | 4 +- .../testdata/for/fail_square_brackets.carbon | 4 +- toolchain/parse/testdata/for/nested.carbon | 4 +- toolchain/parse/testdata/for/simple.carbon | 4 +- .../testdata/function/declaration/addr.carbon | 4 +- .../function/declaration/basic.carbon | 4 +- .../fail_missing_implicit_close.carbon | 4 +- ...skip_indented_newline_until_outdent.carbon | 4 +- ...ail_skip_indented_newline_with_semi.carbon | 4 +- ..._skip_indented_newline_without_semi.carbon | 4 +- .../fail_skip_to_newline_without_semi.carbon | 4 +- .../fail_skip_without_semi_to_curly.carbon | 4 +- .../fail_with_identifier_as_param.carbon | 4 +- .../declaration/implicit_empty.carbon | 8 +- .../declaration/implicit_params.carbon | 10 +- .../function/declaration/params.carbon | 6 +- .../declaration/with_return_type.carbon | 4 +- .../testdata/function/definition/basic.carbon | 4 +- .../fail_identifier_in_statements.carbon | 4 +- .../function/definition/with_params.carbon | 6 +- .../definition/with_return_type.carbon | 4 +- .../generics/deduced_params/empty.carbon | 16 +-- .../deduced_params/fail_no_parens.carbon | 16 +-- .../generics/deduced_params/one.carbon | 16 +-- .../deduced_params/one_suffix_comma.carbon | 20 ++-- .../generics/deduced_params/six.carbon | 36 +++--- .../generics/deduced_params/two.carbon | 20 ++-- .../deduced_params/two_suffix_comma.carbon | 24 ++-- .../generics/generic_params/basic.carbon | 4 +- .../generics/generic_params/template.carbon | 4 +- .../generic_params/template_addr.carbon | 4 +- .../testdata/generics/interface/basic.carbon | 16 +-- .../interface/fail_no_impl_allowed.carbon | 8 +- .../interface/fail_self_param_syntax.carbon | 16 +-- .../generics/interface/non_instance_fn.carbon | 4 +- .../generics/interface/self_pointer.carbon | 16 +-- .../generics/named_constraint/basic.carbon | 4 +- .../fail_no_impl_allowed.carbon | 8 +- .../testdata/generics/params/empty.carbon | 8 +- .../parse/testdata/generics/params/one.carbon | 8 +- .../generics/params/one_suffix_comma.carbon | 12 +- .../parse/testdata/generics/params/six.carbon | 28 ++--- .../parse/testdata/generics/params/two.carbon | 12 +- .../generics/params/two_suffix_comma.carbon | 16 +-- toolchain/parse/testdata/if/basic.carbon | 4 +- toolchain/parse/testdata/if/else.carbon | 4 +- .../testdata/if/fail_else_unbraced.carbon | 4 +- .../parse/testdata/if/fail_errors.carbon | 4 +- .../testdata/if/fail_missing_cond.carbon | 4 +- .../testdata/if/fail_square_brackets.carbon | 4 +- .../parse/testdata/if/fail_unbraced.carbon | 4 +- .../parse/testdata/if_expression/basic.carbon | 8 +- .../fail_condition_missing.carbon | 4 +- .../fail_else_expr_missing.carbon | 4 +- .../if_expression/fail_else_missing.carbon | 4 +- .../fail_then_expr_missing.carbon | 4 +- .../if_expression/fail_then_missing.carbon | 4 +- .../if_expression/fail_top_level_if.carbon | 4 +- .../testdata/if_expression/in_type.carbon | 4 +- .../testdata/if_expression/precedence.carbon | 4 +- .../testdata/let/fail_missing_value.carbon | 4 +- toolchain/parse/testdata/let/let.carbon | 4 +- .../parse/testdata/namespace/basic.carbon | 4 +- .../parse/testdata/namespace/nested.carbon | 4 +- .../parse/testdata/operators/assign.carbon | 4 +- .../testdata/operators/associative.carbon | 4 +- .../operators/fail_chained_assign.carbon | 4 +- .../operators/fail_postincrement.carbon | 4 +- .../operators/fail_precedence_and_or.carbon | 4 +- .../operators/fail_precedence_as.carbon | 4 +- .../operators/fail_precedence_assign.carbon | 4 +- .../operators/fail_precedence_or_and.carbon | 4 +- .../testdata/operators/fail_variety.carbon | 4 +- .../testdata/operators/fixity_in_call.carbon | 4 +- .../operators/fixity_in_params.carbon | 6 +- .../testdata/operators/fixity_in_var.carbon | 4 +- .../operators/fixity_with_assign.carbon | 4 +- .../testdata/operators/postfix_repeat.carbon | 4 +- .../testdata/operators/precedence_as.carbon | 4 +- .../operators/precedence_assign.carbon | 4 +- .../testdata/operators/precedence_not.carbon | 4 +- .../operators/precedence_unary.carbon | 4 +- .../testdata/operators/prefix_repeat.carbon | 4 +- .../operators/recover_prefix_repeat.carbon | 4 +- .../packages/import/fail_after_decl.carbon | 4 +- .../import/fail_after_decl_repeated.carbon | 8 +- .../packages/package/fail_after_decl.carbon | 4 +- .../testdata/pointer/const_pointer.carbon | 12 +- .../fail_pointer_type_in_expression.carbon | 12 +- .../testdata/pointer/pointer_type.carbon | 4 +- .../testdata/pointer/pointer_value.carbon | 4 +- toolchain/parse/testdata/return/basic.carbon | 4 +- toolchain/parse/testdata/return/expr.carbon | 4 +- .../testdata/return/fail_expr_no_semi.carbon | 4 +- .../parse/testdata/return/fail_no_semi.carbon | 4 +- .../return/fail_returned_no_var.carbon | 4 +- .../testdata/return/fail_var_no_semi.carbon | 4 +- .../parse/testdata/return/returned_var.carbon | 4 +- toolchain/parse/testdata/var/var.carbon | 4 +- toolchain/parse/testdata/while/basic.carbon | 4 +- .../parse/testdata/while/fail_no_semi.carbon | 4 +- .../parse/testdata/while/fail_unbraced.carbon | 4 +- toolchain/parse/tree_test.cpp | 17 ++- toolchain/sem_ir/file.cpp | 12 +- toolchain/sem_ir/formatter.cpp | 17 ++- toolchain/sem_ir/inst_kind.def | 4 +- toolchain/sem_ir/typed_insts.h | 8 +- 142 files changed, 614 insertions(+), 640 deletions(-) diff --git a/toolchain/check/context.cpp b/toolchain/check/context.cpp index ef961e67ea3d..be5331ca5cff 100644 --- a/toolchain/check/context.cpp +++ b/toolchain/check/context.cpp @@ -818,11 +818,11 @@ class TypeCompleter { case SemIR::NameReference::Kind: case SemIR::Namespace::Kind: case SemIR::NoOp::Kind: - case SemIR::Parameter::Kind: + case SemIR::Param::Kind: case SemIR::RealLiteral::Kind: case SemIR::Return::Kind: case SemIR::ReturnExpr::Kind: - case SemIR::SelfParameter::Kind: + case SemIR::SelfParam::Kind: case SemIR::SpliceBlock::Kind: case SemIR::StringLiteral::Kind: case SemIR::StructAccess::Kind: diff --git a/toolchain/check/convert.cpp b/toolchain/check/convert.cpp index 3f2dbc32052d..4421d0da9087 100644 --- a/toolchain/check/convert.cpp +++ b/toolchain/check/convert.cpp @@ -962,7 +962,7 @@ CARBON_DIAGNOSTIC(InCallToFunction, Note, "Calling function declared here."); // Convert the object argument in a method call to match the `self` parameter. static auto ConvertSelf(Context& context, Parse::Node call_parse_node, Parse::Node callee_parse_node, - SemIR::SelfParameter self_param, SemIR::InstId self_id) + SemIR::SelfParam self_param, SemIR::InstId self_id) -> SemIR::InstId { if (!self_id.is_valid()) { CARBON_DIAGNOSTIC(MissingObjectInMethodCall, Error, @@ -1045,7 +1045,7 @@ auto ConvertCallArgs(Context& context, Parse::Node call_parse_node, // Check implicit parameters. for (auto implicit_param_id : implicit_param_refs) { auto param = context.insts().Get(implicit_param_id); - if (auto self_param = param.TryAs()) { + if (auto self_param = param.TryAs()) { auto converted_self_id = ConvertSelf( context, call_parse_node, callee_parse_node, *self_param, self_id); if (converted_self_id == SemIR::InstId::BuiltinError) { diff --git a/toolchain/check/handle_function.cpp b/toolchain/check/handle_function.cpp index 3d6ddcee5ba8..d86478f12414 100644 --- a/toolchain/check/handle_function.cpp +++ b/toolchain/check/handle_function.cpp @@ -50,11 +50,10 @@ static auto BuildFunctionDecl(Context& context, bool is_definition) } SemIR::InstBlockId param_refs_id = - context.node_stack().Pop(); + context.node_stack().Pop(); SemIR::InstBlockId implicit_param_refs_id = - context.node_stack() - .PopIf() - .value_or(SemIR::InstBlockId::Empty); + context.node_stack().PopIf().value_or( + SemIR::InstBlockId::Empty); auto name_context = context.decl_name_stack().FinishName(); auto fn_node = context.node_stack() @@ -205,10 +204,10 @@ auto HandleFunctionDefinitionStart(Context& context, Parse::Node parse_node) context.sem_ir().StringifyType(param.type_id(), true)); }); - if (auto fn_param = param.TryAs()) { + if (auto fn_param = param.TryAs()) { context.AddNameToLookup(fn_param->parse_node, fn_param->name_id, param_id); - } else if (auto self_param = param.TryAs()) { + } else if (auto self_param = param.TryAs()) { context.AddNameToLookup(self_param->parse_node, SemIR::NameId::SelfValue, param_id); } else { diff --git a/toolchain/check/handle_name.cpp b/toolchain/check/handle_name.cpp index 69aa232cf7c1..29ff3d8e10ee 100644 --- a/toolchain/check/handle_name.cpp +++ b/toolchain/check/handle_name.cpp @@ -156,7 +156,7 @@ auto HandleMemberAccessExpr(Context& context, Parse::Node parse_node) -> bool { auto& function = context.functions().Get(function_decl->function_id); for (auto param_id : context.inst_blocks().Get(function.implicit_param_refs_id)) { - if (context.insts().Get(param_id).Is()) { + if (context.insts().Get(param_id).Is()) { context.AddInstAndPush( parse_node, SemIR::BoundMethod{ diff --git a/toolchain/check/handle_parameter_list.cpp b/toolchain/check/handle_parameter_list.cpp index a50457cfbf68..737496656b50 100644 --- a/toolchain/check/handle_parameter_list.cpp +++ b/toolchain/check/handle_parameter_list.cpp @@ -6,20 +6,17 @@ namespace Carbon::Check { -auto HandleImplicitParameterList(Context& context, Parse::Node parse_node) - -> bool { - auto refs_id = - context.ParamOrArgEnd(Parse::NodeKind::ImplicitParameterListStart); +auto HandleImplicitParamList(Context& context, Parse::Node parse_node) -> bool { + auto refs_id = context.ParamOrArgEnd(Parse::NodeKind::ImplicitParamListStart); context.node_stack() - .PopAndDiscardSoloParseNode< - Parse::NodeKind::ImplicitParameterListStart>(); + .PopAndDiscardSoloParseNode(); context.node_stack().Push(parse_node, refs_id); // The implicit parameter list's scope extends to the end of the following // parameter list. return true; } -auto HandleImplicitParameterListStart(Context& context, Parse::Node parse_node) +auto HandleImplicitParamListStart(Context& context, Parse::Node parse_node) -> bool { context.PushScope(); context.node_stack().Push(parse_node); @@ -27,23 +24,22 @@ auto HandleImplicitParameterListStart(Context& context, Parse::Node parse_node) return true; } -auto HandleParameterList(Context& context, Parse::Node parse_node) -> bool { - auto refs_id = context.ParamOrArgEnd(Parse::NodeKind::ParameterListStart); +auto HandleParamList(Context& context, Parse::Node parse_node) -> bool { + auto refs_id = context.ParamOrArgEnd(Parse::NodeKind::ParamListStart); context.PopScope(); context.node_stack() - .PopAndDiscardSoloParseNode(); + .PopAndDiscardSoloParseNode(); context.node_stack().Push(parse_node, refs_id); return true; } -auto HandleParameterListComma(Context& context, Parse::Node /*parse_node*/) +auto HandleParamListComma(Context& context, Parse::Node /*parse_node*/) -> bool { context.ParamOrArgComma(); return true; } -auto HandleParameterListStart(Context& context, Parse::Node parse_node) - -> bool { +auto HandleParamListStart(Context& context, Parse::Node parse_node) -> bool { // A parameter list following an implicit parameter list shares the same // scope. // @@ -53,7 +49,7 @@ auto HandleParameterListStart(Context& context, Parse::Node parse_node) // // ... all the earlier parameter should be in scope in the later parameter // lists too. - if (!context.node_stack().PeekIs()) { + if (!context.node_stack().PeekIs()) { context.PushScope(); } context.node_stack().Push(parse_node); diff --git a/toolchain/check/handle_pattern_binding.cpp b/toolchain/check/handle_pattern_binding.cpp index 180a66de6132..d7bebbae51b4 100644 --- a/toolchain/check/handle_pattern_binding.cpp +++ b/toolchain/check/handle_pattern_binding.cpp @@ -13,13 +13,13 @@ auto HandleAddress(Context& context, Parse::Node parse_node) -> bool { auto self_param_id = context.node_stack().Peek(); if (auto self_param = - context.insts().Get(self_param_id).TryAs()) { + context.insts().Get(self_param_id).TryAs()) { self_param->is_addr_self = SemIR::BoolValue::True; context.insts().Set(self_param_id, *self_param); } else { - CARBON_DIAGNOSTIC(AddrOnNonSelfParameter, Error, + CARBON_DIAGNOSTIC(AddrOnNonSelfParam, Error, "`addr` can only be applied to a `self` parameter."); - context.emitter().Emit(parse_node, AddrOnNonSelfParameter); + context.emitter().Emit(parse_node, AddrOnNonSelfParam); } return true; } @@ -40,16 +40,15 @@ auto HandlePatternBinding(Context& context, Parse::Node parse_node) -> bool { context.node_stack() .PopForSoloParseNodeIf()) { if (context.parse_tree().node_kind(context.node_stack().PeekParseNode()) != - Parse::NodeKind::ImplicitParameterListStart) { + Parse::NodeKind::ImplicitParamListStart) { CARBON_DIAGNOSTIC( - SelfOutsideImplicitParameterList, Error, + SelfOutsideImplicitParamList, Error, "`self` can only be declared in an implicit parameter list."); - context.emitter().Emit(parse_node, SelfOutsideImplicitParameterList); + context.emitter().Emit(parse_node, SelfOutsideImplicitParamList); } context.AddInstAndPush( - parse_node, - SemIR::SelfParameter{*self_node, cast_type_id, - /*is_addr_self=*/SemIR::BoolValue::False}); + parse_node, SemIR::SelfParam{*self_node, cast_type_id, + /*is_addr_self=*/SemIR::BoolValue::False}); return true; } @@ -115,12 +114,12 @@ auto HandlePatternBinding(Context& context, Parse::Node parse_node) -> bool { break; } - case Parse::NodeKind::ImplicitParameterListStart: - case Parse::NodeKind::ParameterListStart: + case Parse::NodeKind::ImplicitParamListStart: + case Parse::NodeKind::ParamListStart: // Parameters can have incomplete types in a function declaration, but not // in a function definition. We don't know which kind we have here. - context.AddInstAndPush( - parse_node, SemIR::Parameter{name_node, cast_type_id, name_id}); + context.AddInstAndPush(parse_node, + SemIR::Param{name_node, cast_type_id, name_id}); // TODO: Create a `BindName` instruction. break; diff --git a/toolchain/check/node_stack.h b/toolchain/check/node_stack.h index 3ae98745a109..a872ef809a94 100644 --- a/toolchain/check/node_stack.h +++ b/toolchain/check/node_stack.h @@ -317,8 +317,8 @@ class NodeStack { return IdKind::InstId; case Parse::NodeKind::IfCondition: case Parse::NodeKind::IfExprIf: - case Parse::NodeKind::ImplicitParameterList: - case Parse::NodeKind::ParameterList: + case Parse::NodeKind::ImplicitParamList: + case Parse::NodeKind::ParamList: case Parse::NodeKind::WhileCondition: case Parse::NodeKind::WhileConditionStart: return IdKind::InstBlockId; @@ -333,9 +333,9 @@ class NodeStack { case Parse::NodeKind::CodeBlockStart: case Parse::NodeKind::FunctionIntroducer: case Parse::NodeKind::IfStatementElse: - case Parse::NodeKind::ImplicitParameterListStart: + case Parse::NodeKind::ImplicitParamListStart: case Parse::NodeKind::LetIntroducer: - case Parse::NodeKind::ParameterListStart: + case Parse::NodeKind::ParamListStart: case Parse::NodeKind::ParenExprOrTupleLiteralStart: case Parse::NodeKind::QualifiedDecl: case Parse::NodeKind::ReturnedSpecifier: diff --git a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon index 895a1224f489..57c14eb4f882 100644 --- a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon @@ -34,7 +34,7 @@ fn Foo(n: i32) -> (i32, f64) { // CHECK:STDOUT: 0: type0 // CHECK:STDOUT: 1: type2 // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Parameter, arg0: name1, type: type0} +// CHECK:STDOUT: inst+0: {kind: Param, arg0: name1, type: type0} // CHECK:STDOUT: inst+1: {kind: TupleType, arg0: typeBlock0, type: typeTypeType} // CHECK:STDOUT: inst+2: {kind: TupleLiteral, arg0: block2, type: type1} // CHECK:STDOUT: inst+3: {kind: TupleType, arg0: typeBlock1, type: typeTypeType} diff --git a/toolchain/check/testdata/basics/raw_ir.carbon b/toolchain/check/testdata/basics/raw_ir.carbon index 84627425b83b..b0d855bd1f5b 100644 --- a/toolchain/check/testdata/basics/raw_ir.carbon +++ b/toolchain/check/testdata/basics/raw_ir.carbon @@ -34,7 +34,7 @@ fn Foo(n: i32) -> (i32, f64) { // CHECK:STDOUT: 0: type0 // CHECK:STDOUT: 1: type2 // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Parameter, arg0: name1, type: type0} +// CHECK:STDOUT: inst+0: {kind: Param, arg0: name1, type: type0} // CHECK:STDOUT: inst+1: {kind: TupleType, arg0: typeBlock0, type: typeTypeType} // CHECK:STDOUT: inst+2: {kind: TupleLiteral, arg0: block2, type: type1} // CHECK:STDOUT: inst+3: {kind: TupleType, arg0: typeBlock1, type: typeTypeType} diff --git a/toolchain/check/testdata/class/fail_self.carbon b/toolchain/check/testdata/class/fail_self.carbon index e37c830870bb..c652ca586d3e 100644 --- a/toolchain/check/testdata/class/fail_self.carbon +++ b/toolchain/check/testdata/class/fail_self.carbon @@ -90,7 +90,7 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: fn @G() -> %return: Class { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %Class.ref: type = name_reference Class, file.%Class -// CHECK:STDOUT: %self: Class = self_parameter false +// CHECK:STDOUT: %self: Class = self_param false // CHECK:STDOUT: %self.ref: = name_reference self, // CHECK:STDOUT: return // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/pointer/fail_address_of_value.carbon b/toolchain/check/testdata/pointer/fail_address_of_value.carbon index b75284345cf3..9a7d70266790 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_value.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_value.carbon @@ -75,7 +75,7 @@ fn AddressOfTupleElementValue() { &((1, 2)[0]); } -fn AddressOfParameter(param: i32) { +fn AddressOfParam(param: i32) { // CHECK:STDERR: fail_address_of_value.carbon:[[@LINE+3]]:26: ERROR: Cannot take the address of non-reference expression. // CHECK:STDERR: var param_addr: i32* = ¶m; // CHECK:STDERR: ^ @@ -101,7 +101,7 @@ fn AddressOfParameter(param: i32) { // CHECK:STDOUT: %AddressOfCall: = fn_decl @AddressOfCall // CHECK:STDOUT: %AddressOfType: = fn_decl @AddressOfType // CHECK:STDOUT: %AddressOfTupleElementValue: = fn_decl @AddressOfTupleElementValue -// CHECK:STDOUT: %AddressOfParameter: = fn_decl @AddressOfParameter +// CHECK:STDOUT: %AddressOfParam: = fn_decl @AddressOfParam // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: fn @G() -> i32; @@ -176,7 +176,7 @@ fn AddressOfParameter(param: i32) { // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: fn @AddressOfParameter(%param: i32) { +// CHECK:STDOUT: fn @AddressOfParam(%param: i32) { // CHECK:STDOUT: !entry: // CHECK:STDOUT: %.loc82_22: type = ptr_type i32 // CHECK:STDOUT: %param_addr.var: ref i32* = var param_addr diff --git a/toolchain/diagnostics/diagnostic_kind.def b/toolchain/diagnostics/diagnostic_kind.def index 626e8e619d93..f8039e83410e 100644 --- a/toolchain/diagnostics/diagnostic_kind.def +++ b/toolchain/diagnostics/diagnostic_kind.def @@ -65,7 +65,7 @@ CARBON_DIAGNOSTIC_KIND(ExpectedCodeBlock) CARBON_DIAGNOSTIC_KIND(ExpectedExpr) CARBON_DIAGNOSTIC_KIND(ExpectedIdentifierAfterDotOrArrow) CARBON_DIAGNOSTIC_KIND(ExpectedLetBindingName) -CARBON_DIAGNOSTIC_KIND(ExpectedParameterName) +CARBON_DIAGNOSTIC_KIND(ExpectedParamName) CARBON_DIAGNOSTIC_KIND(ExpectedParenAfter) CARBON_DIAGNOSTIC_KIND(ExpectedExprSemi) CARBON_DIAGNOSTIC_KIND(ExpectedStatementSemi) @@ -105,8 +105,8 @@ CARBON_DIAGNOSTIC_KIND(ExpectedDeclSemi) CARBON_DIAGNOSTIC_KIND(ExpectedDeclSemiOrDefinition) CARBON_DIAGNOSTIC_KIND(ExpectedInitializerAfterLet) CARBON_DIAGNOSTIC_KIND(MethodImplNotAllowed) -CARBON_DIAGNOSTIC_KIND(ParametersRequiredAfterImplicit) -CARBON_DIAGNOSTIC_KIND(ParametersRequiredByIntroducer) +CARBON_DIAGNOSTIC_KIND(ParamsRequiredAfterImplicit) +CARBON_DIAGNOSTIC_KIND(ParamsRequiredByIntroducer) // ============================================================================ // Semantics diagnostics @@ -125,7 +125,7 @@ CARBON_DIAGNOSTIC_KIND(MissingObjectInMethodCall) CARBON_DIAGNOSTIC_KIND(AddressOfEphemeralReference) CARBON_DIAGNOSTIC_KIND(AddressOfNonReference) -CARBON_DIAGNOSTIC_KIND(AddrOnNonSelfParameter) +CARBON_DIAGNOSTIC_KIND(AddrOnNonSelfParam) CARBON_DIAGNOSTIC_KIND(ArrayInitFromLiteralArgCountMismatch) CARBON_DIAGNOSTIC_KIND(ArrayInitFromExprArgCountMismatch) CARBON_DIAGNOSTIC_KIND(AssignmentToNonAssignable) @@ -157,7 +157,7 @@ CARBON_DIAGNOSTIC_KIND(InvalidArrayExpr) CARBON_DIAGNOSTIC_KIND(TypeNotIndexable) CARBON_DIAGNOSTIC_KIND(IndexOutOfBounds) CARBON_DIAGNOSTIC_KIND(InvalidMainRunSignature) -CARBON_DIAGNOSTIC_KIND(SelfOutsideImplicitParameterList) +CARBON_DIAGNOSTIC_KIND(SelfOutsideImplicitParamList) CARBON_DIAGNOSTIC_KIND(StructInitElementCountMismatch) CARBON_DIAGNOSTIC_KIND(StructInitMissingFieldInLiteral) CARBON_DIAGNOSTIC_KIND(StructInitMissingFieldInConversion) diff --git a/toolchain/lower/file_context.cpp b/toolchain/lower/file_context.cpp index 04f4671b2fcd..3f12cbdd47ba 100644 --- a/toolchain/lower/file_context.cpp +++ b/toolchain/lower/file_context.cpp @@ -159,10 +159,10 @@ auto FileContext::BuildFunctionDecl(SemIR::FunctionId function_id) name_id = SemIR::NameId::ReturnSlot; arg.addAttr(llvm::Attribute::getWithStructRetType( llvm_context(), GetType(function.return_type_id))); - } else if (inst.Is()) { + } else if (inst.Is()) { name_id = SemIR::NameId::SelfValue; } else { - name_id = inst.As().name_id; + name_id = inst.As().name_id; } arg.setName(sem_ir().names().GetIRBaseName(name_id)); } diff --git a/toolchain/lower/handle.cpp b/toolchain/lower/handle.cpp index 155a35f12da1..964529b6bde6 100644 --- a/toolchain/lower/handle.cpp +++ b/toolchain/lower/handle.cpp @@ -225,8 +225,8 @@ auto HandleNoOp(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/, // No action to take. } -auto HandleParameter(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/, - SemIR::Parameter /*inst*/) -> void { +auto HandleParam(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/, + SemIR::Param /*inst*/) -> void { CARBON_FATAL() << "Parameters should be lowered by `BuildFunctionDefinition`"; } @@ -265,9 +265,8 @@ auto HandleReturnExpr(FunctionContext& context, SemIR::InstId /*inst_id*/, } } -auto HandleSelfParameter(FunctionContext& /*context*/, - SemIR::InstId /*inst_id*/, - SemIR::SelfParameter /*inst*/) -> void { +auto HandleSelfParam(FunctionContext& /*context*/, SemIR::InstId /*inst_id*/, + SemIR::SelfParam /*inst*/) -> void { CARBON_FATAL() << "Parameters should be lowered by `BuildFunctionDefinition`"; } diff --git a/toolchain/parse/context.h b/toolchain/parse/context.h index 33ff28d27d84..9346f88f7cda 100644 --- a/toolchain/parse/context.h +++ b/toolchain/parse/context.h @@ -29,12 +29,7 @@ class Context { enum class ListTokenKind : int8_t { Comma, Close, CommaClose }; // Supported kinds for HandlePattern. - enum class PatternKind : int8_t { - ImplicitParameter, - Parameter, - Variable, - Let - }; + enum class PatternKind : int8_t { ImplicitParam, Param, Variable, Let }; // Supported return values for GetDeclContext. enum class DeclContext : int8_t { diff --git a/toolchain/parse/handle_brace_expr.cpp b/toolchain/parse/handle_brace_expr.cpp index 64d5673f300a..6b5daf4eb254 100644 --- a/toolchain/parse/handle_brace_expr.cpp +++ b/toolchain/parse/handle_brace_expr.cpp @@ -16,18 +16,17 @@ auto HandleBraceExpr(Context& context) -> void { Lex::TokenKind::OpenCurlyBrace, NodeKind::StructLiteralOrStructTypeLiteralStart)); if (!context.PositionIs(Lex::TokenKind::CloseCurlyBrace)) { - context.PushState(State::BraceExprParameterAsUnknown); + context.PushState(State::BraceExprParamAsUnknown); } } // Prints a diagnostic for brace expression syntax errors. -static auto HandleBraceExprParameterError(Context& context, - Context::StateStackEntry state, - State param_finish_state) -> void { - bool is_type = param_finish_state == State::BraceExprParameterFinishAsType; - bool is_value = param_finish_state == State::BraceExprParameterFinishAsValue; - bool is_unknown = - param_finish_state == State::BraceExprParameterFinishAsUnknown; +static auto HandleBraceExprParamError(Context& context, + Context::StateStackEntry state, + State param_finish_state) -> void { + bool is_type = param_finish_state == State::BraceExprParamFinishAsType; + bool is_value = param_finish_state == State::BraceExprParamFinishAsValue; + bool is_unknown = param_finish_state == State::BraceExprParamFinishAsUnknown; CARBON_CHECK(is_type || is_value || is_unknown); CARBON_DIAGNOSTIC(ExpectedStructLiteralField, Error, "Expected {0}{1}{2}.", llvm::StringRef, llvm::StringRef, llvm::StringRef); @@ -41,14 +40,13 @@ static auto HandleBraceExprParameterError(Context& context, context.PushState(state); } -// Handles BraceExprParameterAs(Type|Value|Unknown). -static auto HandleBraceExprParameter(Context& context, - State after_designator_state, - State param_finish_state) -> void { +// Handles BraceExprParamAs(Type|Value|Unknown). +static auto HandleBraceExprParam(Context& context, State after_designator_state, + State param_finish_state) -> void { auto state = context.PopState(); if (!context.PositionIs(Lex::TokenKind::Period)) { - HandleBraceExprParameterError(context, state, param_finish_state); + HandleBraceExprParamError(context, state, param_finish_state); return; } @@ -57,27 +55,24 @@ static auto HandleBraceExprParameter(Context& context, context.PushState(State::PeriodAsStruct); } -auto HandleBraceExprParameterAsType(Context& context) -> void { - HandleBraceExprParameter(context, - State::BraceExprParameterAfterDesignatorAsType, - State::BraceExprParameterFinishAsType); +auto HandleBraceExprParamAsType(Context& context) -> void { + HandleBraceExprParam(context, State::BraceExprParamAfterDesignatorAsType, + State::BraceExprParamFinishAsType); } -auto HandleBraceExprParameterAsValue(Context& context) -> void { - HandleBraceExprParameter(context, - State::BraceExprParameterAfterDesignatorAsValue, - State::BraceExprParameterFinishAsValue); +auto HandleBraceExprParamAsValue(Context& context) -> void { + HandleBraceExprParam(context, State::BraceExprParamAfterDesignatorAsValue, + State::BraceExprParamFinishAsValue); } -auto HandleBraceExprParameterAsUnknown(Context& context) -> void { - HandleBraceExprParameter(context, - State::BraceExprParameterAfterDesignatorAsUnknown, - State::BraceExprParameterFinishAsUnknown); +auto HandleBraceExprParamAsUnknown(Context& context) -> void { + HandleBraceExprParam(context, State::BraceExprParamAfterDesignatorAsUnknown, + State::BraceExprParamFinishAsUnknown); } -// Handles BraceExprParameterAfterDesignatorAs(Type|Value|Unknown). -static auto HandleBraceExprParameterAfterDesignator(Context& context, - State param_finish_state) +// Handles BraceExprParamAfterDesignatorAs(Type|Value|Unknown). +static auto HandleBraceExprParamAfterDesignator(Context& context, + State param_finish_state) -> void { auto state = context.PopState(); @@ -100,29 +95,28 @@ static auto HandleBraceExprParameterAfterDesignator(Context& context, } else if (context.PositionIs(Lex::TokenKind::Equal)) { is_type = false; } else { - HandleBraceExprParameterError(context, state, param_finish_state); + HandleBraceExprParamError(context, state, param_finish_state); return; } // If we're changing from unknown, update the related finish states. - if (param_finish_state == State::BraceExprParameterFinishAsUnknown) { + if (param_finish_state == State::BraceExprParamFinishAsUnknown) { auto finish_state = context.PopState(); CARBON_CHECK(finish_state.state == State::BraceExprFinishAsUnknown); if (is_type) { finish_state.state = State::BraceExprFinishAsType; - param_finish_state = State::BraceExprParameterFinishAsType; + param_finish_state = State::BraceExprParamFinishAsType; } else { finish_state.state = State::BraceExprFinishAsValue; - param_finish_state = State::BraceExprParameterFinishAsValue; + param_finish_state = State::BraceExprParamFinishAsValue; } context.PushState(finish_state); } - auto want_param_finish_state = is_type - ? State::BraceExprParameterFinishAsType - : State::BraceExprParameterFinishAsValue; + auto want_param_finish_state = is_type ? State::BraceExprParamFinishAsType + : State::BraceExprParamFinishAsValue; if (param_finish_state != want_param_finish_state) { - HandleBraceExprParameterError(context, state, param_finish_state); + HandleBraceExprParamError(context, state, param_finish_state); return; } @@ -134,25 +128,24 @@ static auto HandleBraceExprParameterAfterDesignator(Context& context, context.PushState(State::Expr); } -auto HandleBraceExprParameterAfterDesignatorAsType(Context& context) -> void { - HandleBraceExprParameterAfterDesignator( - context, State::BraceExprParameterFinishAsType); +auto HandleBraceExprParamAfterDesignatorAsType(Context& context) -> void { + HandleBraceExprParamAfterDesignator(context, + State::BraceExprParamFinishAsType); } -auto HandleBraceExprParameterAfterDesignatorAsValue(Context& context) -> void { - HandleBraceExprParameterAfterDesignator( - context, State::BraceExprParameterFinishAsValue); +auto HandleBraceExprParamAfterDesignatorAsValue(Context& context) -> void { + HandleBraceExprParamAfterDesignator(context, + State::BraceExprParamFinishAsValue); } -auto HandleBraceExprParameterAfterDesignatorAsUnknown(Context& context) - -> void { - HandleBraceExprParameterAfterDesignator( - context, State::BraceExprParameterFinishAsUnknown); +auto HandleBraceExprParamAfterDesignatorAsUnknown(Context& context) -> void { + HandleBraceExprParamAfterDesignator(context, + State::BraceExprParamFinishAsUnknown); } -// Handles BraceExprParameterFinishAs(Type|Value|Unknown). -static auto HandleBraceExprParameterFinish(Context& context, NodeKind node_kind, - State param_state) -> void { +// Handles BraceExprParamFinishAs(Type|Value|Unknown). +static auto HandleBraceExprParamFinish(Context& context, NodeKind node_kind, + State param_state) -> void { auto state = context.PopState(); if (state.has_error) { @@ -170,19 +163,19 @@ static auto HandleBraceExprParameterFinish(Context& context, NodeKind node_kind, } } -auto HandleBraceExprParameterFinishAsType(Context& context) -> void { - HandleBraceExprParameterFinish(context, NodeKind::StructFieldType, - State::BraceExprParameterAsType); +auto HandleBraceExprParamFinishAsType(Context& context) -> void { + HandleBraceExprParamFinish(context, NodeKind::StructFieldType, + State::BraceExprParamAsType); } -auto HandleBraceExprParameterFinishAsValue(Context& context) -> void { - HandleBraceExprParameterFinish(context, NodeKind::StructFieldValue, - State::BraceExprParameterAsValue); +auto HandleBraceExprParamFinishAsValue(Context& context) -> void { + HandleBraceExprParamFinish(context, NodeKind::StructFieldValue, + State::BraceExprParamAsValue); } -auto HandleBraceExprParameterFinishAsUnknown(Context& context) -> void { - HandleBraceExprParameterFinish(context, NodeKind::StructFieldUnknown, - State::BraceExprParameterAsUnknown); +auto HandleBraceExprParamFinishAsUnknown(Context& context) -> void { + HandleBraceExprParamFinish(context, NodeKind::StructFieldUnknown, + State::BraceExprParamAsUnknown); } // Handles BraceExprFinishAs(Type|Value|Unknown). diff --git a/toolchain/parse/handle_call_expr.cpp b/toolchain/parse/handle_call_expr.cpp index 717b902c0714..3d7b7aec01a2 100644 --- a/toolchain/parse/handle_call_expr.cpp +++ b/toolchain/parse/handle_call_expr.cpp @@ -15,12 +15,12 @@ auto HandleCallExpr(Context& context) -> void { context.AddNode(NodeKind::CallExprStart, context.Consume(), state.subtree_start, state.has_error); if (!context.PositionIs(Lex::TokenKind::CloseParen)) { - context.PushState(State::CallExprParameterFinish); + context.PushState(State::CallExprParamFinish); context.PushState(State::Expr); } } -auto HandleCallExprParameterFinish(Context& context) -> void { +auto HandleCallExprParamFinish(Context& context) -> void { auto state = context.PopState(); if (state.has_error) { @@ -30,7 +30,7 @@ auto HandleCallExprParameterFinish(Context& context) -> void { if (context.ConsumeListToken(NodeKind::CallExprComma, Lex::TokenKind::CloseParen, state.has_error) == Context::ListTokenKind::Comma) { - context.PushState(State::CallExprParameterFinish); + context.PushState(State::CallExprParamFinish); context.PushState(State::Expr); } } diff --git a/toolchain/parse/handle_decl_name_and_params.cpp b/toolchain/parse/handle_decl_name_and_params.cpp index 9d469a612694..8d7c4f55fe8e 100644 --- a/toolchain/parse/handle_decl_name_and_params.cpp +++ b/toolchain/parse/handle_decl_name_and_params.cpp @@ -80,13 +80,13 @@ static auto HandleDeclNameAndParamsAfterName(Context& context, Params params) if (context.PositionIs(Lex::TokenKind::OpenSquareBracket)) { context.PushState(State::DeclNameAndParamsAfterImplicit); - context.PushState(State::ParameterListAsImplicit); + context.PushState(State::ParamListAsImplicit); } else if (context.PositionIs(Lex::TokenKind::OpenParen)) { - context.PushState(State::ParameterListAsRegular); + context.PushState(State::ParamListAsRegular); } else if (params == Params::Required) { - CARBON_DIAGNOSTIC(ParametersRequiredByIntroducer, Error, + CARBON_DIAGNOSTIC(ParamsRequiredByIntroducer, Error, "`{0}` requires a `(` for parameters.", Lex::TokenKind); - context.emitter().Emit(*context.position(), ParametersRequiredByIntroducer, + context.emitter().Emit(*context.position(), ParamsRequiredByIntroducer, context.tokens().GetKind(state.token)); context.ReturnErrorOnState(); } @@ -108,13 +108,12 @@ auto HandleDeclNameAndParamsAfterImplicit(Context& context) -> void { context.PopAndDiscardState(); if (context.PositionIs(Lex::TokenKind::OpenParen)) { - context.PushState(State::ParameterListAsRegular); + context.PushState(State::ParamListAsRegular); } else { CARBON_DIAGNOSTIC( - ParametersRequiredAfterImplicit, Error, + ParamsRequiredAfterImplicit, Error, "A `(` for parameters is required after implicit parameters."); - context.emitter().Emit(*context.position(), - ParametersRequiredAfterImplicit); + context.emitter().Emit(*context.position(), ParamsRequiredAfterImplicit); context.ReturnErrorOnState(); } } diff --git a/toolchain/parse/handle_function.cpp b/toolchain/parse/handle_function.cpp index 168a35404a70..45093587db0c 100644 --- a/toolchain/parse/handle_function.cpp +++ b/toolchain/parse/handle_function.cpp @@ -11,12 +11,12 @@ auto HandleFunctionIntroducer(Context& context) -> void { context.AddLeafNode(NodeKind::FunctionIntroducer, context.Consume()); - state.state = State::FunctionAfterParameters; + state.state = State::FunctionAfterParams; context.PushState(state); context.PushState(State::DeclNameAndParamsAsRequired, state.token); } -auto HandleFunctionAfterParameters(Context& context) -> void { +auto HandleFunctionAfterParams(Context& context) -> void { auto state = context.PopState(); // Regardless of whether there's a return type, we'll finish the signature. diff --git a/toolchain/parse/handle_parameter.cpp b/toolchain/parse/handle_parameter.cpp index abdc3114e425..4b1325c14471 100644 --- a/toolchain/parse/handle_parameter.cpp +++ b/toolchain/parse/handle_parameter.cpp @@ -6,56 +6,54 @@ namespace Carbon::Parse { -// Handles ParameterAs(Implicit|Regular). -static auto HandleParameter(Context& context, State pattern_state, - State finish_state) -> void { +// Handles ParamAs(Implicit|Regular). +static auto HandleParam(Context& context, State pattern_state, + State finish_state) -> void { context.PopAndDiscardState(); context.PushState(finish_state); context.PushState(pattern_state); } -auto HandleParameterAsImplicit(Context& context) -> void { - HandleParameter(context, State::PatternAsImplicitParameter, - State::ParameterFinishAsImplicit); +auto HandleParamAsImplicit(Context& context) -> void { + HandleParam(context, State::PatternAsImplicitParam, + State::ParamFinishAsImplicit); } -auto HandleParameterAsRegular(Context& context) -> void { - HandleParameter(context, State::PatternAsParameter, - State::ParameterFinishAsRegular); +auto HandleParamAsRegular(Context& context) -> void { + HandleParam(context, State::PatternAsParam, State::ParamFinishAsRegular); } -// Handles ParameterFinishAs(Implicit|Regular). -static auto HandleParameterFinish(Context& context, Lex::TokenKind close_token, - State param_state) -> void { +// Handles ParamFinishAs(Implicit|Regular). +static auto HandleParamFinish(Context& context, Lex::TokenKind close_token, + State param_state) -> void { auto state = context.PopState(); if (state.has_error) { context.ReturnErrorOnState(); } - if (context.ConsumeListToken(NodeKind::ParameterListComma, close_token, + if (context.ConsumeListToken(NodeKind::ParamListComma, close_token, state.has_error) == Context::ListTokenKind::Comma) { context.PushState(param_state); } } -auto HandleParameterFinishAsImplicit(Context& context) -> void { - HandleParameterFinish(context, Lex::TokenKind::CloseSquareBracket, - State::ParameterAsImplicit); +auto HandleParamFinishAsImplicit(Context& context) -> void { + HandleParamFinish(context, Lex::TokenKind::CloseSquareBracket, + State::ParamAsImplicit); } -auto HandleParameterFinishAsRegular(Context& context) -> void { - HandleParameterFinish(context, Lex::TokenKind::CloseParen, - State::ParameterAsRegular); +auto HandleParamFinishAsRegular(Context& context) -> void { + HandleParamFinish(context, Lex::TokenKind::CloseParen, State::ParamAsRegular); } -// Handles ParameterListAs(Implicit|Regular). -static auto HandleParameterList(Context& context, NodeKind parse_node_kind, - Lex::TokenKind open_token_kind, - Lex::TokenKind close_token_kind, - State param_state, State finish_state) -> void { +// Handles ParamListAs(Implicit|Regular). +static auto HandleParamList(Context& context, NodeKind parse_node_kind, + Lex::TokenKind open_token_kind, + Lex::TokenKind close_token_kind, State param_state, + State finish_state) -> void { context.PopAndDiscardState(); context.PushState(finish_state); @@ -66,38 +64,36 @@ static auto HandleParameterList(Context& context, NodeKind parse_node_kind, } } -auto HandleParameterListAsImplicit(Context& context) -> void { - HandleParameterList( - context, NodeKind::ImplicitParameterListStart, - Lex::TokenKind::OpenSquareBracket, Lex::TokenKind::CloseSquareBracket, - State::ParameterAsImplicit, State::ParameterListFinishAsImplicit); +auto HandleParamListAsImplicit(Context& context) -> void { + HandleParamList(context, NodeKind::ImplicitParamListStart, + Lex::TokenKind::OpenSquareBracket, + Lex::TokenKind::CloseSquareBracket, State::ParamAsImplicit, + State::ParamListFinishAsImplicit); } -auto HandleParameterListAsRegular(Context& context) -> void { - HandleParameterList(context, NodeKind::ParameterListStart, - Lex::TokenKind::OpenParen, Lex::TokenKind::CloseParen, - State::ParameterAsRegular, - State::ParameterListFinishAsRegular); +auto HandleParamListAsRegular(Context& context) -> void { + HandleParamList(context, NodeKind::ParamListStart, Lex::TokenKind::OpenParen, + Lex::TokenKind::CloseParen, State::ParamAsRegular, + State::ParamListFinishAsRegular); } -// Handles ParameterListFinishAs(Implicit|Regular). -static auto HandleParameterListFinish(Context& context, - NodeKind parse_node_kind, - Lex::TokenKind token_kind) -> void { +// Handles ParamListFinishAs(Implicit|Regular). +static auto HandleParamListFinish(Context& context, NodeKind parse_node_kind, + Lex::TokenKind token_kind) -> void { auto state = context.PopState(); context.AddNode(parse_node_kind, context.ConsumeChecked(token_kind), state.subtree_start, state.has_error); } -auto HandleParameterListFinishAsImplicit(Context& context) -> void { - HandleParameterListFinish(context, NodeKind::ImplicitParameterList, - Lex::TokenKind::CloseSquareBracket); +auto HandleParamListFinishAsImplicit(Context& context) -> void { + HandleParamListFinish(context, NodeKind::ImplicitParamList, + Lex::TokenKind::CloseSquareBracket); } -auto HandleParameterListFinishAsRegular(Context& context) -> void { - HandleParameterListFinish(context, NodeKind::ParameterList, - Lex::TokenKind::CloseParen); +auto HandleParamListFinishAsRegular(Context& context) -> void { + HandleParamListFinish(context, NodeKind::ParamList, + Lex::TokenKind::CloseParen); } } // namespace Carbon::Parse diff --git a/toolchain/parse/handle_paren_expr.cpp b/toolchain/parse/handle_paren_expr.cpp index 326f712a5085..9b87611b0dc7 100644 --- a/toolchain/parse/handle_paren_expr.cpp +++ b/toolchain/parse/handle_paren_expr.cpp @@ -19,13 +19,13 @@ auto HandleParenExpr(Context& context) -> void { } else { state.state = State::ParenExprFinishAsNormal; context.PushState(state); - context.PushState(State::ParenExprParameterFinishAsUnknown); + context.PushState(State::ParenExprParamFinishAsUnknown); context.PushState(State::Expr); } } -// Handles ParenExprParameterFinishAs(Unknown|Tuple). -static auto HandleParenExprParameterFinish(Context& context, bool as_tuple) +// Handles ParenExprParamFinishAs(Unknown|Tuple). +static auto HandleParenExprParamFinish(Context& context, bool as_tuple) -> void { auto state = context.PopState(); @@ -39,7 +39,7 @@ static auto HandleParenExprParameterFinish(Context& context, bool as_tuple) // Note this could be `(expr,)` so we may not reuse the current state, but // it's still necessary to switch the parent. if (!as_tuple) { - state.state = State::ParenExprParameterFinishAsTuple; + state.state = State::ParenExprParamFinishAsTuple; auto finish_state = context.PopState(); CARBON_CHECK(finish_state.state == State::ParenExprFinishAsNormal) @@ -55,12 +55,12 @@ static auto HandleParenExprParameterFinish(Context& context, bool as_tuple) } } -auto HandleParenExprParameterFinishAsUnknown(Context& context) -> void { - HandleParenExprParameterFinish(context, /*as_tuple=*/false); +auto HandleParenExprParamFinishAsUnknown(Context& context) -> void { + HandleParenExprParamFinish(context, /*as_tuple=*/false); } -auto HandleParenExprParameterFinishAsTuple(Context& context) -> void { - HandleParenExprParameterFinish(context, /*as_tuple=*/true); +auto HandleParenExprParamFinishAsTuple(Context& context) -> void { + HandleParenExprParamFinish(context, /*as_tuple=*/true); } auto HandleParenExprFinishAsNormal(Context& context) -> void { diff --git a/toolchain/parse/handle_pattern.cpp b/toolchain/parse/handle_pattern.cpp index e782e777f0bd..907d9675a239 100644 --- a/toolchain/parse/handle_pattern.cpp +++ b/toolchain/parse/handle_pattern.cpp @@ -6,7 +6,7 @@ namespace Carbon::Parse { -// Handles PatternAs(ImplicitParameter|FunctionParameter|Variable|Let). +// Handles PatternAs(ImplicitParam|FunctionParam|Variable|Let). static auto HandlePattern(Context& context, Context::PatternKind pattern_kind) -> void { auto state = context.PopState(); @@ -23,11 +23,11 @@ static auto HandlePattern(Context& context, Context::PatternKind pattern_kind) // Handle an invalid pattern introducer for parameters and variables. auto on_error = [&]() { switch (pattern_kind) { - case Context::PatternKind::ImplicitParameter: - case Context::PatternKind::Parameter: { - CARBON_DIAGNOSTIC(ExpectedParameterName, Error, + case Context::PatternKind::ImplicitParam: + case Context::PatternKind::Param: { + CARBON_DIAGNOSTIC(ExpectedParamName, Error, "Expected parameter declaration."); - context.emitter().Emit(*context.position(), ExpectedParameterName); + context.emitter().Emit(*context.position(), ExpectedParamName); break; } case Context::PatternKind::Variable: { @@ -85,12 +85,12 @@ static auto HandlePattern(Context& context, Context::PatternKind pattern_kind) } } -auto HandlePatternAsImplicitParameter(Context& context) -> void { - HandlePattern(context, Context::PatternKind::ImplicitParameter); +auto HandlePatternAsImplicitParam(Context& context) -> void { + HandlePattern(context, Context::PatternKind::ImplicitParam); } -auto HandlePatternAsParameter(Context& context) -> void { - HandlePattern(context, Context::PatternKind::Parameter); +auto HandlePatternAsParam(Context& context) -> void { + HandlePattern(context, Context::PatternKind::Param); } auto HandlePatternAsVariable(Context& context) -> void { diff --git a/toolchain/parse/node_kind.def b/toolchain/parse/node_kind.def index 417a0ed60ea8..0a985de43717 100644 --- a/toolchain/parse/node_kind.def +++ b/toolchain/parse/node_kind.def @@ -144,7 +144,7 @@ CARBON_PARSE_NODE_KIND_BRACKET(CodeBlock, CodeBlockStart, // `fn`: // FunctionIntroducer // _external_: Name or QualifiedDecl -// _external_: ParameterList +// _external_: ParamList // _external_: type expression // ReturnType // FunctionDefinitionStart @@ -167,20 +167,20 @@ CARBON_PARSE_NODE_KIND_BRACKET(FunctionDecl, FunctionIntroducer, // A parameter list, possibly implicit: // [Implicit]ParamertListStart // _external_: [Generic]PatternBinding -// ParameterListComma -// [Implicit]ParameterList +// ParamListComma +// [Implicit]ParamList // -// Exprs and ParameterListComma may repeat with ParameterListComma as a +// Exprs and ParamListComma may repeat with ParamListComma as a // separator. -CARBON_PARSE_NODE_KIND_CHILD_COUNT(ParameterListStart, 0, +CARBON_PARSE_NODE_KIND_CHILD_COUNT(ParamListStart, 0, CARBON_TOKEN(OpenParen)) -CARBON_PARSE_NODE_KIND_CHILD_COUNT(ImplicitParameterListStart, 0, +CARBON_PARSE_NODE_KIND_CHILD_COUNT(ImplicitParamListStart, 0, CARBON_TOKEN(OpenSquareBracket)) -CARBON_PARSE_NODE_KIND_CHILD_COUNT(ParameterListComma, 0, CARBON_TOKEN(Comma)) -CARBON_PARSE_NODE_KIND_BRACKET(ParameterList, ParameterListStart, +CARBON_PARSE_NODE_KIND_CHILD_COUNT(ParamListComma, 0, CARBON_TOKEN(Comma)) +CARBON_PARSE_NODE_KIND_BRACKET(ParamList, ParamListStart, CARBON_TOKEN(CloseParen)) -CARBON_PARSE_NODE_KIND_BRACKET(ImplicitParameterList, - ImplicitParameterListStart, +CARBON_PARSE_NODE_KIND_BRACKET(ImplicitParamList, + ImplicitParamListStart, CARBON_TOKEN(CloseSquareBracket)) // An array type, such as `[i32; 3]` or `[i32;]`: diff --git a/toolchain/parse/state.def b/toolchain/parse/state.def index e9da81b5414a..be26489b14c4 100644 --- a/toolchain/parse/state.def +++ b/toolchain/parse/state.def @@ -105,7 +105,7 @@ CARBON_PARSE_STATE(ArrayExprFinish) // // { ... } // ^ -// 1. BraceExprParameterAsUnknown +// 1. BraceExprParamAsUnknown // 2. BraceExprFinishAsUnknown CARBON_PARSE_STATE(BraceExpr) @@ -116,12 +116,12 @@ CARBON_PARSE_STATE(BraceExpr) // { .foo ... } // ^ // 1. PeriodAsStruct -// 2. BraceExprParameterAfterDesignatorAs(Type|Value|Unknown) +// 2. BraceExprParamAfterDesignatorAs(Type|Value|Unknown) // // { ??? // ^ -// 1. BraceExprParameterFinishAs(Type|Value|Unknown) -CARBON_PARSE_STATE_VARIANTS3(BraceExprParameter, Type, Value, Unknown) +// 1. BraceExprParamFinishAs(Type|Value|Unknown) +CARBON_PARSE_STATE_VARIANTS3(BraceExprParam, Type, Value, Unknown) // Handles a brace expression parameter after the initial designator. This // should be at a `:` or `=`, depending on whether it's a type or value literal. @@ -129,17 +129,17 @@ CARBON_PARSE_STATE_VARIANTS3(BraceExprParameter, Type, Value, Unknown) // { .foo = bar ... } // ^ // 1. Expr -// 2. BraceExprParameterFinishAsValue +// 2. BraceExprParamFinishAsValue // // { .foo: bar ... } // ^ // 1. Expr -// 2. BraceExprParameterFinishAsType +// 2. BraceExprParamFinishAsType // // { .foo ??? // ^ -// 1. BraceExprParameterFinishAs(Type|Value|Unknown) -CARBON_PARSE_STATE_VARIANTS3(BraceExprParameterAfterDesignator, Type, Value, +// 1. BraceExprParamFinishAs(Type|Value|Unknown) +CARBON_PARSE_STATE_VARIANTS3(BraceExprParamAfterDesignator, Type, Value, Unknown) // Handles the end of a brace expression parameter. @@ -150,16 +150,16 @@ CARBON_PARSE_STATE_VARIANTS3(BraceExprParameterAfterDesignator, Type, Value, // // { .foo = bar, ... } // ^ -// 1. BraceExprParameterAsValue +// 1. BraceExprParamAsValue // // { .foo: bar, ... } // ^ -// 1. BraceExprParameterAsType +// 1. BraceExprParamAsType // // { ??? , ... } // ^ -// 1. BraceExprParameterAsUnknown -CARBON_PARSE_STATE_VARIANTS3(BraceExprParameterFinish, Type, Value, Unknown) +// 1. BraceExprParamAsUnknown +CARBON_PARSE_STATE_VARIANTS3(BraceExprParamFinish, Type, Value, Unknown) // Handles the `}` of a brace expression. // @@ -177,7 +177,7 @@ CARBON_PARSE_STATE_VARIANTS3(BraceExprFinish, Type, Value, Unknown) // F( ... // ^ // 1. Expr -// 2. CallExprParameterFinish +// 2. CallExprParamFinish // 3. CallExprFinish CARBON_PARSE_STATE(CallExpr) @@ -186,12 +186,12 @@ CARBON_PARSE_STATE(CallExpr) // F(a, ...) // ^ // 1. Expr -// 2. CallExprParameterFinish +// 2. CallExprParamFinish // // F(a ) // ^ // (state done) -CARBON_PARSE_STATE(CallExprParameterFinish) +CARBON_PARSE_STATE(CallExprParamFinish) // Handles finishing the call expression. // @@ -251,12 +251,12 @@ CARBON_PARSE_STATE_VARIANTS3(DeclNameAndParams, None, Optional, Required) // // name [ ... ] (variant is not None) // ^ -// 1. ParameterListAsImplicit +// 1. ParamListAsImplicit // 2. DeclNameAndParamsAfterImplicit // // name ( ... ) (variant is not None) // ^ -// 1. ParameterListAsRegular +// 1. ParamListAsRegular // // name ... (variant is not Required) // ^ @@ -273,7 +273,7 @@ CARBON_PARSE_STATE_VARIANTS3(DeclNameAndParamsAfterName, None, Optional, // // name [ ... ] ( ... ) // ^ -// 1. ParameterListAsRegular +// 1. ParamListAsRegular // // name [ ... ] ??? // ^ @@ -527,7 +527,7 @@ CARBON_PARSE_STATE(ExprStatementFinish) // fn ... // ^~ // 1. DeclNameAndParamsAsRequired -// 2. FunctionAfterParameters +// 2. FunctionAfterParams CARBON_PARSE_STATE(FunctionIntroducer) // Handles processing of a function's syntax after `)`, primarily the @@ -543,7 +543,7 @@ CARBON_PARSE_STATE(FunctionIntroducer) // fn F(...) ... // ^ // 1. FunctionSignatureFinish -CARBON_PARSE_STATE(FunctionAfterParameters) +CARBON_PARSE_STATE(FunctionAfterParams) // Finishes a function return type. // @@ -617,9 +617,9 @@ CARBON_PARSE_STATE(Package) // // ... // ^ -// 1. PatternAs(ImplicitParameter|Parameter) -// 2. ParameterFinishAs(Implicit|Regular) -CARBON_PARSE_STATE_VARIANTS2(Parameter, Implicit, Regular) +// 1. PatternAs(ImplicitParam|Param) +// 2. ParamFinishAs(Implicit|Regular) +CARBON_PARSE_STATE_VARIANTS2(Param, Implicit, Regular) // Finishes parsing a parameter, including the optional trailing `,`. If there // are more parameters, enqueues another parameter parsing state. @@ -630,12 +630,12 @@ CARBON_PARSE_STATE_VARIANTS2(Parameter, Implicit, Regular) // // ... , ... // ^ -// 1. ParameterAs(Implicit|Regular) +// 1. ParamAs(Implicit|Regular) // // ... // ^ // (state done) -CARBON_PARSE_STATE_VARIANTS2(ParameterFinish, Implicit, Regular) +CARBON_PARSE_STATE_VARIANTS2(ParamFinish, Implicit, Regular) // Handles processing of a parameter list `[` or `(`. // @@ -643,15 +643,15 @@ CARBON_PARSE_STATE_VARIANTS2(ParameterFinish, Implicit, Regular) // ^ // [ ] (variant is Implicit) // ^ -// 1. ParameterListFinishAs(Regular|Implicit) +// 1. ParamListFinishAs(Regular|Implicit) // // ( ... ) (variant is Regular) // ^ // [ ... ] (variant is Implicit) // ^ -// 1. ParameterAs(Regular|Implicit) -// 2. ParameterListFinishAs(Regular|Implicit) -CARBON_PARSE_STATE_VARIANTS2(ParameterList, Implicit, Regular) +// 1. ParamAs(Regular|Implicit) +// 2. ParamListFinishAs(Regular|Implicit) +CARBON_PARSE_STATE_VARIANTS2(ParamList, Implicit, Regular) // Handles processing of a parameter list `]` or `)`. // @@ -660,7 +660,7 @@ CARBON_PARSE_STATE_VARIANTS2(ParameterList, Implicit, Regular) // [ ... ] (variant is Implicit) // ^ // (state done) -CARBON_PARSE_STATE_VARIANTS2(ParameterListFinish, Implicit, Regular) +CARBON_PARSE_STATE_VARIANTS2(ParamListFinish, Implicit, Regular) // Handles the processing of a `(condition)` up through the expression. // @@ -696,7 +696,7 @@ CARBON_PARSE_STATE_VARIANTS2(ParenConditionFinish, If, While) // ( ... ) // ^ // 1. Expr -// 2. ParenExprParameterFinishAsUnknown +// 2. ParenExprParamFinishAsUnknown // 3. ParenExprFinishAsNormal (SPECIAL: may be replaced) CARBON_PARSE_STATE(ParenExpr) @@ -712,13 +712,13 @@ CARBON_PARSE_STATE(ParenExpr) // ( ... , ... ) // ^ // 1. Expression -// 2. ParenExpressionParameterFinishAsTuple +// 2. ParenExpressionParamFinishAsTuple // SPECIAL (variant is Unknown): parent becomes ParenExprFinishAsTuple // // ... // ^ // (state done) -CARBON_PARSE_STATE_VARIANTS2(ParenExprParameterFinish, Unknown, Tuple) +CARBON_PARSE_STATE_VARIANTS2(ParenExprParamFinish, Unknown, Tuple) // Handles the `)` of a parenthesized expression. // @@ -759,7 +759,7 @@ CARBON_PARSE_STATE_VARIANTS2(ParenExprFinish, Normal, Tuple) // ??? // ^ // 1. PatternFinishAsRegular -CARBON_PARSE_STATE_VARIANTS4(Pattern, ImplicitParameter, Parameter, Variable, +CARBON_PARSE_STATE_VARIANTS4(Pattern, ImplicitParam, Param, Variable, Let) // Handles `addr` in a pattern. diff --git a/toolchain/parse/testdata/basics/fail_invalid_designators.carbon b/toolchain/parse/testdata/basics/fail_invalid_designators.carbon index eb605d74aa86..f936a10c5429 100644 --- a/toolchain/parse/testdata/basics/fail_invalid_designators.carbon +++ b/toolchain/parse/testdata/basics/fail_invalid_designators.carbon @@ -25,8 +25,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, // CHECK:STDOUT: {kind: 'Name', text: ';', has_error: yes}, diff --git a/toolchain/parse/testdata/basics/function_call.carbon b/toolchain/parse/testdata/basics/function_call.carbon index ed6ccb01a111..0e1eec7db12b 100644 --- a/toolchain/parse/testdata/basics/function_call.carbon +++ b/toolchain/parse/testdata/basics/function_call.carbon @@ -14,8 +14,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, diff --git a/toolchain/parse/testdata/basics/multifile.carbon b/toolchain/parse/testdata/basics/multifile.carbon index ac81cdce07cd..705e94389c9c 100644 --- a/toolchain/parse/testdata/basics/multifile.carbon +++ b/toolchain/parse/testdata/basics/multifile.carbon @@ -15,8 +15,8 @@ fn B() {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'A'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 6}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, @@ -26,8 +26,8 @@ fn B() {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'B'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 6}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/basics/numeric_literals.carbon b/toolchain/parse/testdata/basics/numeric_literals.carbon index 53db537b093a..1e41802dd800 100644 --- a/toolchain/parse/testdata/basics/numeric_literals.carbon +++ b/toolchain/parse/testdata/basics/numeric_literals.carbon @@ -30,8 +30,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'ints'}, diff --git a/toolchain/parse/testdata/basics/parens.carbon b/toolchain/parse/testdata/basics/parens.carbon index d6c8116161a2..d20de8aa9031 100644 --- a/toolchain/parse/testdata/basics/parens.carbon +++ b/toolchain/parse/testdata/basics/parens.carbon @@ -13,11 +13,11 @@ fn F(n: i32) -> i32 { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'n'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 10}, diff --git a/toolchain/parse/testdata/class/basic.carbon b/toolchain/parse/testdata/class/basic.carbon index ef60739fe383..a0c714b6761f 100644 --- a/toolchain/parse/testdata/class/basic.carbon +++ b/toolchain/parse/testdata/class/basic.carbon @@ -16,8 +16,8 @@ class Foo { // CHECK:STDOUT: {kind: 'ClassDefinitionStart', text: '{', subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Baz'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ClassDefinition', text: '}', subtree_size: 9}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/class/fn_definitions.carbon b/toolchain/parse/testdata/class/fn_definitions.carbon index d17b263eae8c..1076ed5e2c4c 100644 --- a/toolchain/parse/testdata/class/fn_definitions.carbon +++ b/toolchain/parse/testdata/class/fn_definitions.carbon @@ -20,8 +20,8 @@ class Foo { // CHECK:STDOUT: {kind: 'ClassDefinitionStart', text: '{', subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Make'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7}, @@ -36,13 +36,13 @@ class Foo { // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 16}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Baz'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'SelfValueName', text: 'self'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 12}, @@ -54,15 +54,15 @@ class Foo { // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 18}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Modify'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'SelfValueName', text: 'self'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 4}, // CHECK:STDOUT: {kind: 'Address', text: 'addr', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 7}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 7}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 12}, // CHECK:STDOUT: {kind: 'SelfValueNameExpr', text: 'self'}, // CHECK:STDOUT: {kind: 'Name', text: 'x'}, diff --git a/toolchain/parse/testdata/for/fail_colon_instead_of_in.carbon b/toolchain/parse/testdata/for/fail_colon_instead_of_in.carbon index a85dc38fbfa6..1d1ac0fb84f4 100644 --- a/toolchain/parse/testdata/for/fail_colon_instead_of_in.carbon +++ b/toolchain/parse/testdata/for/fail_colon_instead_of_in.carbon @@ -18,8 +18,8 @@ fn foo() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ForHeaderStart', text: '('}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, diff --git a/toolchain/parse/testdata/for/fail_missing_cond.carbon b/toolchain/parse/testdata/for/fail_missing_cond.carbon index beb0fa1c8c57..ef14cad8e6ae 100644 --- a/toolchain/parse/testdata/for/fail_missing_cond.carbon +++ b/toolchain/parse/testdata/for/fail_missing_cond.carbon @@ -26,8 +26,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ForHeaderStart', text: 'for', has_error: yes}, // CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'}, diff --git a/toolchain/parse/testdata/for/fail_missing_in.carbon b/toolchain/parse/testdata/for/fail_missing_in.carbon index 1983dc2157dd..4a10a7455740 100644 --- a/toolchain/parse/testdata/for/fail_missing_in.carbon +++ b/toolchain/parse/testdata/for/fail_missing_in.carbon @@ -18,8 +18,8 @@ fn foo() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ForHeaderStart', text: '('}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, diff --git a/toolchain/parse/testdata/for/fail_missing_var.carbon b/toolchain/parse/testdata/for/fail_missing_var.carbon index 29df26a9657a..a3a8bc586d67 100644 --- a/toolchain/parse/testdata/for/fail_missing_var.carbon +++ b/toolchain/parse/testdata/for/fail_missing_var.carbon @@ -18,8 +18,8 @@ fn foo() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ForHeaderStart', text: '('}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'y'}, diff --git a/toolchain/parse/testdata/for/fail_returned_var.carbon b/toolchain/parse/testdata/for/fail_returned_var.carbon index f9186f902bf6..0783253a36b6 100644 --- a/toolchain/parse/testdata/for/fail_returned_var.carbon +++ b/toolchain/parse/testdata/for/fail_returned_var.carbon @@ -19,8 +19,8 @@ fn foo() -> i32 { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7}, diff --git a/toolchain/parse/testdata/for/fail_square_brackets.carbon b/toolchain/parse/testdata/for/fail_square_brackets.carbon index 4ded48e233e2..799667175939 100644 --- a/toolchain/parse/testdata/for/fail_square_brackets.carbon +++ b/toolchain/parse/testdata/for/fail_square_brackets.carbon @@ -26,8 +26,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ForHeaderStart', text: 'for', has_error: yes}, // CHECK:STDOUT: {kind: 'ArrayExprStart', text: '['}, diff --git a/toolchain/parse/testdata/for/nested.carbon b/toolchain/parse/testdata/for/nested.carbon index 555d86500487..abfb359ace2d 100644 --- a/toolchain/parse/testdata/for/nested.carbon +++ b/toolchain/parse/testdata/for/nested.carbon @@ -17,8 +17,8 @@ fn foo() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ForHeaderStart', text: '('}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, diff --git a/toolchain/parse/testdata/for/simple.carbon b/toolchain/parse/testdata/for/simple.carbon index 113e75cc51c8..2ab85600162b 100644 --- a/toolchain/parse/testdata/for/simple.carbon +++ b/toolchain/parse/testdata/for/simple.carbon @@ -15,8 +15,8 @@ fn foo() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ForHeaderStart', text: '('}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, diff --git a/toolchain/parse/testdata/function/declaration/addr.carbon b/toolchain/parse/testdata/function/declaration/addr.carbon index c756d4f472c1..85258c4cbd8c 100644 --- a/toolchain/parse/testdata/function/declaration/addr.carbon +++ b/toolchain/parse/testdata/function/declaration/addr.carbon @@ -11,13 +11,13 @@ fn foo(addr a: i32*); // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 4}, // CHECK:STDOUT: {kind: 'Address', text: 'addr', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 7}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 7}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 10}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/basic.carbon b/toolchain/parse/testdata/function/declaration/basic.carbon index d4fe708af35d..c2aaa361dbb0 100644 --- a/toolchain/parse/testdata/function/declaration/basic.carbon +++ b/toolchain/parse/testdata/function/declaration/basic.carbon @@ -11,8 +11,8 @@ fn F(); // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/fail_missing_implicit_close.carbon b/toolchain/parse/testdata/function/declaration/fail_missing_implicit_close.carbon index 076de36f4ed0..e1a5a5e341a5 100644 --- a/toolchain/parse/testdata/function/declaration/fail_missing_implicit_close.carbon +++ b/toolchain/parse/testdata/function/declaration/fail_missing_implicit_close.carbon @@ -21,11 +21,11 @@ fn Div[(); // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Div'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: '(', has_error: yes}, // CHECK:STDOUT: {kind: 'InvalidParse', text: '(', has_error: yes}, // CHECK:STDOUT: {kind: 'PatternBinding', text: '(', has_error: yes, subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', has_error: yes, subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', has_error: yes, subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 8}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_until_outdent.carbon b/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_until_outdent.carbon index 3cc6a1251059..c31282548cf0 100644 --- a/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_until_outdent.carbon +++ b/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_until_outdent.carbon @@ -20,8 +20,8 @@ fn F(); // CHECK:STDOUT: {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_with_semi.carbon b/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_with_semi.carbon index f459aeba9252..af6018954058 100644 --- a/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_with_semi.carbon +++ b/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_with_semi.carbon @@ -20,8 +20,8 @@ fn F(); // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', has_error: yes, subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_without_semi.carbon b/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_without_semi.carbon index c43f83d22e54..2dc39a1c66bc 100644 --- a/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_without_semi.carbon +++ b/toolchain/parse/testdata/function/declaration/fail_skip_indented_newline_without_semi.carbon @@ -20,8 +20,8 @@ fn F(); // CHECK:STDOUT: {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/fail_skip_to_newline_without_semi.carbon b/toolchain/parse/testdata/function/declaration/fail_skip_to_newline_without_semi.carbon index 45b6a44ebefc..61d49720cf45 100644 --- a/toolchain/parse/testdata/function/declaration/fail_skip_to_newline_without_semi.carbon +++ b/toolchain/parse/testdata/function/declaration/fail_skip_to_newline_without_semi.carbon @@ -18,8 +18,8 @@ fn F(); // CHECK:STDOUT: {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/fail_skip_without_semi_to_curly.carbon b/toolchain/parse/testdata/function/declaration/fail_skip_without_semi_to_curly.carbon index 7d8c4554cd7e..e73470f92ea2 100644 --- a/toolchain/parse/testdata/function/declaration/fail_skip_without_semi_to_curly.carbon +++ b/toolchain/parse/testdata/function/declaration/fail_skip_without_semi_to_curly.carbon @@ -16,8 +16,8 @@ fn F(); // CHECK:STDOUT: {kind: 'EmptyDecl', text: 'struct', has_error: yes}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/fail_with_identifier_as_param.carbon b/toolchain/parse/testdata/function/declaration/fail_with_identifier_as_param.carbon index 0f388f52e1ba..b75917e77304 100644 --- a/toolchain/parse/testdata/function/declaration/fail_with_identifier_as_param.carbon +++ b/toolchain/parse/testdata/function/declaration/fail_with_identifier_as_param.carbon @@ -14,11 +14,11 @@ fn foo(bar); // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'bar'}, // CHECK:STDOUT: {kind: 'InvalidParse', text: ')', has_error: yes}, // CHECK:STDOUT: {kind: 'PatternBinding', text: 'bar', has_error: yes, subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', has_error: yes, subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', has_error: yes, subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 8}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/implicit_empty.carbon b/toolchain/parse/testdata/function/declaration/implicit_empty.carbon index 51e41e848e6d..06b2f504e8af 100644 --- a/toolchain/parse/testdata/function/declaration/implicit_empty.carbon +++ b/toolchain/parse/testdata/function/declaration/implicit_empty.carbon @@ -11,10 +11,10 @@ fn foo[](); // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 2}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 7}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/implicit_params.carbon b/toolchain/parse/testdata/function/declaration/implicit_params.carbon index 36daace3040f..85a7c17deb4c 100644 --- a/toolchain/parse/testdata/function/declaration/implicit_params.carbon +++ b/toolchain/parse/testdata/function/declaration/implicit_params.carbon @@ -11,17 +11,17 @@ fn foo[a: i32, b: i32](); // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 9}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 9}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 14}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/params.carbon b/toolchain/parse/testdata/function/declaration/params.carbon index 0723ae0aa29c..9fad12d8562f 100644 --- a/toolchain/parse/testdata/function/declaration/params.carbon +++ b/toolchain/parse/testdata/function/declaration/params.carbon @@ -11,15 +11,15 @@ fn foo(a: i32, b: i32); // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 9}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 9}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 12}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/function/declaration/with_return_type.carbon b/toolchain/parse/testdata/function/declaration/with_return_type.carbon index e752e35b8f92..b45aba9c8472 100644 --- a/toolchain/parse/testdata/function/declaration/with_return_type.carbon +++ b/toolchain/parse/testdata/function/declaration/with_return_type.carbon @@ -11,8 +11,8 @@ fn foo() -> u32; // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'u32'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 7}, diff --git a/toolchain/parse/testdata/function/definition/basic.carbon b/toolchain/parse/testdata/function/definition/basic.carbon index 33e29196bc87..579fabb4b1cf 100644 --- a/toolchain/parse/testdata/function/definition/basic.carbon +++ b/toolchain/parse/testdata/function/definition/basic.carbon @@ -12,8 +12,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 6}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/function/definition/fail_identifier_in_statements.carbon b/toolchain/parse/testdata/function/definition/fail_identifier_in_statements.carbon index 8389b36b6cf6..929244688226 100644 --- a/toolchain/parse/testdata/function/definition/fail_identifier_in_statements.carbon +++ b/toolchain/parse/testdata/function/definition/fail_identifier_in_statements.carbon @@ -18,8 +18,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'bar'}, // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', has_error: yes, subtree_size: 7}, diff --git a/toolchain/parse/testdata/function/definition/with_params.carbon b/toolchain/parse/testdata/function/definition/with_params.carbon index cf23a225c471..a9c885035b56 100644 --- a/toolchain/parse/testdata/function/definition/with_params.carbon +++ b/toolchain/parse/testdata/function/definition/with_params.carbon @@ -13,15 +13,15 @@ fn foo(bar: i64, baz: i64) { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'bar'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i64'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'baz'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i64'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 9}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 9}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 12}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'foo'}, // CHECK:STDOUT: {kind: 'CallExprStart', text: '(', subtree_size: 2}, diff --git a/toolchain/parse/testdata/function/definition/with_return_type.carbon b/toolchain/parse/testdata/function/definition/with_return_type.carbon index ad8b2936822d..eb1134ea0838 100644 --- a/toolchain/parse/testdata/function/definition/with_return_type.carbon +++ b/toolchain/parse/testdata/function/definition/with_return_type.carbon @@ -13,8 +13,8 @@ fn foo() -> f64 { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'f64'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7}, diff --git a/toolchain/parse/testdata/generics/deduced_params/empty.carbon b/toolchain/parse/testdata/generics/deduced_params/empty.carbon index be6cfc2de7d3..f539c05425ac 100644 --- a/toolchain/parse/testdata/generics/deduced_params/empty.carbon +++ b/toolchain/parse/testdata/generics/deduced_params/empty.carbon @@ -13,17 +13,17 @@ interface Bar[]() {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 2}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 7}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 2}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 7}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 8}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/deduced_params/fail_no_parens.carbon b/toolchain/parse/testdata/generics/deduced_params/fail_no_parens.carbon index 9dd8fa4f408e..0e77a3092ba1 100644 --- a/toolchain/parse/testdata/generics/deduced_params/fail_no_parens.carbon +++ b/toolchain/parse/testdata/generics/deduced_params/fail_no_parens.carbon @@ -29,29 +29,29 @@ interface Bar[a: i32] {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', has_error: yes, subtree_size: 5}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', has_error: yes, subtree_size: 8}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 2}, // CHECK:STDOUT: {kind: 'InterfaceDecl', text: 'interface', has_error: yes, subtree_size: 5}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 5}, // CHECK:STDOUT: {kind: 'InterfaceDecl', text: 'interface', has_error: yes, subtree_size: 8}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/generics/deduced_params/one.carbon b/toolchain/parse/testdata/generics/deduced_params/one.carbon index a76280db3e07..92c65e0483cd 100644 --- a/toolchain/parse/testdata/generics/deduced_params/one.carbon +++ b/toolchain/parse/testdata/generics/deduced_params/one.carbon @@ -13,23 +13,23 @@ interface Bar[a: i32]() {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 10}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 10}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 11}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/deduced_params/one_suffix_comma.carbon b/toolchain/parse/testdata/generics/deduced_params/one_suffix_comma.carbon index 7f4e3633ffd6..623a79ebe83f 100644 --- a/toolchain/parse/testdata/generics/deduced_params/one_suffix_comma.carbon +++ b/toolchain/parse/testdata/generics/deduced_params/one_suffix_comma.carbon @@ -13,25 +13,25 @@ interface Bar[a: i32,]() {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 6}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 6}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 11}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 6}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 6}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 11}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 12}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/deduced_params/six.carbon b/toolchain/parse/testdata/generics/deduced_params/six.carbon index 36299cece390..4e78fac4e653 100644 --- a/toolchain/parse/testdata/generics/deduced_params/six.carbon +++ b/toolchain/parse/testdata/generics/deduced_params/six.carbon @@ -13,63 +13,63 @@ interface Bar[a: i32, b: i32, c: i32, d: i32, e: i32, f: i32]() {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'c'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'd'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'e'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'f'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 25}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 25}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 30}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'c'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'd'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'e'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'f'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 25}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 25}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 30}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 31}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/deduced_params/two.carbon b/toolchain/parse/testdata/generics/deduced_params/two.carbon index 6df6d40c757e..cbe8f2cba26e 100644 --- a/toolchain/parse/testdata/generics/deduced_params/two.carbon +++ b/toolchain/parse/testdata/generics/deduced_params/two.carbon @@ -13,31 +13,31 @@ interface Bar[a: i32, b: i32]() {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 9}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 9}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 14}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 9}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 9}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 14}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 15}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/deduced_params/two_suffix_comma.carbon b/toolchain/parse/testdata/generics/deduced_params/two_suffix_comma.carbon index dac8131f6db8..4e9911dc6fdb 100644 --- a/toolchain/parse/testdata/generics/deduced_params/two_suffix_comma.carbon +++ b/toolchain/parse/testdata/generics/deduced_params/two_suffix_comma.carbon @@ -13,33 +13,33 @@ interface Bar[a: i32, b: i32,]() {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 10}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 10}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 15}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 10}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 10}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 15}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 16}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/generic_params/basic.carbon b/toolchain/parse/testdata/generics/generic_params/basic.carbon index d60e8b59f7dc..c790c6a14c57 100644 --- a/toolchain/parse/testdata/generics/generic_params/basic.carbon +++ b/toolchain/parse/testdata/generics/generic_params/basic.carbon @@ -11,11 +11,11 @@ fn foo(a:! i32); // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'GenericPatternBinding', text: ':!', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 8}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/generics/generic_params/template.carbon b/toolchain/parse/testdata/generics/generic_params/template.carbon index c450a5c12d8d..bdf3406f03ef 100644 --- a/toolchain/parse/testdata/generics/generic_params/template.carbon +++ b/toolchain/parse/testdata/generics/generic_params/template.carbon @@ -11,12 +11,12 @@ fn foo(template a:! i32); // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'GenericPatternBinding', text: ':!', subtree_size: 3}, // CHECK:STDOUT: {kind: 'Template', text: 'template', subtree_size: 4}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 6}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 6}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 9}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/generics/generic_params/template_addr.carbon b/toolchain/parse/testdata/generics/generic_params/template_addr.carbon index 94b3d5d4bfc3..c04d00c08385 100644 --- a/toolchain/parse/testdata/generics/generic_params/template_addr.carbon +++ b/toolchain/parse/testdata/generics/generic_params/template_addr.carbon @@ -11,13 +11,13 @@ fn foo(template addr a:! i32); // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'GenericPatternBinding', text: ':!', subtree_size: 3}, // CHECK:STDOUT: {kind: 'Address', text: 'addr', subtree_size: 4}, // CHECK:STDOUT: {kind: 'Template', text: 'template', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 7}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 7}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 10}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, // CHECK:STDOUT: ] diff --git a/toolchain/parse/testdata/generics/interface/basic.carbon b/toolchain/parse/testdata/generics/interface/basic.carbon index ed983e7ff3ab..645861d889bd 100644 --- a/toolchain/parse/testdata/generics/interface/basic.carbon +++ b/toolchain/parse/testdata/generics/interface/basic.carbon @@ -17,31 +17,31 @@ interface Foo { // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Add'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'SelfValueName', text: 'self'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 15}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Add'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'SelfValueName', text: 'self'}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'foo'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 15}, diff --git a/toolchain/parse/testdata/generics/interface/fail_no_impl_allowed.carbon b/toolchain/parse/testdata/generics/interface/fail_no_impl_allowed.carbon index 46114823d6cc..0ff4529872a3 100644 --- a/toolchain/parse/testdata/generics/interface/fail_no_impl_allowed.carbon +++ b/toolchain/parse/testdata/generics/interface/fail_no_impl_allowed.carbon @@ -21,16 +21,16 @@ interface Foo { // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Add'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'SelfValueName', text: 'self'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 15}, diff --git a/toolchain/parse/testdata/generics/interface/fail_self_param_syntax.carbon b/toolchain/parse/testdata/generics/interface/fail_self_param_syntax.carbon index 2d6243525c85..beebc7cbbf4b 100644 --- a/toolchain/parse/testdata/generics/interface/fail_self_param_syntax.carbon +++ b/toolchain/parse/testdata/generics/interface/fail_self_param_syntax.carbon @@ -24,31 +24,31 @@ interface Foo { // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Sub'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'me'}, // CHECK:STDOUT: {kind: 'InvalidParse', text: 'Self', has_error: yes}, // CHECK:STDOUT: {kind: 'PatternBinding', text: 'me', has_error: yes, subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', has_error: yes, subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', has_error: yes, subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 15}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Mul'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'Name', text: 'Self', has_error: yes}, // CHECK:STDOUT: {kind: 'InvalidParse', text: 'Self', has_error: yes}, // CHECK:STDOUT: {kind: 'PatternBinding', text: 'Self', has_error: yes, subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', has_error: yes, subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', has_error: yes, subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 15}, diff --git a/toolchain/parse/testdata/generics/interface/non_instance_fn.carbon b/toolchain/parse/testdata/generics/interface/non_instance_fn.carbon index 1471ef0dc8bb..d1133b196721 100644 --- a/toolchain/parse/testdata/generics/interface/non_instance_fn.carbon +++ b/toolchain/parse/testdata/generics/interface/non_instance_fn.carbon @@ -16,8 +16,8 @@ interface Foo { // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'FooFactory'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 7}, diff --git a/toolchain/parse/testdata/generics/interface/self_pointer.carbon b/toolchain/parse/testdata/generics/interface/self_pointer.carbon index 332b132a4418..d7b4a16356e2 100644 --- a/toolchain/parse/testdata/generics/interface/self_pointer.carbon +++ b/toolchain/parse/testdata/generics/interface/self_pointer.carbon @@ -17,35 +17,35 @@ interface Foo { // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Sub'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'SelfValueName', text: 'self'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 4}, // CHECK:STDOUT: {kind: 'Address', text: 'addr', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 7}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 7}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 17}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Sub'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'SelfValueName', text: 'self'}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'foo'}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 4}, // CHECK:STDOUT: {kind: 'Address', text: 'addr', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 7}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 7}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 17}, diff --git a/toolchain/parse/testdata/generics/named_constraint/basic.carbon b/toolchain/parse/testdata/generics/named_constraint/basic.carbon index 6da39cb17bbd..101797b5e630 100644 --- a/toolchain/parse/testdata/generics/named_constraint/basic.carbon +++ b/toolchain/parse/testdata/generics/named_constraint/basic.carbon @@ -16,8 +16,8 @@ constraint Foo { // CHECK:STDOUT: {kind: 'NamedConstraintDefinitionStart', text: '{', subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Baz'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NamedConstraintDefinition', text: '}', subtree_size: 9}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/named_constraint/fail_no_impl_allowed.carbon b/toolchain/parse/testdata/generics/named_constraint/fail_no_impl_allowed.carbon index c7551b6dd9cb..7a32eef3e6dc 100644 --- a/toolchain/parse/testdata/generics/named_constraint/fail_no_impl_allowed.carbon +++ b/toolchain/parse/testdata/generics/named_constraint/fail_no_impl_allowed.carbon @@ -19,16 +19,16 @@ constraint Foo { // CHECK:STDOUT: {kind: 'NamedConstraintDefinitionStart', text: '{', subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Add'}, -// CHECK:STDOUT: {kind: 'ImplicitParameterListStart', text: '['}, +// CHECK:STDOUT: {kind: 'ImplicitParamListStart', text: '['}, // CHECK:STDOUT: {kind: 'SelfValueName', text: 'self'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ImplicitParameterList', text: ']', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ImplicitParamList', text: ']', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'SelfTypeNameExpr', text: 'Self'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: 'fn', has_error: yes, subtree_size: 15}, diff --git a/toolchain/parse/testdata/generics/params/empty.carbon b/toolchain/parse/testdata/generics/params/empty.carbon index 4e644a9facfe..8f1bc28be130 100644 --- a/toolchain/parse/testdata/generics/params/empty.carbon +++ b/toolchain/parse/testdata/generics/params/empty.carbon @@ -13,13 +13,13 @@ interface Bar() {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 6}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/params/one.carbon b/toolchain/parse/testdata/generics/params/one.carbon index 0bc7fd3961ed..90a690edf01c 100644 --- a/toolchain/parse/testdata/generics/params/one.carbon +++ b/toolchain/parse/testdata/generics/params/one.carbon @@ -13,19 +13,19 @@ interface Bar(a: i32) {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 8}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 8}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 9}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/params/one_suffix_comma.carbon b/toolchain/parse/testdata/generics/params/one_suffix_comma.carbon index d7afc67afa36..58faee31761d 100644 --- a/toolchain/parse/testdata/generics/params/one_suffix_comma.carbon +++ b/toolchain/parse/testdata/generics/params/one_suffix_comma.carbon @@ -13,21 +13,21 @@ interface Bar(a: i32,) {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 6}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 6}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 9}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 6}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 6}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 9}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 10}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/params/six.carbon b/toolchain/parse/testdata/generics/params/six.carbon index 3f4774c68cd5..0897ac848134 100644 --- a/toolchain/parse/testdata/generics/params/six.carbon +++ b/toolchain/parse/testdata/generics/params/six.carbon @@ -13,59 +13,59 @@ interface Bar(a: i32, b: i32, c: i32, d: i32, e: i32, f: i32) {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'c'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'd'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'e'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'f'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 25}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 25}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 28}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'c'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'd'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'e'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'f'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 25}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 25}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 28}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 29}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/params/two.carbon b/toolchain/parse/testdata/generics/params/two.carbon index 7a33ccb99da6..584d42e4091c 100644 --- a/toolchain/parse/testdata/generics/params/two.carbon +++ b/toolchain/parse/testdata/generics/params/two.carbon @@ -13,27 +13,27 @@ interface Bar(a: i32, b: i32) {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 9}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 9}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 12}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 9}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 9}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 12}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 13}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/generics/params/two_suffix_comma.carbon b/toolchain/parse/testdata/generics/params/two_suffix_comma.carbon index dadc1d4cb78f..08db43a6a2de 100644 --- a/toolchain/parse/testdata/generics/params/two_suffix_comma.carbon +++ b/toolchain/parse/testdata/generics/params/two_suffix_comma.carbon @@ -13,29 +13,29 @@ interface Bar(a: i32, b: i32,) {} // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, // CHECK:STDOUT: {kind: 'Name', text: 'Foo'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 10}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 10}, // CHECK:STDOUT: {kind: 'ClassDecl', text: ';', subtree_size: 13}, // CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 10}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 10}, // CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 13}, // CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 14}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/if/basic.carbon b/toolchain/parse/testdata/if/basic.carbon index f694669e8925..3001fdd1b696 100644 --- a/toolchain/parse/testdata/if/basic.carbon +++ b/toolchain/parse/testdata/if/basic.carbon @@ -19,8 +19,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'IfConditionStart', text: '('}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, diff --git a/toolchain/parse/testdata/if/else.carbon b/toolchain/parse/testdata/if/else.carbon index f3987f1c5473..2c5840dbafad 100644 --- a/toolchain/parse/testdata/if/else.carbon +++ b/toolchain/parse/testdata/if/else.carbon @@ -24,8 +24,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'IfConditionStart', text: '('}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, diff --git a/toolchain/parse/testdata/if/fail_else_unbraced.carbon b/toolchain/parse/testdata/if/fail_else_unbraced.carbon index 9943fe9e7692..5b803e3c1097 100644 --- a/toolchain/parse/testdata/if/fail_else_unbraced.carbon +++ b/toolchain/parse/testdata/if/fail_else_unbraced.carbon @@ -34,8 +34,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'IfConditionStart', text: '('}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, diff --git a/toolchain/parse/testdata/if/fail_errors.carbon b/toolchain/parse/testdata/if/fail_errors.carbon index 397d68f35fb2..64d4f6969ecb 100644 --- a/toolchain/parse/testdata/if/fail_errors.carbon +++ b/toolchain/parse/testdata/if/fail_errors.carbon @@ -31,8 +31,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'IfConditionStart', text: 'if', has_error: yes}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, diff --git a/toolchain/parse/testdata/if/fail_missing_cond.carbon b/toolchain/parse/testdata/if/fail_missing_cond.carbon index 692ce9ba7049..2e165b9b9e3f 100644 --- a/toolchain/parse/testdata/if/fail_missing_cond.carbon +++ b/toolchain/parse/testdata/if/fail_missing_cond.carbon @@ -17,8 +17,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'IfConditionStart', text: 'if', has_error: yes}, // CHECK:STDOUT: {kind: 'InvalidParse', text: '{', has_error: yes}, diff --git a/toolchain/parse/testdata/if/fail_square_brackets.carbon b/toolchain/parse/testdata/if/fail_square_brackets.carbon index 761349056307..00577c0b149b 100644 --- a/toolchain/parse/testdata/if/fail_square_brackets.carbon +++ b/toolchain/parse/testdata/if/fail_square_brackets.carbon @@ -22,8 +22,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'IfConditionStart', text: 'if', has_error: yes}, // CHECK:STDOUT: {kind: 'ArrayExprStart', text: '['}, diff --git a/toolchain/parse/testdata/if/fail_unbraced.carbon b/toolchain/parse/testdata/if/fail_unbraced.carbon index 30da79b565e5..66346deb351f 100644 --- a/toolchain/parse/testdata/if/fail_unbraced.carbon +++ b/toolchain/parse/testdata/if/fail_unbraced.carbon @@ -26,8 +26,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'IfConditionStart', text: '('}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, diff --git a/toolchain/parse/testdata/if_expression/basic.carbon b/toolchain/parse/testdata/if_expression/basic.carbon index e322f504843c..44e1a71fdfae 100644 --- a/toolchain/parse/testdata/if_expression/basic.carbon +++ b/toolchain/parse/testdata/if_expression/basic.carbon @@ -13,19 +13,19 @@ fn F(b: bool, x: i32, y: i32) -> bool { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'bool'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'x'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'y'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 13}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 13}, // CHECK:STDOUT: {kind: 'Literal', text: 'bool'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 18}, diff --git a/toolchain/parse/testdata/if_expression/fail_condition_missing.carbon b/toolchain/parse/testdata/if_expression/fail_condition_missing.carbon index 23dd88baf337..a54de6147813 100644 --- a/toolchain/parse/testdata/if_expression/fail_condition_missing.carbon +++ b/toolchain/parse/testdata/if_expression/fail_condition_missing.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'n'}, diff --git a/toolchain/parse/testdata/if_expression/fail_else_expr_missing.carbon b/toolchain/parse/testdata/if_expression/fail_else_expr_missing.carbon index cff583dc4198..e1640ca42a6e 100644 --- a/toolchain/parse/testdata/if_expression/fail_else_expr_missing.carbon +++ b/toolchain/parse/testdata/if_expression/fail_else_expr_missing.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'n'}, diff --git a/toolchain/parse/testdata/if_expression/fail_else_missing.carbon b/toolchain/parse/testdata/if_expression/fail_else_missing.carbon index 3a368321f0d0..7d2cfa040d2a 100644 --- a/toolchain/parse/testdata/if_expression/fail_else_missing.carbon +++ b/toolchain/parse/testdata/if_expression/fail_else_missing.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'n'}, diff --git a/toolchain/parse/testdata/if_expression/fail_then_expr_missing.carbon b/toolchain/parse/testdata/if_expression/fail_then_expr_missing.carbon index f37b8289fbdb..45339d34becf 100644 --- a/toolchain/parse/testdata/if_expression/fail_then_expr_missing.carbon +++ b/toolchain/parse/testdata/if_expression/fail_then_expr_missing.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'n'}, diff --git a/toolchain/parse/testdata/if_expression/fail_then_missing.carbon b/toolchain/parse/testdata/if_expression/fail_then_missing.carbon index ea670183549e..6131bfc5d0fe 100644 --- a/toolchain/parse/testdata/if_expression/fail_then_missing.carbon +++ b/toolchain/parse/testdata/if_expression/fail_then_missing.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'n'}, diff --git a/toolchain/parse/testdata/if_expression/fail_top_level_if.carbon b/toolchain/parse/testdata/if_expression/fail_top_level_if.carbon index 9fa1239069ea..3069bfd4d598 100644 --- a/toolchain/parse/testdata/if_expression/fail_top_level_if.carbon +++ b/toolchain/parse/testdata/if_expression/fail_top_level_if.carbon @@ -22,8 +22,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'IfConditionStart', text: 'if', has_error: yes}, // CHECK:STDOUT: {kind: 'Literal', text: 'true'}, diff --git a/toolchain/parse/testdata/if_expression/in_type.carbon b/toolchain/parse/testdata/if_expression/in_type.carbon index 11ade79d6b69..53f829e1ad3a 100644 --- a/toolchain/parse/testdata/if_expression/in_type.carbon +++ b/toolchain/parse/testdata/if_expression/in_type.carbon @@ -20,8 +20,8 @@ fn F() -> if true then i32 else i32* { // CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'true'}, // CHECK:STDOUT: {kind: 'IfExprIf', text: 'if', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, diff --git a/toolchain/parse/testdata/if_expression/precedence.carbon b/toolchain/parse/testdata/if_expression/precedence.carbon index 8418c4c4a331..25092a3194d4 100644 --- a/toolchain/parse/testdata/if_expression/precedence.carbon +++ b/toolchain/parse/testdata/if_expression/precedence.carbon @@ -13,11 +13,11 @@ fn F(b: bool) -> bool { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, // CHECK:STDOUT: {kind: 'Literal', text: 'bool'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'Literal', text: 'bool'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 10}, diff --git a/toolchain/parse/testdata/let/fail_missing_value.carbon b/toolchain/parse/testdata/let/fail_missing_value.carbon index c655807fbec1..b857b5165e1c 100644 --- a/toolchain/parse/testdata/let/fail_missing_value.carbon +++ b/toolchain/parse/testdata/let/fail_missing_value.carbon @@ -26,8 +26,8 @@ fn F() { // CHECK:STDOUT: {kind: 'LetDecl', text: ';', has_error: yes, subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'}, // CHECK:STDOUT: {kind: 'Name', text: 'b'}, diff --git a/toolchain/parse/testdata/let/let.carbon b/toolchain/parse/testdata/let/let.carbon index afffd80273be..876beca67e80 100644 --- a/toolchain/parse/testdata/let/let.carbon +++ b/toolchain/parse/testdata/let/let.carbon @@ -21,8 +21,8 @@ fn F() { // CHECK:STDOUT: {kind: 'LetDecl', text: ';', subtree_size: 7}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'LetIntroducer', text: 'let'}, // CHECK:STDOUT: {kind: 'Name', text: 's'}, diff --git a/toolchain/parse/testdata/namespace/basic.carbon b/toolchain/parse/testdata/namespace/basic.carbon index b20cb297cf79..2455484dd988 100644 --- a/toolchain/parse/testdata/namespace/basic.carbon +++ b/toolchain/parse/testdata/namespace/basic.carbon @@ -18,8 +18,8 @@ fn Bar() { // CHECK:STDOUT: {kind: 'Namespace', text: ';', subtree_size: 3}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'Foo'}, // CHECK:STDOUT: {kind: 'Name', text: 'Baz'}, diff --git a/toolchain/parse/testdata/namespace/nested.carbon b/toolchain/parse/testdata/namespace/nested.carbon index 1118f63f2b2c..1d2155ae5316 100644 --- a/toolchain/parse/testdata/namespace/nested.carbon +++ b/toolchain/parse/testdata/namespace/nested.carbon @@ -28,8 +28,8 @@ fn Foo.Bar.Baz() { // CHECK:STDOUT: {kind: 'QualifiedDecl', text: '.', subtree_size: 3}, // CHECK:STDOUT: {kind: 'Name', text: 'Baz'}, // CHECK:STDOUT: {kind: 'QualifiedDecl', text: '.', subtree_size: 5}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 9}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'Foo'}, // CHECK:STDOUT: {kind: 'Name', text: 'Bar'}, diff --git a/toolchain/parse/testdata/operators/assign.carbon b/toolchain/parse/testdata/operators/assign.carbon index 0c80ae020cf9..68f5137986c6 100644 --- a/toolchain/parse/testdata/operators/assign.carbon +++ b/toolchain/parse/testdata/operators/assign.carbon @@ -27,8 +27,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, diff --git a/toolchain/parse/testdata/operators/associative.carbon b/toolchain/parse/testdata/operators/associative.carbon index 28a1d100d50d..310d2509722b 100644 --- a/toolchain/parse/testdata/operators/associative.carbon +++ b/toolchain/parse/testdata/operators/associative.carbon @@ -13,8 +13,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, // CHECK:STDOUT: {kind: 'ShortCircuitOperand', text: 'and', subtree_size: 2}, diff --git a/toolchain/parse/testdata/operators/fail_chained_assign.carbon b/toolchain/parse/testdata/operators/fail_chained_assign.carbon index cfbe3cb19fd3..4f90fc81cf37 100644 --- a/toolchain/parse/testdata/operators/fail_chained_assign.carbon +++ b/toolchain/parse/testdata/operators/fail_chained_assign.carbon @@ -20,8 +20,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, diff --git a/toolchain/parse/testdata/operators/fail_postincrement.carbon b/toolchain/parse/testdata/operators/fail_postincrement.carbon index 782e96ae3a58..2575928a8956 100644 --- a/toolchain/parse/testdata/operators/fail_postincrement.carbon +++ b/toolchain/parse/testdata/operators/fail_postincrement.carbon @@ -22,8 +22,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'n'}, diff --git a/toolchain/parse/testdata/operators/fail_precedence_and_or.carbon b/toolchain/parse/testdata/operators/fail_precedence_and_or.carbon index 872a335c1e96..3e62356aa2ef 100644 --- a/toolchain/parse/testdata/operators/fail_precedence_and_or.carbon +++ b/toolchain/parse/testdata/operators/fail_precedence_and_or.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, // CHECK:STDOUT: {kind: 'ShortCircuitOperand', text: 'and', subtree_size: 2}, diff --git a/toolchain/parse/testdata/operators/fail_precedence_as.carbon b/toolchain/parse/testdata/operators/fail_precedence_as.carbon index 45433b3d946e..fde1b90e0413 100644 --- a/toolchain/parse/testdata/operators/fail_precedence_as.carbon +++ b/toolchain/parse/testdata/operators/fail_precedence_as.carbon @@ -27,11 +27,11 @@ fn F(n: i32) { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'n'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 8}, // CHECK:STDOUT: {kind: 'Literal', text: 'true'}, // CHECK:STDOUT: {kind: 'PrefixOperator', text: 'not', subtree_size: 2}, diff --git a/toolchain/parse/testdata/operators/fail_precedence_assign.carbon b/toolchain/parse/testdata/operators/fail_precedence_assign.carbon index 9801463b44c1..b479060d55c7 100644 --- a/toolchain/parse/testdata/operators/fail_precedence_assign.carbon +++ b/toolchain/parse/testdata/operators/fail_precedence_assign.carbon @@ -34,8 +34,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, diff --git a/toolchain/parse/testdata/operators/fail_precedence_or_and.carbon b/toolchain/parse/testdata/operators/fail_precedence_or_and.carbon index e48122206c17..b1e5078dbd3d 100644 --- a/toolchain/parse/testdata/operators/fail_precedence_or_and.carbon +++ b/toolchain/parse/testdata/operators/fail_precedence_or_and.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, // CHECK:STDOUT: {kind: 'ShortCircuitOperand', text: 'or', subtree_size: 2}, diff --git a/toolchain/parse/testdata/operators/fail_variety.carbon b/toolchain/parse/testdata/operators/fail_variety.carbon index c64a237bef33..b893c5bafb0e 100644 --- a/toolchain/parse/testdata/operators/fail_variety.carbon +++ b/toolchain/parse/testdata/operators/fail_variety.carbon @@ -28,8 +28,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'n'}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, diff --git a/toolchain/parse/testdata/operators/fixity_in_call.carbon b/toolchain/parse/testdata/operators/fixity_in_call.carbon index 9022e6477ee1..dbc8700abafd 100644 --- a/toolchain/parse/testdata/operators/fixity_in_call.carbon +++ b/toolchain/parse/testdata/operators/fixity_in_call.carbon @@ -13,8 +13,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'G'}, // CHECK:STDOUT: {kind: 'CallExprStart', text: '(', subtree_size: 2}, diff --git a/toolchain/parse/testdata/operators/fixity_in_params.carbon b/toolchain/parse/testdata/operators/fixity_in_params.carbon index b8f0ed15e486..4927ca4e7776 100644 --- a/toolchain/parse/testdata/operators/fixity_in_params.carbon +++ b/toolchain/parse/testdata/operators/fixity_in_params.carbon @@ -12,16 +12,16 @@ fn F(p: i32*, n: i32) { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'p'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 4}, -// CHECK:STDOUT: {kind: 'ParameterListComma', text: ','}, +// CHECK:STDOUT: {kind: 'ParamListComma', text: ','}, // CHECK:STDOUT: {kind: 'Name', text: 'n'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 10}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 10}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 13}, // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 14}, // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, diff --git a/toolchain/parse/testdata/operators/fixity_in_var.carbon b/toolchain/parse/testdata/operators/fixity_in_var.carbon index df664fa35f67..a9a8b9e42017 100644 --- a/toolchain/parse/testdata/operators/fixity_in_var.carbon +++ b/toolchain/parse/testdata/operators/fixity_in_var.carbon @@ -14,8 +14,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'q'}, diff --git a/toolchain/parse/testdata/operators/fixity_with_assign.carbon b/toolchain/parse/testdata/operators/fixity_with_assign.carbon index 51fe6aa2bd7d..43dbc105f0d5 100644 --- a/toolchain/parse/testdata/operators/fixity_with_assign.carbon +++ b/toolchain/parse/testdata/operators/fixity_with_assign.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 't'}, // CHECK:STDOUT: {kind: 'NameExpr', text: 't'}, diff --git a/toolchain/parse/testdata/operators/postfix_repeat.carbon b/toolchain/parse/testdata/operators/postfix_repeat.carbon index 9efd695fc6ff..33e46ca72f1a 100644 --- a/toolchain/parse/testdata/operators/postfix_repeat.carbon +++ b/toolchain/parse/testdata/operators/postfix_repeat.carbon @@ -13,8 +13,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2}, diff --git a/toolchain/parse/testdata/operators/precedence_as.carbon b/toolchain/parse/testdata/operators/precedence_as.carbon index 4b6f62ae5ac0..ba34a0b91c24 100644 --- a/toolchain/parse/testdata/operators/precedence_as.carbon +++ b/toolchain/parse/testdata/operators/precedence_as.carbon @@ -18,11 +18,11 @@ fn F(n: i32) { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'n'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 8}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'n'}, // CHECK:STDOUT: {kind: 'PrefixOperator', text: '-', subtree_size: 2}, diff --git a/toolchain/parse/testdata/operators/precedence_assign.carbon b/toolchain/parse/testdata/operators/precedence_assign.carbon index 4bbc600758cf..b6ccd2872629 100644 --- a/toolchain/parse/testdata/operators/precedence_assign.carbon +++ b/toolchain/parse/testdata/operators/precedence_assign.carbon @@ -18,11 +18,11 @@ fn F(c: bool) { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'c'}, // CHECK:STDOUT: {kind: 'Literal', text: 'bool'}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 8}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 'a'}, diff --git a/toolchain/parse/testdata/operators/precedence_not.carbon b/toolchain/parse/testdata/operators/precedence_not.carbon index 923f1bf801a3..3b69108e7787 100644 --- a/toolchain/parse/testdata/operators/precedence_not.carbon +++ b/toolchain/parse/testdata/operators/precedence_not.carbon @@ -13,8 +13,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, // CHECK:STDOUT: {kind: 'PrefixOperator', text: 'not', subtree_size: 2}, diff --git a/toolchain/parse/testdata/operators/precedence_unary.carbon b/toolchain/parse/testdata/operators/precedence_unary.carbon index 5c7517162f03..d6135a6e8c16 100644 --- a/toolchain/parse/testdata/operators/precedence_unary.carbon +++ b/toolchain/parse/testdata/operators/precedence_unary.carbon @@ -18,12 +18,12 @@ fn F(p: i32*) { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'p'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 4}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 6}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 6}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 9}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'p'}, // CHECK:STDOUT: {kind: 'PrefixOperator', text: '*', subtree_size: 2}, diff --git a/toolchain/parse/testdata/operators/prefix_repeat.carbon b/toolchain/parse/testdata/operators/prefix_repeat.carbon index d4d1a25c3970..f695a23fb98f 100644 --- a/toolchain/parse/testdata/operators/prefix_repeat.carbon +++ b/toolchain/parse/testdata/operators/prefix_repeat.carbon @@ -13,8 +13,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'n'}, // CHECK:STDOUT: {kind: 'PrefixOperator', text: '&', subtree_size: 2}, diff --git a/toolchain/parse/testdata/operators/recover_prefix_repeat.carbon b/toolchain/parse/testdata/operators/recover_prefix_repeat.carbon index c2a941bd4ecb..2fd1cdd6e0be 100644 --- a/toolchain/parse/testdata/operators/recover_prefix_repeat.carbon +++ b/toolchain/parse/testdata/operators/recover_prefix_repeat.carbon @@ -15,8 +15,8 @@ fn F() -> const const i32* { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PrefixOperator', text: 'const', subtree_size: 2}, // CHECK:STDOUT: {kind: 'PrefixOperator', text: 'const', subtree_size: 3}, diff --git a/toolchain/parse/testdata/packages/import/fail_after_decl.carbon b/toolchain/parse/testdata/packages/import/fail_after_decl.carbon index e638def19046..4ee55b272ada 100644 --- a/toolchain/parse/testdata/packages/import/fail_after_decl.carbon +++ b/toolchain/parse/testdata/packages/import/fail_after_decl.carbon @@ -19,8 +19,8 @@ import B; // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'A'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'}, // CHECK:STDOUT: {kind: 'ImportDirective', text: ';', has_error: yes, subtree_size: 2}, diff --git a/toolchain/parse/testdata/packages/import/fail_after_decl_repeated.carbon b/toolchain/parse/testdata/packages/import/fail_after_decl_repeated.carbon index 5ab78341e6ac..92aa0ab0badf 100644 --- a/toolchain/parse/testdata/packages/import/fail_after_decl_repeated.carbon +++ b/toolchain/parse/testdata/packages/import/fail_after_decl_repeated.carbon @@ -41,8 +41,8 @@ import G; // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'A'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'}, // CHECK:STDOUT: {kind: 'ImportDirective', text: ';', has_error: yes, subtree_size: 2}, @@ -52,8 +52,8 @@ import G; // CHECK:STDOUT: {kind: 'PackageDirective', text: ';', has_error: yes, subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'E'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ImportIntroducer', text: 'import'}, // CHECK:STDOUT: {kind: 'ImportDirective', text: ';', has_error: yes, subtree_size: 2}, diff --git a/toolchain/parse/testdata/packages/package/fail_after_decl.carbon b/toolchain/parse/testdata/packages/package/fail_after_decl.carbon index 7562c71425ef..69ebfbd945a0 100644 --- a/toolchain/parse/testdata/packages/package/fail_after_decl.carbon +++ b/toolchain/parse/testdata/packages/package/fail_after_decl.carbon @@ -19,8 +19,8 @@ package B api; // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'A'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'PackageIntroducer', text: 'package'}, // CHECK:STDOUT: {kind: 'PackageDirective', text: ';', has_error: yes, subtree_size: 2}, diff --git a/toolchain/parse/testdata/pointer/const_pointer.carbon b/toolchain/parse/testdata/pointer/const_pointer.carbon index ea202025bea1..eff8cd47416f 100644 --- a/toolchain/parse/testdata/pointer/const_pointer.carbon +++ b/toolchain/parse/testdata/pointer/const_pointer.carbon @@ -13,8 +13,8 @@ fn C() -> const (i32*) { return C(); } // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'A'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PrefixOperator', text: 'const', subtree_size: 2}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 3}, @@ -28,8 +28,8 @@ fn C() -> const (i32*) { return C(); } // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 15}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'B'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ParenExprOrTupleLiteralStart', text: '('}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PrefixOperator', text: 'const', subtree_size: 2}, @@ -45,8 +45,8 @@ fn C() -> const (i32*) { return C(); } // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 17}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'C'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ParenExprOrTupleLiteralStart', text: '('}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2}, diff --git a/toolchain/parse/testdata/pointer/fail_pointer_type_in_expression.carbon b/toolchain/parse/testdata/pointer/fail_pointer_type_in_expression.carbon index 2ec14af476fc..0c16ac993367 100644 --- a/toolchain/parse/testdata/pointer/fail_pointer_type_in_expression.carbon +++ b/toolchain/parse/testdata/pointer/fail_pointer_type_in_expression.carbon @@ -37,8 +37,8 @@ fn H() -> i32 { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7}, @@ -53,8 +53,8 @@ fn H() -> i32 { // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 16}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'G'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7}, @@ -67,8 +67,8 @@ fn H() -> i32 { // CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 14}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'H'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7}, diff --git a/toolchain/parse/testdata/pointer/pointer_type.carbon b/toolchain/parse/testdata/pointer/pointer_type.carbon index d2b33bf90615..5a3abe7c0898 100644 --- a/toolchain/parse/testdata/pointer/pointer_type.carbon +++ b/toolchain/parse/testdata/pointer/pointer_type.carbon @@ -15,12 +15,12 @@ var T: type = if true then i32* else f64*; // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, // CHECK:STDOUT: {kind: 'Name', text: 'p'}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2}, // CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 4}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 6}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 6}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 3}, diff --git a/toolchain/parse/testdata/pointer/pointer_value.carbon b/toolchain/parse/testdata/pointer/pointer_value.carbon index e5595dc89f05..ffbbeaa278b2 100644 --- a/toolchain/parse/testdata/pointer/pointer_value.carbon +++ b/toolchain/parse/testdata/pointer/pointer_value.carbon @@ -16,8 +16,8 @@ fn F() -> i32 { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'i32'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7}, diff --git a/toolchain/parse/testdata/return/basic.carbon b/toolchain/parse/testdata/return/basic.carbon index 8d49a95fcd9d..a89cd4d1fa57 100644 --- a/toolchain/parse/testdata/return/basic.carbon +++ b/toolchain/parse/testdata/return/basic.carbon @@ -13,8 +13,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ReturnStatementStart', text: 'return'}, // CHECK:STDOUT: {kind: 'ReturnStatement', text: ';', subtree_size: 2}, diff --git a/toolchain/parse/testdata/return/expr.carbon b/toolchain/parse/testdata/return/expr.carbon index 80554fcf3015..afd5d484188e 100644 --- a/toolchain/parse/testdata/return/expr.carbon +++ b/toolchain/parse/testdata/return/expr.carbon @@ -13,8 +13,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ReturnStatementStart', text: 'return'}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'x'}, diff --git a/toolchain/parse/testdata/return/fail_expr_no_semi.carbon b/toolchain/parse/testdata/return/fail_expr_no_semi.carbon index 9807a4f443b9..cdb958ad1026 100644 --- a/toolchain/parse/testdata/return/fail_expr_no_semi.carbon +++ b/toolchain/parse/testdata/return/fail_expr_no_semi.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ReturnStatementStart', text: 'return'}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'x'}, diff --git a/toolchain/parse/testdata/return/fail_no_semi.carbon b/toolchain/parse/testdata/return/fail_no_semi.carbon index a43d9e617f87..70c4284d7efa 100644 --- a/toolchain/parse/testdata/return/fail_no_semi.carbon +++ b/toolchain/parse/testdata/return/fail_no_semi.carbon @@ -19,8 +19,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ReturnStatementStart', text: 'return'}, // CHECK:STDOUT: {kind: 'InvalidParse', text: '}', has_error: yes}, diff --git a/toolchain/parse/testdata/return/fail_returned_no_var.carbon b/toolchain/parse/testdata/return/fail_returned_no_var.carbon index ceba1cf7ee11..e3d53f2de8c4 100644 --- a/toolchain/parse/testdata/return/fail_returned_no_var.carbon +++ b/toolchain/parse/testdata/return/fail_returned_no_var.carbon @@ -16,8 +16,8 @@ fn F() -> String { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'String'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7}, diff --git a/toolchain/parse/testdata/return/fail_var_no_semi.carbon b/toolchain/parse/testdata/return/fail_var_no_semi.carbon index c5a73048e0d2..89805366f74f 100644 --- a/toolchain/parse/testdata/return/fail_var_no_semi.carbon +++ b/toolchain/parse/testdata/return/fail_var_no_semi.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'ReturnStatementStart', text: 'return'}, // CHECK:STDOUT: {kind: 'ReturnVarSpecifier', text: 'var'}, diff --git a/toolchain/parse/testdata/return/returned_var.carbon b/toolchain/parse/testdata/return/returned_var.carbon index dc6e8da45354..e281c4a62c36 100644 --- a/toolchain/parse/testdata/return/returned_var.carbon +++ b/toolchain/parse/testdata/return/returned_var.carbon @@ -14,8 +14,8 @@ fn F() -> String { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'Literal', text: 'String'}, // CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7}, diff --git a/toolchain/parse/testdata/var/var.carbon b/toolchain/parse/testdata/var/var.carbon index 1a197602cd16..88ffd98f0dbe 100644 --- a/toolchain/parse/testdata/var/var.carbon +++ b/toolchain/parse/testdata/var/var.carbon @@ -27,8 +27,8 @@ fn F() { // CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 5}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'}, // CHECK:STDOUT: {kind: 'Name', text: 's'}, diff --git a/toolchain/parse/testdata/while/basic.carbon b/toolchain/parse/testdata/while/basic.carbon index f0aa11e3c512..605920d441a6 100644 --- a/toolchain/parse/testdata/while/basic.carbon +++ b/toolchain/parse/testdata/while/basic.carbon @@ -20,8 +20,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'WhileConditionStart', text: '('}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, diff --git a/toolchain/parse/testdata/while/fail_no_semi.carbon b/toolchain/parse/testdata/while/fail_no_semi.carbon index fd74fc8ba4b9..179500d93ddf 100644 --- a/toolchain/parse/testdata/while/fail_no_semi.carbon +++ b/toolchain/parse/testdata/while/fail_no_semi.carbon @@ -26,8 +26,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'WhileConditionStart', text: '('}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, diff --git a/toolchain/parse/testdata/while/fail_unbraced.carbon b/toolchain/parse/testdata/while/fail_unbraced.carbon index b3b3bf60486a..34b6f4fa371a 100644 --- a/toolchain/parse/testdata/while/fail_unbraced.carbon +++ b/toolchain/parse/testdata/while/fail_unbraced.carbon @@ -18,8 +18,8 @@ fn F() { // CHECK:STDOUT: {kind: 'FileStart', text: ''}, // CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'}, // CHECK:STDOUT: {kind: 'Name', text: 'F'}, -// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('}, -// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2}, +// CHECK:STDOUT: {kind: 'ParamListStart', text: '('}, +// CHECK:STDOUT: {kind: 'ParamList', text: ')', subtree_size: 2}, // CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5}, // CHECK:STDOUT: {kind: 'WhileConditionStart', text: '('}, // CHECK:STDOUT: {kind: 'NameExpr', text: 'a'}, diff --git a/toolchain/parse/tree_test.cpp b/toolchain/parse/tree_test.cpp index caab3f2c681e..feaa16954950 100644 --- a/toolchain/parse/tree_test.cpp +++ b/toolchain/parse/tree_test.cpp @@ -68,9 +68,9 @@ TEST_F(TreeTest, PrintPostorderAsYAML) { ElementsAre(Pair("kind", "FunctionIntroducer"), Pair("text", "fn"))), Yaml::Mapping(ElementsAre(Pair("kind", "Name"), Pair("text", "F"))), Yaml::Mapping( - ElementsAre(Pair("kind", "ParameterListStart"), Pair("text", "("))), - Yaml::Mapping(ElementsAre(Pair("kind", "ParameterList"), - Pair("text", ")"), Pair("subtree_size", "2"))), + ElementsAre(Pair("kind", "ParamListStart"), Pair("text", "("))), + Yaml::Mapping(ElementsAre(Pair("kind", "ParamList"), Pair("text", ")"), + Pair("subtree_size", "2"))), Yaml::Mapping(ElementsAre(Pair("kind", "FunctionDecl"), Pair("text", ";"), Pair("subtree_size", "5"))), Yaml::Mapping(ElementsAre(Pair("kind", "FileEnd"), Pair("text", ""))))); @@ -89,8 +89,8 @@ TEST_F(TreeTest, PrintPreorderAsYAML) { TestRawOstream print_stream; tree.Print(print_stream, /*preorder=*/true); - auto parameter_list = Yaml::Sequence(ElementsAre(Yaml::Mapping( - ElementsAre(Pair("node_index", "3"), Pair("kind", "ParameterListStart"), + auto param_list = Yaml::Sequence(ElementsAre(Yaml::Mapping( + ElementsAre(Pair("node_index", "3"), Pair("kind", "ParamListStart"), Pair("text", "("))))); auto function_decl = Yaml::Sequence(ElementsAre( @@ -99,10 +99,9 @@ TEST_F(TreeTest, PrintPreorderAsYAML) { Pair("text", "fn"))), Yaml::Mapping(ElementsAre(Pair("node_index", "2"), Pair("kind", "Name"), Pair("text", "F"))), - Yaml::Mapping(ElementsAre(Pair("node_index", "4"), - Pair("kind", "ParameterList"), - Pair("text", ")"), Pair("subtree_size", "2"), - Pair("children", parameter_list))))); + Yaml::Mapping(ElementsAre( + Pair("node_index", "4"), Pair("kind", "ParamList"), Pair("text", ")"), + Pair("subtree_size", "2"), Pair("children", param_list))))); auto file = Yaml::Sequence(ElementsAre( Yaml::Mapping(ElementsAre(Pair("node_index", "0"), diff --git a/toolchain/sem_ir/file.cpp b/toolchain/sem_ir/file.cpp index 28e7d23899fd..067d9ae89d82 100644 --- a/toolchain/sem_ir/file.cpp +++ b/toolchain/sem_ir/file.cpp @@ -207,11 +207,11 @@ static auto GetTypePrecedence(InstKind kind) -> int { case IntegerLiteral::Kind: case Namespace::Kind: case NoOp::Kind: - case Parameter::Kind: + case Param::Kind: case RealLiteral::Kind: case Return::Kind: case ReturnExpr::Kind: - case SelfParameter::Kind: + case SelfParam::Kind: case SpliceBlock::Kind: case StringLiteral::Kind: case StructAccess::Kind: @@ -410,11 +410,11 @@ auto File::StringifyTypeExpr(InstId outer_inst_id, bool in_type_context) const case IntegerLiteral::Kind: case Namespace::Kind: case NoOp::Kind: - case Parameter::Kind: + case Param::Kind: case RealLiteral::Kind: case Return::Kind: case ReturnExpr::Kind: - case SelfParameter::Kind: + case SelfParam::Kind: case SpliceBlock::Kind: case StringLiteral::Kind: case StructAccess::Kind: @@ -507,10 +507,10 @@ auto GetExprCategory(const File& file, InstId inst_id) -> ExprCategory { case ClassType::Kind: case ConstType::Kind: case IntegerLiteral::Kind: - case Parameter::Kind: + case Param::Kind: case PointerType::Kind: case RealLiteral::Kind: - case SelfParameter::Kind: + case SelfParam::Kind: case StringLiteral::Kind: case StructValue::Kind: case StructType::Kind: diff --git a/toolchain/sem_ir/formatter.cpp b/toolchain/sem_ir/formatter.cpp index 211a8f087873..07778319c71e 100644 --- a/toolchain/sem_ir/formatter.cpp +++ b/toolchain/sem_ir/formatter.cpp @@ -444,14 +444,13 @@ class InstNamer { add_inst_name_id(inst.As().name_id, ".ref"); continue; } - case Parameter::Kind: { - add_inst_name_id(inst.As().name_id); + case Param::Kind: { + add_inst_name_id(inst.As().name_id); continue; } - case SelfParameter::Kind: { - add_inst_name(inst.As().is_addr_self.index - ? "self.addr" - : "self"); + case SelfParam::Kind: { + add_inst_name(inst.As().is_addr_self.index ? "self.addr" + : "self"); continue; } case VarStorage::Kind: { @@ -556,12 +555,12 @@ class Formatter { if (fn.implicit_param_refs_id != InstBlockId::Empty) { out_ << "["; - FormatParameterList(fn.implicit_param_refs_id); + FormatParamList(fn.implicit_param_refs_id); out_ << "]"; } out_ << "("; - FormatParameterList(fn.param_refs_id); + FormatParamList(fn.param_refs_id); out_ << ")"; if (fn.return_type_id.is_valid()) { @@ -591,7 +590,7 @@ class Formatter { } } - auto FormatParameterList(InstBlockId param_refs_id) -> void { + auto FormatParamList(InstBlockId param_refs_id) -> void { llvm::ListSeparator sep; for (const InstId param_id : sem_ir_.inst_blocks().Get(param_refs_id)) { out_ << sep; diff --git a/toolchain/sem_ir/inst_kind.def b/toolchain/sem_ir/inst_kind.def index 421096a785f6..a5322ecc25ef 100644 --- a/toolchain/sem_ir/inst_kind.def +++ b/toolchain/sem_ir/inst_kind.def @@ -48,12 +48,12 @@ CARBON_SEM_IR_INST_KIND(IntegerLiteral) CARBON_SEM_IR_INST_KIND(NameReference) CARBON_SEM_IR_INST_KIND(Namespace) CARBON_SEM_IR_INST_KIND(NoOp) -CARBON_SEM_IR_INST_KIND(Parameter) +CARBON_SEM_IR_INST_KIND(Param) CARBON_SEM_IR_INST_KIND(PointerType) CARBON_SEM_IR_INST_KIND(RealLiteral) CARBON_SEM_IR_INST_KIND(ReturnExpr) CARBON_SEM_IR_INST_KIND(Return) -CARBON_SEM_IR_INST_KIND(SelfParameter) +CARBON_SEM_IR_INST_KIND(SelfParam) CARBON_SEM_IR_INST_KIND(SpliceBlock) CARBON_SEM_IR_INST_KIND(StringLiteral) CARBON_SEM_IR_INST_KIND(StructAccess) diff --git a/toolchain/sem_ir/typed_insts.h b/toolchain/sem_ir/typed_insts.h index e062ff79acec..0fb53a7e6a36 100644 --- a/toolchain/sem_ir/typed_insts.h +++ b/toolchain/sem_ir/typed_insts.h @@ -335,8 +335,8 @@ struct NoOp { // This instruction doesn't produce a value, so has no type. }; -struct Parameter { - static constexpr auto Kind = InstKind::Parameter.Define("parameter"); +struct Param { + static constexpr auto Kind = InstKind::Param.Define("param"); Parse::Node parse_node; TypeId type_id; @@ -376,8 +376,8 @@ struct ReturnExpr { InstId expr_id; }; -struct SelfParameter { - static constexpr auto Kind = InstKind::SelfParameter.Define("self_parameter"); +struct SelfParam { + static constexpr auto Kind = InstKind::SelfParam.Define("self_param"); static constexpr llvm::StringLiteral Name = "self"; Parse::Node parse_node;