Refactoring

vkobinski · Jun 26, 2024 · 834c50f · 834c50f
1 parent b4f6a9d
commit 834c50f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/crates/benda/src/types/book.rs b/crates/benda/src/types/book.rs
@@ -2,7 +2,7 @@ use core::panic;
 use std::cell::RefCell;
 use std::vec;
 
-use bend::fun::{self, Book as BendBook, CtrField, Name, Rule};
+use bend::fun::{self, Book as BendBook, Name, Rule};
 use bend::imp::{self, Expr, Stmt};
 use indexmap::IndexMap;
 use num_traits::ToPrimitive;
@@ -114,12 +114,6 @@ macro_rules! generate_structs {
             fields: IndexMap<String, Option<Py<PyAny>>>,
         }
 
-        impl InsertField for $iden {
-            fn insert_field(&mut self, field: &CtrField) {
-                self.fields.insert(field.nam.to_string(), None);
-            }
-        }
-
         impl BendCtr for $iden {
             fn to_py(&self, py: &Python) -> Py<PyAny> {
                 Py::new(*py, self.clone()).unwrap().as_any().clone()
@@ -245,10 +239,6 @@ impl Ctrs {
     }
 }
 
-trait InsertField {
-    fn insert_field(&mut self, field: &CtrField);
-}
-
 #[pymethods]
 impl Ctrs {
     fn __getattr__(&self, object: Bound<PyAny>) -> PyResult<pyo3::PyObject> {

diff --git a/crates/benda/src/types/user_adt.rs b/crates/benda/src/types/user_adt.rs
@@ -1,8 +1,7 @@
 use std::vec;
 
-use bend::fun::{Adt as BAdt, Adts, Book, Name, Num, Term as BTerm};
+use bend::fun::{Adt as BAdt, Book, Name, Num, Term as BTerm};
 use bend::imp::{self};
-use indexmap::IndexMap;
 use num_traits::ToPrimitive;
 use pyo3::types::{PyAnyMethods, PyString, PyTuple};
 use pyo3::{Bound, IntoPy, Py, PyAny, PyErr, PyObject, PyResult, Python};
@@ -35,7 +34,11 @@ pub(crate) trait BendCtr: std::fmt::Debug {
 
 pub fn from_term_into_adt(term: &BTerm, def_adts: &Ctrs) -> Option<TermParse> {
     match term {
-        BTerm::Lam { tag, pat, bod } => {
+        BTerm::Lam {
+            tag: _,
+            pat: _,
+            bod,
+        } => {
             let mut args: Vec<Py<PyAny>> = vec![];
 
             let lam_body = from_term_into_adt(bod.as_ref(), def_adts);
@@ -72,19 +75,18 @@ pub fn from_term_into_adt(term: &BTerm, def_adts: &Ctrs) -> Option<TermParse> {
                             ));
                         });
                     }
-                    TermParse::Args(args) => {
+                    TermParse::Args(_) => {
                         todo!()
                     }
                 };
             }
             todo!()
         }
-        BTerm::App { tag, fun, arg } => {
-            let mut constructor: Option<Box<dyn BendCtr>> = None;
-
-            if let (BTerm::Var { nam }, BTerm::Num { val }) =
+        BTerm::App { tag: _, fun, arg } => {
+            if let (BTerm::Var { nam: _ }, BTerm::Num { val }) =
                 (fun.as_ref(), arg.as_ref())
             {
+                let mut constructor: Option<Box<dyn BendCtr>> = None;
                 match num_to_i32(val) {
                     0 => {
                         constructor =