finally figure out how to hold closures

src/append.rs

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/*
+
 use crate::func::{FTable, Function, Args, Operation};
 use crate::vars::{VTable};
 use crate::segment::{Ctr, Ast, circuit, list_idx, list_append, new_ast};
@@ -27,7 +27,7 @@ pub fn get_append() -> Function {
         loose_syms: false,
         eval_lazy: false,
         args: Args::Lazy(-1),
-        function: Operation::Internal(
+        function: Operation::Internal(Box::new(
             |a: Ast, _b: Rc<RefCell<VTable>>, _c: Rc<RefCell<FTable>>| -> Ctr {
                 let ptr = list_idx(a.clone(), 0);
                 match ptr {
@@ -63,6 +63,6 @@ pub fn get_append() -> Function {
                     }
                 }
             }
-        )
+        ))
     };
-}*/
+}

src/config.rs

@@ -16,7 +16,7 @@
  */
 
 use crate::vars::{VTable, define};
-use crate::func::{FTable, Args, Function, Operation, InternalOperation, func_declare};
+use crate::func::{FTable, Args, Function, Operation, func_declare};
 use crate::segment::{Ast, Ctr};
 use crate::lex::lex;
 use crate::eval::eval;
@@ -25,13 +25,11 @@ use std::rc::Rc;
 use std::cell::RefCell;
 use std::fs;
 
