carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +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/check.cpp
+10 -10
View File
@@ -21,7 +21,7 @@ namespace Carbon::Check {
// Parse node handlers. Returns false for unrecoverable errors.
#define CARBON_PARSE_NODE_KIND(Name) \
auto Handle##Name(Context& context, Parse::Name##Id parse_node) -> bool;
auto Handle##Name(Context& context, Parse::Name##Id node_id) -> bool;
#include "toolchain/parse/node_kind.def"
// Handles the transformation of a SemIRLocation to a DiagnosticLocation.
@@ -44,9 +44,9 @@ class SemIRLocationTranslator
auto cursor_inst_id = loc.inst_id;
while (true) {
// If the parse node is valid, use it for the location.
if (auto parse_node = cursor_ir->insts().GetParseNode(cursor_inst_id);
parse_node.is_valid()) {
return GetLocationInFile(cursor_ir, parse_node);
if (auto node_id = cursor_ir->insts().GetNodeId(cursor_inst_id);
node_id.is_valid()) {
return GetLocationInFile(cursor_ir, node_id);
}
// If the parse node was invalid, recurse through import references when
@@ -222,14 +222,14 @@ static auto InitPackageScopeAndImports(Context& context, UnitInfo& unit_info)
// Loops over all nodes in the tree. On some errors, this may return early,
// for example if an unrecoverable state is encountered.
// NOLINTNEXTLINE(readability-function-size)
static auto ProcessParseNodes(Context& context,
ErrorTrackingDiagnosticConsumer& err_tracker)
static auto ProcessNodeIds(Context& context,
ErrorTrackingDiagnosticConsumer& err_tracker)
-> bool {
for (auto parse_node : context.parse_tree().postorder()) {
switch (auto parse_kind = context.parse_tree().node_kind(parse_node)) {
for (auto node_id : context.parse_tree().postorder()) {
switch (auto parse_kind = context.parse_tree().node_kind(node_id)) {
#define CARBON_PARSE_NODE_KIND(Name) \
case Parse::NodeKind::Name: { \
if (!Check::Handle##Name(context, Parse::Name##Id(parse_node))) { \
if (!Check::Handle##Name(context, Parse::Name##Id(node_id))) { \
CARBON_CHECK(err_tracker.seen_error()) \
<< "Handle" #Name " returned false without printing a diagnostic"; \
return false; \
@@ -269,7 +269,7 @@ static auto CheckParseTree(
InitPackageScopeAndImports(context, unit_info);
if (!ProcessParseNodes(context, unit_info.err_tracker)) {
if (!ProcessNodeIds(context, unit_info.err_tracker)) {
context.sem_ir().set_has_errors(true);
return;
}