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

Distinguish between name IDs and string IDs in the type system. (#3341)

Browse Source 
Add a `NameId` that is effectively just a wrapper around a `StringId`,
with
some additional predefined values for names that don't correspond to
strings, such as the name of `self` or the function's return slot.
This commit is contained in:
Richard Smith
2023-11-09 16:51:36 +00:00
committed by GitHub
parent 84bc8cc4bf
commit 71aa4a45be
206 changed files with 1050 additions and 921 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/node_stack.h
+11 -11
View File
@@ -131,8 +131,8 @@ class NodeStack {
RequireParseKind<RequiredParseKind>(back.first);
return back;
}
if constexpr (RequiredIdKind == IdKind::IdentifierId) {
auto back = PopWithParseNode<IdentifierId>();
if constexpr (RequiredIdKind == IdKind::NameId) {
auto back = PopWithParseNode<SemIR::NameId>();
RequireParseKind<RequiredParseKind>(back.first);
return back;
}
@@ -190,8 +190,8 @@ class NodeStack {
if constexpr (RequiredIdKind == IdKind::ClassId) {
return back.id<SemIR::ClassId>();
}
if constexpr (RequiredIdKind == IdKind::IdentifierId) {
return back.id<IdentifierId>();
if constexpr (RequiredIdKind == IdKind::NameId) {
return back.id<SemIR::NameId>();
}
if constexpr (RequiredIdKind == IdKind::TypeId) {
return back.id<SemIR::TypeId>();
@@ -214,7 +214,7 @@ class NodeStack {
InstBlockId,
FunctionId,
ClassId,
IdentifierId,
NameId,
TypeId,
// No associated ID type.
SoloParseNode,
@@ -232,7 +232,7 @@ class NodeStack {
: parse_node(parse_node), function_id(function_id) {}
explicit Entry(Parse::Node parse_node, SemIR::ClassId class_id)
: parse_node(parse_node), class_id(class_id) {}
explicit Entry(Parse::Node parse_node, IdentifierId name_id)
explicit Entry(Parse::Node parse_node, SemIR::NameId name_id)
: parse_node(parse_node), name_id(name_id) {}
explicit Entry(Parse::Node parse_node, SemIR::TypeId type_id)
: parse_node(parse_node), type_id(type_id) {}
@@ -252,7 +252,7 @@ class NodeStack {
if constexpr (std::is_same<T, SemIR::ClassId>()) {
return class_id;
}
if constexpr (std::is_same<T, IdentifierId>()) {
if constexpr (std::is_same<T, SemIR::NameId>()) {
return name_id;
}
if constexpr (std::is_same<T, SemIR::TypeId>()) {
@@ -273,7 +273,7 @@ class NodeStack {
SemIR::InstBlockId inst_block_id;
SemIR::FunctionId function_id;
SemIR::ClassId class_id;
IdentifierId name_id;
SemIR::NameId name_id;
SemIR::TypeId type_id;
};
};
@@ -318,7 +318,7 @@ class NodeStack {
case Parse::NodeKind::ClassDefinitionStart:
return IdKind::ClassId;
case Parse::NodeKind::Name:
return IdKind::IdentifierId;
return IdKind::NameId;
case Parse::NodeKind::ArrayExpressionSemi:
case Parse::NodeKind::ClassIntroducer:
case Parse::NodeKind::CodeBlockStart:
@@ -356,8 +356,8 @@ class NodeStack {
if constexpr (std::is_same_v<IdT, SemIR::ClassId>) {
return IdKind::ClassId;
}
if constexpr (std::is_same_v<IdT, IdentifierId>) {
return IdKind::IdentifierId;
if constexpr (std::is_same_v<IdT, SemIR::NameId>) {
return IdKind::NameId;
}
if constexpr (std::is_same_v<IdT, SemIR::TypeId>) {
return IdKind::TypeId;