declare (FuncDecl) takes PolyFuncType

CQCL · Nov 13, 2023 · b781155 · b781155
1 parent 271a15a
commit b781155
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/src/builder/build_traits.rs b/src/builder/build_traits.rs
@@ -96,7 +96,7 @@ pub trait Container {
         let f_node = self.add_child_node(NodeType::new(
             ops::FuncDefn {
                 name: name.into(),
-                signature: signature,
+                signature,
             },
             ExtensionSet::new(),
         ))?;

diff --git a/src/builder/module.rs b/src/builder/module.rs
@@ -8,14 +8,12 @@ use crate::{
     extension::ExtensionRegistry,
     hugr::{hugrmut::sealed::HugrMutInternals, views::HugrView, ValidationError},
     ops,
-    types::{Type, TypeBound},
+    types::{PolyFuncType, Type, TypeBound},
 };
 
 use crate::ops::handle::{AliasID, FuncID, NodeHandle};
 use crate::ops::OpType;
 
-use crate::types::Signature;
-
 use crate::Node;
 use smol_str::SmolStr;
 
@@ -107,17 +105,13 @@ impl<T: AsMut<Hugr> + AsRef<Hugr>> ModuleBuilder<T> {
     pub fn declare(
         &mut self,
         name: impl Into<String>,
-        signature: Signature, // ALAN
+        signature: PolyFuncType,
     ) -> Result<FuncID<false>, BuildError> {
         // TODO add param names to metadata
-        let rs = signature.input_extensions.clone();
-        let declare_n = self.add_child_node(NodeType::new(
-            ops::FuncDecl {
-                signature: signature.signature.into(),
-                name: name.into(),
-            },
-            rs,
-        ))?;
+        let declare_n = self.add_child_node(NodeType::new_pure(ops::FuncDecl {
+            signature,
+            name: name.into(),
+        }))?;
 
         Ok(declare_n.into())
     }
@@ -188,7 +182,7 @@ mod test {
 
             let f_id = module_builder.declare(
                 "main",
-                FunctionType::new(type_row![NAT], type_row![NAT]).pure(),
+                FunctionType::new(type_row![NAT], type_row![NAT]).into(),
             )?;
 
             let mut f_build = module_builder.define_declaration(&f_id)?;

diff --git a/src/hugr/views/sibling_subgraph.rs b/src/hugr/views/sibling_subgraph.rs
@@ -724,7 +724,7 @@ mod tests {
         let mut mod_builder = ModuleBuilder::new();
         let func = mod_builder.declare(
             "test",
-            FunctionType::new_linear(type_row![QB_T, QB_T, QB_T]).pure(),
+            FunctionType::new_linear(type_row![QB_T, QB_T, QB_T]).into(),
         )?;
         let func_id = {
             let mut dfg = mod_builder.define_declaration(&func)?;
@@ -741,7 +741,7 @@ mod tests {
     fn build_3not_hugr() -> Result<(Hugr, Node), BuildError> {
         let mut mod_builder = ModuleBuilder::new();
         let func =
-            mod_builder.declare("test", FunctionType::new_linear(type_row![BOOL_T]).pure())?;
+            mod_builder.declare("test", FunctionType::new_linear(type_row![BOOL_T]).into())?;
         let func_id = {
             let mut dfg = mod_builder.define_declaration(&func)?;
             let outs1 = dfg.add_dataflow_op(not_op(), dfg.input_wires())?;
@@ -760,7 +760,7 @@ mod tests {
         let mut mod_builder = ModuleBuilder::new();
         let func = mod_builder.declare(
             "test",
-            FunctionType::new(type_row![BOOL_T], type_row![BOOL_T]).pure(),
+            FunctionType::new(type_row![BOOL_T], type_row![BOOL_T]).into(),
         )?;
         let func_id = {
             let mut dfg = mod_builder.define_declaration(&func)?;