Add NodeType::new_default, switch Builder/HugrMut meths; remove infer…

….rs check
CQCL · Oct 31, 2023 · 0b3442a · 0b3442a
1 parent 919c548
commit 0b3442a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/builder/build_traits.rs b/src/builder/build_traits.rs
@@ -200,7 +200,7 @@ pub trait Dataflow: Container {
         op: impl Into<OpType>,
         input_wires: impl IntoIterator<Item = Wire>,
     ) -> Result<BuildHandle<DataflowOpID>, BuildError> {
-        self.add_dataflow_node(NodeType::new_open(op), input_wires)
+        self.add_dataflow_node(NodeType::new_default(op), input_wires)
     }
 
     /// Add a dataflow [`NodeType`] to the sibling graph, wiring up the `input_wires` to the
@@ -628,7 +628,7 @@ fn add_op_with_wires<T: Dataflow + ?Sized>(
     optype: impl Into<OpType>,
     inputs: Vec<Wire>,
 ) -> Result<(Node, usize), BuildError> {
-    add_node_with_wires(data_builder, NodeType::new_open(optype), inputs)
+    add_node_with_wires(data_builder, NodeType::new_default(optype), inputs)
 }
 
 fn add_node_with_wires<T: Dataflow + ?Sized>(

diff --git a/src/extension/infer.rs b/src/extension/infer.rs
@@ -316,9 +316,6 @@ impl UnificationContext {
                         m_output,
                         node_type.op_signature().extension_reqs,
                     );
-                    if OpTag::ModuleOp.is_superset(node_type.tag()) {
-                        self.add_solution(m_input, ExtensionSet::new());
-                    }
                 }
                 // We have a solution for everything!
                 Some(sig) => {

diff --git a/src/hugr.rs b/src/hugr.rs
@@ -98,6 +98,17 @@ impl NodeType {
         }
     }
 
+    /// Instantiate an [OpType] with the default set of input extensions
+    /// for that OpType.
+    pub fn new_default(op: impl Into<OpType>) -> Self {
+        let op = op.into();
+        let input_extensions = OpTag::ModuleOp.is_superset(op.tag()).then(ExtensionSet::new);
+        NodeType {
+            op,
+            input_extensions
+        }
+    }
+
     /// Use the input extensions to calculate the concrete signature of the node
     pub fn signature(&self) -> Option<Signature> {
         self.input_extensions
@@ -237,7 +248,7 @@ impl Hugr {
 
     /// Add a node to the graph, with the default conversion from OpType to NodeType
     pub(crate) fn add_op(&mut self, op: impl Into<OpType>) -> Node {
-        self.add_node(NodeType::new_open(op))
+        self.add_node(NodeType::new_default(op))
     }
 
     /// Add a node to the graph.

diff --git a/src/hugr/hugrmut.rs b/src/hugr/hugrmut.rs
@@ -37,7 +37,7 @@ pub trait HugrMut: HugrMutInternals {
         parent: Node,
         op: impl Into<OpType>,
     ) -> Result<Node, HugrError> {
-        self.add_node_with_parent(parent, NodeType::new_open(op))
+        self.add_node_with_parent(parent, NodeType::new_default(op))
     }
 
     /// Add a node to the graph with a parent in the hierarchy.
@@ -217,7 +217,7 @@ impl<T: RootTagged<RootHandle = Node> + AsMut<Hugr>> HugrMut for T {
     }
 
     fn add_op_before(&mut self, sibling: Node, op: impl Into<OpType>) -> Result<Node, HugrError> {
-        self.add_node_before(sibling, NodeType::new_open(op))
+        self.add_node_before(sibling, NodeType::new_default(op))
     }
 
     fn add_node_before(&mut self, sibling: Node, nodetype: NodeType) -> Result<Node, HugrError> {