Merge pull request #173 from HigherOrderCO/bug/sc-428/constructor-arity-is-not-checked-in-patterns

[sc-428] Constructor arity is not checked in patterns

src/lib.rs

@@ -76,6 +76,7 @@ pub fn desugar_book(book: &mut Book, opts: CompileOpts) -> Result<(DefId, Vec<Wa
 pub fn encode_pattern_matching(book: &mut Book, warnings: &mut Vec<Warning>) -> Result<(), String> {
   book.resolve_ctrs_in_pats();
   book.check_unbound_pats()?;
+  book.check_ctrs_arities()?;
   book.resolve_refs()?;
   book.desugar_let_destructors();
   book.desugar_implicit_match_binds();

src/term/check/ctrs_arities.rs

@@ -0,0 +1,67 @@
+use std::collections::HashMap;
+
+use crate::term::{Book, Name, Pattern};
+
+impl Book {
+  /// Checks if every constructor pattern of every definition rule has the same arity from the
+  /// defined adt constructor.
+  ///
+  /// Constructors should be already resolved.
+  pub fn check_ctrs_arities(&self) -> Result<(), String> {
+    let arities = self.ctr_arities();
+
+    for def in self.defs.values() {
+      let def_name = &self.def_names.id_to_name[&def.def_id];
+      for rule in def.rules.iter() {
+        for pat in rule.pats.iter() {
+          pat.check(&arities).map_err(|err| format!("In definition {}: {}", def_name, err))?;
+        }
+      }
+    }
+
+    Ok(())
+  }
+
+  /// Returns a hashmap of the constructor name to its arity.
+  pub fn ctr_arities(&self) -> HashMap<Name, usize> {
+    let mut arities = HashMap::new();
+
+    for adt in self.adts.values() {
+      for (ctr_name, fields) in adt.ctrs.iter() {
+        arities.insert(ctr_name.clone(), fields.len());
+      }
+    }
+
+    arities
+  }
+}
+
+impl Pattern {
+  fn check(&self, arities: &HashMap<Name, usize>) -> Result<(), String> {
+    match self {
+      Pattern::Ctr(name, args) => {
+        let arity = arities.get(name).unwrap();
+        let args = args.len();
+        if *arity != args {
+          return Err(format!(
+            "Arity error. Constructor '{}' expects {} fields, found {}.",
+            name, arity, args
+          ));
+        } else {
+          Ok(())
+        }
+      }
+      Pattern::Tup(fst, snd) => {
+        fst.check(arities)?;
+        snd.check(arities)
+      }
+      Pattern::List(els) => {
+        for el in els {
+          el.check(arities)?;
+        }
+        Ok(())
+      }
+      Pattern::Var(..) | Pattern::Num(..) => Ok(()),
+    }
+  }
+}

src/term/check/mod.rs

@@ -4,3 +4,4 @@ pub mod shared_names;
 pub mod type_check;
 pub mod unbound_pats;
 pub mod unbound_vars;
+pub mod ctrs_arities;

src/term/check/unbound_pats.rs

@@ -4,7 +4,7 @@ use std::collections::HashSet;
 impl Book {
   /// Check if the constructors in rule patterns or match patterns are defined.
   pub fn check_unbound_pats(&self) -> Result<(), String> {
-    let is_ctr = |nam: &Name| self.def_names.contains_name(nam);
+    let is_ctr = |nam: &Name| self.ctrs.contains_key(nam);
     for def in self.defs.values() {
       let def_name = self.def_names.name(&def.def_id).unwrap();
       for rule in &def.rules {

tests/golden_tests/compile_file/wrong_ctr_arity.hvm

@@ -0,0 +1,5 @@
+data Boxed = (Box val)
+
+Bar (*, (Box x y)) = x
+
+main = *

tests/golden_tests/compile_file/wrong_ctr_var_arity.hvm

@@ -0,0 +1,5 @@
+data Tup = (pair a b)
+
+(foo pair) = pair
+
+main = *

tests/snapshots/compile_file__wrong_ctr_arity.hvm.snap

@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/compile_file/wrong_ctr_arity.hvm
+---
+In definition Bar: Arity error. Constructor 'Box' expects 1 fields, found 2.

tests/snapshots/compile_file__wrong_ctr_var_arity.hvm.snap

@@ -0,0 +1,5 @@
+---
+source: tests/golden_tests.rs
+input_file: tests/golden_tests/compile_file/wrong_ctr_var_arity.hvm
+---
+In definition foo: Arity error. Constructor 'pair' expects 2 fields, found 0.