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

Rename parse_node -> node_id (#3760)

Browse Source 
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.
This commit is contained in:
Jon Ross-Perkins
2024-03-09 00:21:29 +00:00
committed by GitHub
parent a1317e61e0
commit 86a7c9ff45
57 changed files with 1050 additions and 1115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_array.cpp
+12 -12
View File
@@ -9,29 +9,29 @@
namespace Carbon::Check {
auto HandleArrayExprStart(Context& /*context*/,
Parse::ArrayExprStartId /*parse_node*/) -> bool {
Parse::ArrayExprStartId /*node_id*/) -> bool {
return true;
}
auto HandleArrayExprSemi(Context& context, Parse::ArrayExprSemiId parse_node)
auto HandleArrayExprSemi(Context& context, Parse::ArrayExprSemiId node_id)
-> bool {
context.node_stack().Push(parse_node);
context.node_stack().Push(node_id);
return true;
}
auto HandleArrayExpr(Context& context, Parse::ArrayExprId parse_node) -> bool {
auto HandleArrayExpr(Context& context, Parse::ArrayExprId node_id) -> bool {
// TODO: Handle array type with undefined bound.
if (context.node_stack()
.PopAndDiscardSoloParseNodeIf<Parse::NodeKind::ArrayExprSemi>()) {
.PopAndDiscardSoloNodeIdIf<Parse::NodeKind::ArrayExprSemi>()) {
context.node_stack().PopAndIgnore();
return context.TODO(parse_node, "HandleArrayExprWithoutBounds");
return context.TODO(node_id, "HandleArrayExprWithoutBounds");
}
auto bound_inst_id = context.node_stack().PopExpr();
context.node_stack()
.PopAndDiscardSoloParseNode<Parse::NodeKind::ArrayExprSemi>();
.PopAndDiscardSoloNodeId<Parse::NodeKind::ArrayExprSemi>();
auto [element_type_node_id, element_type_inst_id] =
context.node_stack().PopExprWithParseNode();
context.node_stack().PopExprWithNodeId();
// The array bound must be a constant.
//
@@ -42,14 +42,14 @@ auto HandleArrayExpr(Context& context, Parse::ArrayExprId parse_node) -> bool {
CARBON_DIAGNOSTIC(InvalidArrayExpr, Error,
"Array bound is not a constant.");
context.emitter().Emit(bound_inst_id, InvalidArrayExpr);
context.node_stack().Push(parse_node, SemIR::InstId::BuiltinError);
context.node_stack().Push(node_id, SemIR::InstId::BuiltinError);
return true;
}
context.AddInstAndPush(
{parse_node, SemIR::ArrayType{SemIR::TypeId::TypeType, bound_inst_id,
ExprAsType(context, element_type_node_id,
element_type_inst_id)}});
{node_id, SemIR::ArrayType{SemIR::TypeId::TypeType, bound_inst_id,
ExprAsType(context, element_type_node_id,
element_type_inst_id)}});
return true;
}