Bladeren bron

some random updates on eval zkconst

ada 5 jaren geleden
bovenliggende
commit
82321d3645
2 gewijzigde bestanden met toevoegingen van 10 en 12 verwijderingen
  1. 4 6
      lisp/lisp.rs
  2. 6 6
      lisp/new.lisp

+ 4 - 6
lisp/lisp.rs

@@ -274,10 +274,9 @@ fn eval(mut ast: MalVal, mut env: Env) -> MalRet {
                     }
                     Sym(ref a0sym) if a0sym == "zkcons!" => {
                         let (a1, a2) = (l[1].clone(), l[2].clone());
-                        let value = eval(a2.clone(), env.clone())?;
-                        println!("{:?}", value);
+                        let value = eval_ast(&a2, &env)?;
                         match value {
-                            List(ref el, _) => {
+                            List(ref el, _)  => {
                                 zkcons_eval(el.to_vec(), &a1, &env);
                             }
                             _ => println!("invalid format"),
@@ -361,10 +360,9 @@ fn zkcons_eval(elements: Vec<MalVal>, a1: &MalVal, env: &Env) -> MalRet {
         Zk(v) => v,
         n => zk_circuit_create(a1, env),
     };
-    println!("{:?}", zk);
+    
     for b in elements.iter() {
         match b {
-            Sym(_) => {}
             Add(b1, b2) => {
                 zk.private
                     .push(Scalar::from_string(&b2.pr_str(false).to_string()));
@@ -391,7 +389,7 @@ fn zkcons_eval(elements: Vec<MalVal>, a1: &MalVal, env: &Env) -> MalRet {
                 zk.constraints.push(const_a);
                 env_set(&env, a1.clone(), types::MalVal::Zk(zk.clone()));
             }
-            v => println!("not match"),
+            val => println!("not match"),
         }
     }
     Ok(Nil)

+ 6 - 6
lisp/new.lisp

@@ -15,13 +15,13 @@
                     (add lc1 x)
 ;;                    'enforce)
               )) bits))
-    (def! enforce-loop-const (map (fn* [b] (
-                    (add lc0 one) 
-                    (sub lc0 b)
-                    (add lc1 x)
+;;    (def! enforce-loop-const (map (fn* [b] (
+;;                    (add lc0 one) 
+;;                    (sub lc0 b)
+;;                    (add lc1 x)
 ;;                    'enforce)
-              )) bits))
-    (zkcons! circuit enforce-loop-const)
+;;              )) bits))
+;;    (zkcons! circuit enforce-loop-const)
 ;;   (zkcons! circuit (
 ;;                    'reset-coeff-lc
 ;;                    '(sub lc0 x)