-/*
+
-fn get_prompt_default() -> InternalOperation {
+fn prompt_default_callback(_: Ast, _: Rc<RefCell<VTable>>, _: Rc<RefCell<FTable>>) -> Ctr {
-    |_: Ast, _: Rc<RefCell<VTable>>, _: Rc<RefCell<FTable>>| -> Ctr {
     print!("λ ");
     return Ctr::None;
 }
-}*/
 
 pub fn configure(filename: String, vars: Rc<RefCell<VTable>>, mut funcs: Rc<RefCell<FTable>>) {
     define(vars.clone(), String::from("CFG_RELISH_POSIX"), Rc::new(Ctr::String(String::from("0"))));
@@ -42,14 +40,14 @@ pub fn configure(filename: String, vars: Rc<RefCell<VTable>>, mut funcs: Rc<RefC
         Err(s) => println!("{}", s)
     }
 
-    /*
+
     func_declare(funcs.clone(), Rc::new(RefCell::new(Function{
         name: String::from("CFG_RELISH_PROMPT"),
         loose_syms: false,
         eval_lazy: false,
         args: Args::Lazy(0),
-        function: Operation::Internal(get_prompt_default())
+        function: Operation::Internal(Box::new(prompt_default_callback))
-    })));*/
+    })));
 
     match fs::read_to_string(filename) {
         Err(s) => {

src/func.rs

@@ -26,7 +26,7 @@ use crate::eval::eval;
 pub type FTable = HashMap<String, Rc<RefCell<Function>>>;
 
 // Standardized function signature for stdlib functions
-pub type InternalOperation = impl Fn(Ast, Rc<RefCell<VTable>>, Rc<RefCell<FTable>>) -> Ctr;
+//pub type InternalOperation = impl Fn(Ast, Rc<RefCell<VTable>>, Rc<RefCell<FTable>>) -> Ctr;
 pub struct ExternalOperation {
     // Un-evaluated abstract syntax tree
     // TODO: Intermediate evaluation to simplify branches with no argument in them
@@ -41,7 +41,7 @@ pub struct ExternalOperation {
  * or a syntax tree to eval with the arguments
  */
 pub enum Operation {
-    Internal(InternalOperation),
+    Internal(Box<dyn Fn(Ast, Rc<RefCell<VTable>>, Rc<RefCell<FTable>>)->Ctr>),
     External(ExternalOperation)
 }
 
@@ -160,9 +160,10 @@ pub fn func_call(
     }
 
     match &called_func.function {
-        Operation::Internal(f) => Ok((f)(n_args, vars, funcs)),
+        Operation::Internal(f) => {
+            return Ok(f(n_args, vars, funcs))
+        },
         Operation::External(f) => {
-
             for n in 0..f.arg_syms.len() {
                 let iter_arg = list_idx(n_args.clone(), n as u128);
 

src/lib.rs

@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#![feature(type_alias_impl_trait)]
 
 mod segment;
 mod lex;
@@ -31,16 +30,15 @@ pub mod ast {
     pub use crate::segment::{Seg, Ctr, ast_to_string, Type, Ast, new_ast};
     pub use crate::lex::lex;
     pub use crate::func::{Function, Operation, FTable, Args,
-                          InternalOperation, ExternalOperation,
+                          ExternalOperation, func_declare, func_call};
-                          func_declare, func_call};
     pub use crate::vars::{VTable, define};
     pub use crate::eval::eval;
 }
 
 pub mod stdlib {
     pub use crate::stl::{get_stdlib};
-//    pub use crate::str::{get_echo, get_concat};
+    pub use crate::str::{get_echo, get_concat};
-//    pub use crate::append::{get_append};
+    pub use crate::append::{get_append};
     pub use crate::vars::{get_export};
 }
 

src/stl.rs

@@ -16,8 +16,8 @@
  */
 
 use crate::segment::{Ctr};
-//use crate::str::{get_echo, get_concat};
+use crate::str::{get_echo, get_concat};
-//use crate::append::get_append;
+use crate::append::get_append;
 use crate::func::{FTable, func_declare};
 use crate::vars::{VTable, get_export};
 use std::rc::Rc;
@@ -25,7 +25,7 @@ use std::cell::RefCell;
 
 pub fn get_stdlib(conf: Rc<RefCell<VTable>>) -> Result<Rc<RefCell<FTable>>, String> {
     let ft = Rc::new(RefCell::new(FTable::new()));
- /*   if let Some(s) = func_declare(ft.clone(), Rc::new(RefCell::new(get_echo()))) {
+    if let Some(s) = func_declare(ft.clone(), Rc::new(RefCell::new(get_echo()))) {
         return Err(s)
     }
     if let Some(s) = func_declare(ft.clone(), Rc::new(RefCell::new(get_append()))) {
@@ -33,7 +33,7 @@ pub fn get_stdlib(conf: Rc<RefCell<VTable>>) -> Result<Rc<RefCell<FTable>>, Stri
     }
     if let Some(s) = func_declare(ft.clone(), Rc::new(RefCell::new(get_concat()))) {
         return Err(s)
-    }*/
+    }
 
     let mut cfg_env = true;
     match conf.borrow().get(&String::from("CFG_RELISH_ENV")) {

src/str.rs

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-/*
+
 use crate::func::{FTable, Function, Args, Operation};
 use crate::vars::{VTable};
 use crate::segment::{Ctr, Ast, circuit, ast_as_string};
@@ -29,7 +29,7 @@ pub fn get_echo() -> Function {
         loose_syms: false,
         eval_lazy: false,
         args: Args::Lazy(-1),
-        function: Operation::Internal(
+        function: Operation::Internal(Box::new(
             |a: Ast, _b: Rc<RefCell<VTable>>, _c: Rc<RefCell<FTable>>| -> Ctr {
                 let mut string = String::from("");
                 if !circuit(a, &mut |arg: &Ctr| {
@@ -50,7 +50,7 @@ pub fn get_echo() -> Function {
                 }
                 return Ctr::None;
             }
-        )
+        ))
     };
 }
 
@@ -60,7 +60,7 @@ pub fn get_concat() -> Function {
         loose_syms: false,
         eval_lazy: false,
         args: Args::Lazy(-1),
-        function: Operation::Internal(
+        function: Operation::Internal(Box::new(
             |a: Ast, _b: Rc<RefCell<VTable>>, _c: Rc<RefCell<FTable>>| -> Ctr {
                 let mut string = String::from("");
                 if !circuit(a, &mut |arg: &Ctr| {
@@ -80,7 +80,6 @@ pub fn get_concat() -> Function {
                 }
                 return Ctr::String(string);
             }
-        )
+        ))
     };
 }
-*/

src/vars.rs

@@ -21,7 +21,7 @@ use std::collections::HashMap;
 use std::env;
 use crate::segment::{Ctr, Ast, ast_to_string};
 use crate::eval::eval;
-use crate::func::{Function, Operation, InternalOperation, Args, FTable};
+use crate::func::{Function, Operation, Args, FTable};
 /* Mapping between a string token and a tree of Segments
  * The string token can be found in any Ctr::Symbol value
  * it is expected that the trees stored are already evaluated
@@ -40,17 +40,32 @@ pub fn define(
 }
 
 pub fn get_export(env_cfg: bool) -> Function {
+    // This is the most hilarious way to work around the lifetime of env_cfg
+    // TODO: figure out the RUSTEY way of doing this
+    if env_cfg {
         return Function{
             name: String::from("export"),
             loose_syms: true,
             eval_lazy: true,
             args: Args::Lazy(2),
-        function: Operation::Internal(get_export_callback(env_cfg)),
+            function: Operation::Internal(Box::new(|a: Ast, b: Rc<RefCell<VTable>>, c: Rc<RefCell<FTable>>| -> Ctr {
+                export_callback(true, a, b, c)
+            })),
+        };
+    } else {
+        return Function{
+            name: String::from("export"),
+            loose_syms: true,
+            eval_lazy: true,
+            args: Args::Lazy(2),
+            function: Operation::Internal(Box::new(|a: Ast, b: Rc<RefCell<VTable>>, c: Rc<RefCell<FTable>>| -> Ctr {
+                export_callback(false, a, b, c)
+            })),
         };
     }
+}
 
-fn get_export_callback(env_cfg: bool) -> InternalOperation {
+fn export_callback(env_cfg: bool, a: Ast, b: Rc<RefCell<VTable>>, c: Rc<RefCell<FTable>>) -> Ctr{
-    InternalOperation(|a: Ast, b: Rc<RefCell<VTable>>, c: Rc<RefCell<FTable>>| -> Ctr {
     let inner = a.borrow_mut();
     match &inner.car {
         Ctr::Symbol(identifier) => {
@@ -60,10 +75,9 @@ fn get_export_callback(env_cfg: bool) -> InternalOperation {
                         Ok(seg) => {
                             match seg {
                                 Ctr::Seg(val) => {
-                                        let val_tmp = val.borrow().clone();
+                                    define(b, identifier.to_string(), Rc::new(val.borrow().clone().car));
-                                        define(b, identifier.to_string(), Rc::new(val_tmp.car));
                                     if env_cfg {
-                                            match val_tmp.car {
+                                        match val.borrow().clone().car {
                                             Ctr::Symbol(s)  => env::set_var(identifier, s),
                                             Ctr::String(s)  => env::set_var(identifier, s),
                                             Ctr::Integer(i) => env::set_var(identifier, format!("{}", i)),
@@ -98,5 +112,4 @@ fn get_export_callback(env_cfg: bool) -> InternalOperation {
     }
 
     return Ctr::None;
-    })
 }

tests/test_func.rs

@@ -12,7 +12,7 @@ mod func_tests {
             loose_syms: false,
             eval_lazy: false,
             args: Args::Strict(vec![Type::Bool]),
-            function: Operation::Internal(
+            function: Operation::Internal(Box::new(
                 |a: Ast, _b: Rc<RefCell<VTable>>, _c: Rc<RefCell<FTable>>| -> Ctr {
                     let inner = a.borrow();
                     let mut is_bool = false;
@@ -22,7 +22,7 @@ mod func_tests {
 
                     Ctr::Bool(is_bool)
                 }
-            )
+            ))
         };
         let ft = Rc::new(RefCell::new(FTable::new()));
         let vt = Rc::new(RefCell::new(VTable::new()));
@@ -174,7 +174,7 @@ mod func_tests {
             loose_syms: false,
             eval_lazy: false,
             args: Args::Strict(vec![Type::Bool]),
-            function: Operation::Internal(
+            function: Operation::Internal(Box::new(
                 |a: Ast, _b: Rc<RefCell<VTable>>, _c: Rc<RefCell<FTable>>| -> Ctr {
                     let inner = a.borrow();
                     if let Ctr::Bool(b) = &inner.car {
@@ -187,7 +187,7 @@ mod func_tests {
                         Ctr::None
                     }
                 }
-            )
+            ))
         };
 
         match lex("((test_inner true))".to_string()) {