cleaning code

lisp/core.rs

@@ -434,10 +434,12 @@ pub fn ns() -> Vec<(&'static str, MalVal)> {
         ("reset!", func(|a| a[0].reset_bang(&a[1]))),
         ("swap!", func(|a| a[0].swap_bang(&a[1..].to_vec()))),
         ("unpack-bits", func(unpack_bits)),
-        ("enforce", func(|a| Ok(MalVal::Enforce))),
-        ("public", func(cs_public)),
-        ("private", func(cs_private)),
-        ("params", func(cs_params)),
         ("range", func(range)),
+        ("alloc", func(range)),
+        ("alloc-input", func(range)),
+        ("scalar", func(range)),
+        ("scalar::one", func(range)),
+        ("cs::one", func(range)),
+        ("bellman::one", func(range)),
     ]
 }

lisp/lisp.rs

@@ -273,7 +273,10 @@ fn eval(mut ast: MalVal, mut env: Env) -> MalRet {
                             _ => Ok(Nil),
                         }
                     }
-                    Sym(ref a0sym) if a0sym == "cs!" => {
+                    //Sym(ref a0sym) if a0sym == "setup" => {
+                    //Sym(ref a0sym) if a0sym == "prove" => {
+                    //Sym(ref a0sym) if a0sym == "verify" => {
+                    Sym(ref a0sym) if a0sym == "enforce" => {
                         let (a1, a2) = (l[1].clone(), l[2].clone());
                         let value = eval_ast(&a2, &env)?;
                         match value {

lisp/types.rs

@@ -7,7 +7,7 @@ use itertools::Itertools;
 use crate::env::{env_bind, Env};
 use crate::types::MalErr::{ErrMalVal, ErrString};
 use crate::types::MalVal::{
-    Atom, Bool, Func, Hash, Int, List, MalFunc, Nil, Private, Public, Str, Sym, Vector,
+    Atom, Bool, Func, Hash, Int, List, MalFunc, Nil, Str, Sym, Vector,
 };
 
 use bls12_381::Scalar;
@@ -45,10 +45,7 @@ pub enum MalVal {
     },
     Atom(Rc<RefCell<MalVal>>),
     Zk(ZKCircuit),
-    Enforce,
-    Public(Rc<MalVal>),
-    Private(Rc<MalVal>),
-    Params(Rc<MalVal>),
+    Enforce(Rc<Vec<MalVal>>)
 }
 
 #[derive(Debug, Clone)]