mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-04 10:11:06 +01:00
Rename parse_node -> node_id (#3760)
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:
@@ -6,18 +6,17 @@
|
||||
|
||||
namespace Carbon::Check {
|
||||
|
||||
auto HandleCodeBlockStart(Context& context, Parse::CodeBlockStartId parse_node)
|
||||
auto HandleCodeBlockStart(Context& context, Parse::CodeBlockStartId node_id)
|
||||
-> bool {
|
||||
context.node_stack().Push(parse_node);
|
||||
context.node_stack().Push(node_id);
|
||||
context.scope_stack().Push();
|
||||
return true;
|
||||
}
|
||||
|
||||
auto HandleCodeBlock(Context& context, Parse::CodeBlockId /*parse_node*/)
|
||||
-> bool {
|
||||
auto HandleCodeBlock(Context& context, Parse::CodeBlockId /*node_id*/) -> bool {
|
||||
context.scope_stack().Pop();
|
||||
context.node_stack()
|
||||
.PopAndDiscardSoloParseNode<Parse::NodeKind::CodeBlockStart>();
|
||||
.PopAndDiscardSoloNodeId<Parse::NodeKind::CodeBlockStart>();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user