TypeScheme(RV/Base) back to PolyFuncType(RV/Base)

Author: acl-cqc

hugr-core/src/builder.rs

@@ -235,7 +235,7 @@ pub(crate) mod test {
     use crate::hugr::{views::HugrView, HugrMut};
     use crate::ops;
     use crate::std_extensions::arithmetic::float_ops::FLOAT_OPS_REGISTRY;
-    use crate::types::{FunctionType, Type, TypeScheme};
+    use crate::types::{FunctionType, PolyFuncType, Type};
     use crate::{type_row, Hugr};
 
     use super::handle::BuildHandle;
@@ -258,7 +258,7 @@ pub(crate) mod test {
     }
 
     pub(super) fn build_main(
-        signature: TypeScheme,
+        signature: PolyFuncType,
         f: impl FnOnce(FunctionBuilder<&mut Hugr>) -> Result<BuildHandle<FuncID<true>>, BuildError>,
     ) -> Result<Hugr, BuildError> {
         let mut module_builder = ModuleBuilder::new();

hugr-core/src/builder/build_traits.rs

@@ -19,7 +19,7 @@ use crate::{
 };
 
 use crate::extension::{ExtensionRegistry, ExtensionSet, PRELUDE_REGISTRY, TO_BE_INFERRED};
-use crate::types::{FunctionType, Type, TypeArg, TypeRow, TypeScheme};
+use crate::types::{FunctionType, PolyFuncType, Type, TypeArg, TypeRow};
 
 use itertools::Itertools;
 
@@ -78,7 +78,7 @@ pub trait Container {
     fn define_function(
         &mut self,
         name: impl Into<String>,
-        signature: impl Into<TypeScheme>,
+        signature: impl Into<PolyFuncType>,
     ) -> Result<FunctionBuilder<&mut Hugr>, BuildError> {
         let signature = signature.into();
         let body = signature.body().clone();

hugr-core/src/builder/dataflow.rs

@@ -7,7 +7,7 @@ use std::marker::PhantomData;
 use crate::hugr::{HugrView, ValidationError};
 use crate::ops;
 
-use crate::types::{FunctionType, TypeScheme};
+use crate::types::{FunctionType, PolyFuncType};
 
 use crate::extension::ExtensionRegistry;
 use crate::Node;
@@ -140,7 +140,7 @@ impl FunctionBuilder<Hugr> {
     /// Error in adding DFG child nodes.
     pub fn new(
         name: impl Into<String>,
-        signature: impl Into<TypeScheme>,
+        signature: impl Into<PolyFuncType>,
     ) -> Result<Self, BuildError> {
         let signature = signature.into();
         let body = signature.body().clone();
@@ -527,7 +527,7 @@ pub(crate) mod test {
         // Can *declare* a function that takes a function-value of unknown #args
         FunctionBuilder::new(
             "bad_eval",
-            TypeScheme::new(
+            PolyFuncType::new(
                 [TypeParam::new_list(TypeBound::Copyable)],
                 FunctionType::new(
                     Type::new_function(FunctionTypeRV::new(USIZE_T, tv.clone())),

hugr-core/src/builder/module.rs

@@ -9,7 +9,7 @@ use crate::hugr::internal::HugrMutInternals;
 use crate::hugr::views::HugrView;
 use crate::hugr::ValidationError;
 use crate::ops;
-use crate::types::{Type, TypeBound, TypeScheme};
+use crate::types::{PolyFuncType, Type, TypeBound};
 
 use crate::ops::handle::{AliasID, FuncID, NodeHandle};
 
@@ -100,7 +100,7 @@ impl<T: AsMut<Hugr> + AsRef<Hugr>> ModuleBuilder<T> {
     pub fn declare(
         &mut self,
         name: impl Into<String>,
-        signature: TypeScheme,
+        signature: PolyFuncType,
     ) -> Result<FuncID<false>, BuildError> {
         // TODO add param names to metadata
         let declare_n = self.add_child_node(ops::FuncDecl {

hugr-core/src/extension/declarative/signature.rs

@@ -14,7 +14,7 @@ use smol_str::SmolStr;
 use crate::extension::prelude::PRELUDE_ID;
 use crate::extension::{ExtensionSet, SignatureFunc, TypeDef};
 use crate::types::type_param::TypeParam;
-use crate::types::{CustomType, FunctionTypeRV, Type, TypeRowRV, TypeSchemeRV};
+use crate::types::{CustomType, FunctionTypeRV, PolyFuncTypeRV, Type, TypeRowRV};
 use crate::Extension;
 
 use super::{DeclarationContext, ExtensionDeclarationError};
@@ -56,7 +56,7 @@ impl SignatureDeclaration {
             extension_reqs: self.extensions.clone(),
         };
 
-        let poly_func = TypeSchemeRV::new(op_params, body);
+        let poly_func = PolyFuncTypeRV::new(op_params, body);
         Ok(poly_func.into())
     }
 }