mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
Jon Ross-Perkins
86a7c9ff45
This was previously discussed at https://discord.com/channels/655572317891461132/655578254970716160/1209975051588210729. I'm initiating this mainly because we typically use "id" suffixes to indicate an `IdBase` being passed around and the non-id suffix of `parse_node` suggests at it carrying more data than it actually does. There used to be more reason for avoiding `node_id` because `SemIR::InstId` used to be named `NodeId`, but that's no longer necessary. As a consequence, I'd like to rename `parse_node` to more precisely reflect its type. In full, this is doing: ``` parse_node_kind -> node_kind parse_node -> node_id ParseNodeCategory -> NodeCategory ParseNodeKind -> NodeKind ParseNode -> NodeId ``` This is primarily in check and sem_ir, but with some `parse_node_kind` references in parse too. Pluralization is consistent with name forms on both sides, so that wasn't part of my replacements.
57 lines
1.8 KiB
C++
57 lines
1.8 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "toolchain/check/context.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto HandleExprOpenParen(Context& context, Parse::ExprOpenParenId node_id)
|
|
-> bool {
|
|
context.node_stack().Push(node_id);
|
|
context.param_and_arg_refs_stack().Push();
|
|
return true;
|
|
}
|
|
|
|
auto HandleParenExpr(Context& context, Parse::ParenExprId node_id) -> bool {
|
|
auto value_id = context.node_stack().PopExpr();
|
|
|
|
// This always is always pushed at the open paren. It's only used for tuples,
|
|
// not paren exprs, but we still need to clean up.
|
|
context.param_and_arg_refs_stack().PopAndDiscard();
|
|
|
|
context.node_stack()
|
|
.PopAndDiscardSoloNodeId<Parse::NodeKind::ExprOpenParen>();
|
|
context.node_stack().Push(node_id, value_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleTupleLiteralComma(Context& context,
|
|
Parse::TupleLiteralCommaId /*node_id*/) -> bool {
|
|
context.param_and_arg_refs_stack().ApplyComma();
|
|
return true;
|
|
}
|
|
|
|
auto HandleTupleLiteral(Context& context, Parse::TupleLiteralId node_id)
|
|
-> bool {
|
|
auto refs_id = context.param_and_arg_refs_stack().EndAndPop(
|
|
Parse::NodeKind::ExprOpenParen);
|
|
|
|
context.node_stack()
|
|
.PopAndDiscardSoloNodeId<Parse::NodeKind::ExprOpenParen>();
|
|
const auto& inst_block = context.inst_blocks().Get(refs_id);
|
|
llvm::SmallVector<SemIR::TypeId> type_ids;
|
|
type_ids.reserve(inst_block.size());
|
|
for (auto inst : inst_block) {
|
|
type_ids.push_back(context.insts().Get(inst).type_id());
|
|
}
|
|
auto type_id = context.GetTupleType(type_ids);
|
|
|
|
auto value_id =
|
|
context.AddInst({node_id, SemIR::TupleLiteral{type_id, refs_id}});
|
|
context.node_stack().Push(node_id, value_id);
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|