Support implicit conversion from specific node IDs to node ID categor…

…ies (carbon-language#3799) Co-authored-by: Josh L <[email protected]>
josh11b · Mar 20, 2024 · f97a543 · f97a543
1 parent cf361a8
commit f97a543
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/toolchain/check/handle_operator.cpp b/toolchain/check/handle_operator.cpp
@@ -11,23 +11,18 @@
 namespace Carbon::Check {
 
 // Common logic for unary operator handlers.
-static auto HandleUnaryOperator(Context& context, Parse::NodeId node_id,
+static auto HandleUnaryOperator(Context& context, Parse::AnyExprId expr_node_id,
                                 Operator op) -> bool {
-  // TODO: Support implicit conversion from specific node IDs to node ID
-  // categories and change this function to take an `AnyExprId` directly.
-  auto expr_node_id = static_cast<Parse::AnyExprId>(node_id);
   auto operand_id = context.node_stack().PopExpr();
   auto result_id = BuildUnaryOperator(context, expr_node_id, op, operand_id);
   context.node_stack().Push(expr_node_id, result_id);
   return true;
 }
 
 // Common logic for binary operator handlers.
-static auto HandleBinaryOperator(Context& context, Parse::NodeId node_id,
-                                 Operator op) -> bool {
-  // TODO: Support implicit conversion from specific node IDs to node ID
-  // categories and change this function to take an `AnyExprId` directly.
-  auto expr_node_id = static_cast<Parse::AnyExprId>(node_id);
+static auto HandleBinaryOperator(Context& context,
+                                 Parse::AnyExprId expr_node_id, Operator op)
+    -> bool {
   auto rhs_id = context.node_stack().PopExpr();
   auto lhs_id = context.node_stack().PopExpr();
   auto result_id =

diff --git a/toolchain/parse/node_ids.h b/toolchain/parse/node_ids.h
@@ -52,8 +52,13 @@ const NodeKind& NodeIdForKind<K>::Kind = K;
 // NodeId that matches any NodeKind whose `category()` overlaps with `Category`.
 template <NodeCategory Category>
 struct NodeIdInCategory : public NodeId {
-  // TODO: Support conversion from `NodeIdForKind<Kind>` if `Kind::category()`
+  // Support conversion from `NodeIdForKind<Kind>` if Kind's category
   // overlaps with `Category`.
+  template <const NodeKind& Kind>
+  // NOLINTNEXTLINE(google-explicit-constructor)
+  NodeIdInCategory(NodeIdForKind<Kind> node_id) : NodeId(node_id) {
+    CARBON_CHECK(!!(Kind.category() & Category));
+  }
 
   constexpr explicit NodeIdInCategory(NodeId node_id) : NodeId(node_id) {}
   // NOLINTNEXTLINE(google-explicit-constructor)