CustomType's are Simple not necessarily Classic, and report their Typ…

…eTag (#328)

CustomType's convert into *correct* SimpleType via Into (like new_tuple)
Drop .classic_type(), add .tag()

src/extensions/rotation.rs

@@ -14,7 +14,7 @@ use pyo3::prelude::*;
 use crate::ops::constant::CustomConst;
 use crate::resource::{OpDef, ResourceSet, TypeDef};
 use crate::types::type_param::TypeArg;
-use crate::types::{CustomType, SimpleRow, SimpleType};
+use crate::types::{CustomType, SimpleRow, TypeTag};
 use crate::Resource;
 
 pub const fn resource_id() -> SmolStr {
@@ -34,7 +34,7 @@ pub fn resource() -> Resource {
  vec![],
  HashMap::default(),
  |_arg_values: &[TypeArg]| {
- let t: SimpleRow = vec![SimpleType::Classic(Type::Angle.custom_type().into())].into();
+ let t: SimpleRow = vec![Type::Angle.custom_type().into()].into();
  Ok((t.clone(), t, ResourceSet::default()))
  },
  );
@@ -66,7 +66,7 @@ impl Type {
  }
 
  pub fn custom_type(self) -> CustomType {
- CustomType::new(self.name(), [], resource_id())
+ CustomType::new(self.name(), [], resource_id(), TypeTag::Classic)
  }
 
  pub fn type_def(self) -> TypeDef {
@@ -75,7 +75,7 @@ impl Type {
  params: vec![],
  description: self.description().to_string(),
  resource: None,
- tag: crate::types::TypeTag::Classic.into(),
+ tag: TypeTag::Classic.into(),
  }
  }
 }
@@ -292,7 +292,7 @@ impl Neg for &AngleValue {
 #[cfg(test)]
 mod test {
 
- use crate::resource::SignatureError;
+ use crate::{resource::SignatureError, types::TypeTag};
 
  use super::*;
 
@@ -306,7 +306,12 @@ mod test {
 
  angle.check_custom(&custom).unwrap();
 
- let false_custom = CustomType::new(custom.name().clone(), vec![], "wrong_resource");
+ let false_custom = CustomType::new(
+ custom.name().clone(),
+ vec![],
+ "wrong_resource",
+ TypeTag::Classic,
+ );
  assert_eq!(
  angle.check_custom(&false_custom),
  Err(SignatureError::ResourceMismatch(

src/ops/constant/typecheck.rs

@@ -142,10 +142,7 @@ pub(super) fn typecheck_const(typ: &ClassicType, val: &ConstValue) -> Result<(),
  (Container::Sum(_), _) => Err(ConstTypeError::ValueCheckFail(ty.clone(), tm.clone())),
  (Container::Opaque(ty), ConstValue::Opaque((ty_act, _val))) => {
  if ty_act != ty {
- return Err(ConstTypeError::TypeMismatch(
- ty.clone().into(),
- ty_act.clone().into(),
- ));
+ return Err(ConstTypeError::ValueCheckFail(typ.clone(), val.clone()));
  }
  Ok(())
  }

src/resource.rs

@@ -494,10 +494,12 @@ impl TypeDef {
  ) -> Result<CustomType, SignatureError> {
  let args = args.into();
  self.check_args_impl(&args)?;
+ let tag = self.tag(&args);
  Ok(CustomType::new(
  self.name().clone(),
  args,
  self.resource().expect("Resource not set.").clone(),
+ tag,
  ))
  }
 }

src/types/custom.rs

@@ -6,7 +6,7 @@ use std::fmt::{self, Display};
 
 use crate::resource::ResourceId;
 
-use super::{type_param::TypeArg, ClassicType, Container};
+use super::{type_param::TypeArg, ClassicType, Container, HashableType, SimpleType, TypeTag};
 
 /// An opaque type element. Contains the unique identifier of its definition.
 #[derive(Debug, PartialEq, Eq, Clone, serde::Serialize, serde::Deserialize)]
@@ -21,6 +21,8 @@ pub struct CustomType {
  ///
  /// [`TypeParam`]: super::type_param::TypeParam
  args: Vec<TypeArg>,
+ /// The [TypeTag] describing what can be done to instances of this type
+ tag: TypeTag,
 }
 
 impl CustomType {
@@ -29,18 +31,15 @@ impl CustomType {
  id: impl Into<SmolStr>,
  args: impl Into<Vec<TypeArg>>,
  resource: impl Into<ResourceId>,
+ tag: TypeTag,
  ) -> Self {
  Self {
  id: id.into(),
  args: args.into(),
  resource: resource.into(),
+ tag,
  }
  }
-
- /// Returns a [`ClassicType`] containing this opaque type.
- pub const fn classic_type(self) -> ClassicType {
- ClassicType::Container(Container::Opaque(self))
- }
 }
 
 impl CustomType {
@@ -66,8 +65,13 @@ impl Display for CustomType {
  }
 }
 
-impl From<CustomType> for ClassicType {
- fn from(ty: CustomType) -> Self {
- ty.classic_type()
+/// This parallels [SimpleType::new_tuple] and [SimpleType::new_sum]
+impl From<CustomType> for SimpleType {
+ fn from(value: CustomType) -> Self {
+ match value.tag {
+ TypeTag::Simple => SimpleType::Qontainer(Container::Opaque(value)),
+ TypeTag::Classic => ClassicType::Container(Container::Opaque(value)).into(),
+ TypeTag::Hashable => HashableType::Container(Container::Opaque(value)).into(),
+ }
  }
 }