carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 19:41:07 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Rename Parse::Node -> Parse::NodeId. (#3432)

Browse Source 
As discussed [on
discord](https://discord.com/channels/655572317891461132/655578254970716160/1178878128714678282)
and today's toolchain discussion.
This commit is contained in:
Richard Smith
2023-11-29 18:53:12 +00:00
committed by GitHub
parent 0c0998d7cd
commit 332a368cee
45 changed files with 396 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_struct.cpp
+11 -9
View File
@@ -7,12 +7,12 @@
namespace Carbon::Check {
auto HandleStructComma(Context& context, Parse::Node /*parse_node*/) -> bool {
auto HandleStructComma(Context& context, Parse::NodeId /*parse_node*/) -> bool {
context.ParamOrArgComma();
return true;
}
auto HandleStructFieldDesignator(Context& context, Parse::Node /*parse_node*/)
auto HandleStructFieldDesignator(Context& context, Parse::NodeId /*parse_node*/)
-> bool {
// This leaves the designated name on top because the `.` isn't interesting.
CARBON_CHECK(
@@ -21,7 +21,7 @@ auto HandleStructFieldDesignator(Context& context, Parse::Node /*parse_node*/)
return true;
}
auto HandleStructFieldType(Context& context, Parse::Node parse_node) -> bool {
auto HandleStructFieldType(Context& context, Parse::NodeId parse_node) -> bool {
auto [type_node, type_id] = context.node_stack().PopExprWithParseNode();
SemIR::TypeId cast_type_id = ExprAsType(context, type_node, type_id);
@@ -33,12 +33,13 @@ auto HandleStructFieldType(Context& context, Parse::Node parse_node) -> bool {
return true;
}
auto HandleStructFieldUnknown(Context& context, Parse::Node parse_node)
auto HandleStructFieldUnknown(Context& context, Parse::NodeId parse_node)
-> bool {
return context.TODO(parse_node, "HandleStructFieldUnknown");
}
auto HandleStructFieldValue(Context& context, Parse::Node parse_node) -> bool {
auto HandleStructFieldValue(Context& context, Parse::NodeId parse_node)
-> bool {
auto value_inst_id = context.node_stack().PopExpr();
auto [name_node, name_id] =
context.node_stack().PopWithParseNode<Parse::NodeKind::Name>();
@@ -57,7 +58,7 @@ static auto DiagnoseDuplicateNames(Context& context,
llvm::StringRef construct) -> bool {
auto& sem_ir = context.sem_ir();
auto fields = sem_ir.inst_blocks().Get(type_block_id);
llvm::SmallDenseMap<SemIR::NameId, Parse::Node> names;
llvm::SmallDenseMap<SemIR::NameId, Parse::NodeId> names;
auto& insts = sem_ir.insts();
for (SemIR::InstId field_inst_id : fields) {
auto field_inst = insts.GetAs<SemIR::StructTypeField>(field_inst_id);
@@ -80,7 +81,7 @@ static auto DiagnoseDuplicateNames(Context& context,
return false;
}
auto HandleStructLiteral(Context& context, Parse::Node parse_node) -> bool {
auto HandleStructLiteral(Context& context, Parse::NodeId parse_node) -> bool {
auto refs_id = context.ParamOrArgEnd(
Parse::NodeKind::StructLiteralOrStructTypeLiteralStart);
@@ -103,7 +104,7 @@ auto HandleStructLiteral(Context& context, Parse::Node parse_node) -> bool {
}
auto HandleStructLiteralOrStructTypeLiteralStart(Context& context,
Parse::Node parse_node)
Parse::NodeId parse_node)
-> bool {
context.PushScope();
context.node_stack().Push(parse_node);
@@ -115,7 +116,8 @@ auto HandleStructLiteralOrStructTypeLiteralStart(Context& context,
return true;
}
auto HandleStructTypeLiteral(Context& context, Parse::Node parse_node) -> bool {
auto HandleStructTypeLiteral(Context& context, Parse::NodeId parse_node)
-> bool {
auto refs_id = context.ParamOrArgEnd(
Parse::NodeKind::StructLiteralOrStructTypeLiteralStart);