refactor equality checking and fields as we start to build towards signatures

1 files changed, 5 insertions, 4 deletions

diff --git a/src/checker.rs b/src/checker.rs
index 1760c0e..05ebca2 100644
--- a/src/checker.rs
+++ b/src/checker.rs
@@ -19,12 +19,12 @@ impl CheckerState {
             debug!(%self, %decl);
             match decl {
                 Decl::Set { name, set } => {
-                    let set = self.check_set(set)?;
+                    let set = self.check_set(set.clone())?;
                     self.add_set(name, set)
                 }
 
                 Decl::Element { name, element, set } => {
-                    let set = self.check_set(set)?;
+                    let set = self.check_set(set.clone())?;
                     let element = self.check_element(element.clone().into(), &set)?;
                     if matches!(element, ElementValue::Hypothetical(_)) {
                         panic!(
@@ -33,8 +33,9 @@ impl CheckerState {
                     }
                     self.add_element(name.clone(), element, set)
                 }
-                Decl::Signature { .. } => {
-                    return Err(CheckerError::Unimplemented("signatures".to_string()));
+                Decl::Signature { name, signature } => {
+                    let signature = self.check_signature(signature.clone())?;
+                    self.add_signature(name, signature)
                 }
                 Decl::Instance { .. } => {
                     return Err(CheckerError::Unimplemented("instances".to_string()));