fmt

CQCL · Jul 10, 2023 · 281ce68 · 281ce68
1 parent 4e0185d
commit 281ce68
Showing 1 changed file with 32 additions and 24 deletions.
diff --git a/src/hugr/typecheck.rs b/src/hugr/typecheck.rs
@@ -102,34 +102,42 @@ pub fn typecheck_const(typ: &ClassicType, val: &ConstValue) -> Result<(), ConstT
  }
  (ClassicType::F64, ConstValue::F64(_)) => Ok(()),
  (ty @ ClassicType::Container(c), tm) => match c {
- Container::Tuple(row) => if let ConstValue::Tuple(xs) = tm {
- if row.len() != xs.len() {
- return Err(ConstTypeError::TupleWrongLength);
+ Container::Tuple(row) => {
+ if let ConstValue::Tuple(xs) = tm {
+ if row.len() != xs.len() {
+ return Err(ConstTypeError::TupleWrongLength);
+ }
+ for (ty, tm) in row.iter().zip(xs.iter()) {
+ match ty {
+ SimpleType::Classic(ty) => typecheck_const(ty, tm)?,
+ _ => return Err(ConstTypeError::LinearTypeDisallowed),
+ }
+ }
+ Ok(())
+ } else {
+ Err(ConstTypeError::Failed(ty.clone()))
  }
- for (ty, tm) in row.iter().zip(xs.iter()) {
+ }
+ Container::Sum(row) => {
+ if let ConstValue::Sum { tag, variants, val } = tm {
+ if tag > &row.len() {
+ return Err(ConstTypeError::InvalidSumTag);
+ }
+ if **row != *variants {
+ return Err(ConstTypeError::TypeRowMismatch(
+ *row.clone(),
+ variants.clone(),
+ ));
+ }
+ let ty = variants.get(*tag).unwrap();
  match ty {
- SimpleType::Classic(ty) => typecheck_const(ty, tm)?,
- _ => return Err(ConstTypeError::LinearTypeDisallowed),
+ SimpleType::Classic(ty) => typecheck_const(ty, val.as_ref()),
+ _ => Err(ConstTypeError::LinearTypeDisallowed),
  }
+ } else {
+ Err(ConstTypeError::Failed(ty.clone()))
  }
- Ok(())
- } else {Err(ConstTypeError::Failed(ty.clone()))},
- Container::Sum(row) => if let ConstValue::Sum { tag, variants, val } = tm {
- if tag > &row.len() {
- return Err(ConstTypeError::InvalidSumTag);
- }
- if **row != *variants {
- return Err(ConstTypeError::TypeRowMismatch(
- *row.clone(),
- variants.clone(),
- ));
- }
- let ty = variants.get(*tag).unwrap();
- match ty {
- SimpleType::Classic(ty) => typecheck_const(ty, val.as_ref()),
- _ => Err(ConstTypeError::LinearTypeDisallowed),
- }
- } else {Err(ConstTypeError::Failed(ty.clone()))},
+ }
  _ => Err(ConstTypeError::Unimplemented(ty.clone())),
  },
  (ty @ ClassicType::Graph(_), _) => Err(ConstTypeError::Unimplemented(ty.clone())),