github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

*let should be on the main context

Browse Source
This commit is contained in:
ada
2021-01-07 12:13:54 +01:00
parent 28c1084e86
commit c8ee4764f4
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/lisp.rs
View File

@@ -305,13 +305,13 @@ fn eval(mut ast: MalVal, mut env: Env) -> MalRet {
Sym(ref a0sym) if a0sym == "setup" => {
let a1 = l[1].clone();
let pvk = setup(a1.clone(), env.clone())?;
eval(a1.clone(), env.clone())
ast = eval(a1.clone(), env.clone())?;
continue 'tco
}
Sym(ref a0sym) if a0sym == "prove" => {
let a1 = l[0].clone();
println!("prove {:?}", a1);
println!("allocation {:?}", get_allocations(&env, "Allocations"));
println!("allocation {:?}", get_allocations(&env, "AllocationsInput"));
prove(a1.clone(), env.clone())
}
Sym(ref a0sym) if a0sym == "alloc-input" => {
@@ -325,13 +325,12 @@ fn eval(mut ast: MalVal, mut env: Env) -> MalRet {
new_hm.insert(k.to_string(), eval(v.clone(), env.clone())?);
}
new_hm.insert(a1.pr_str(false), result);
env_set(
env_set(
&env,
Sym("Allocations".to_string()),
Hash(Rc::new(new_hm), Rc::new(Nil)),
);
};
println!("allocation {:?}", get_allocations(&env, "AllocationsInput"));
Ok(Nil)
}
Sym(ref a0sym) if a0sym == "alloc" => {
@@ -351,7 +350,6 @@ fn eval(mut ast: MalVal, mut env: Env) -> MalRet {
Hash(Rc::new(new_hm), Rc::new(Nil)),
);
};
println!("allocation {:?}", get_allocations(&env, "Allocations"));
Ok(Nil)
}
//Sym(ref a0sym) if a0sym == "verify" => {
@@ -367,6 +365,7 @@ fn eval(mut ast: MalVal, mut env: Env) -> MalRet {
"enforce \n {:?} \n {:?} \n {:?}",
left_eval, right_eval, out_eval
);
println!("allocations {:?}", get_allocations(&env, "Allocations"));
Ok(vector![vec![left_eval, right_eval, out_eval]])
}
_ => match eval_ast(&ast, &env)? {

8
lisp/new-cs.lisp
View File

@@ -1,12 +1,12 @@
(println "new-cs.lisp")
(
(setup
(let* [aux (scalar 3)
( (let* [aux (scalar 3)
x (alloc "x" aux)
x2 (alloc "x2" (* aux aux))
x3 (alloc "x3" (* aux (* aux aux)))
input (alloc-input "input variable" aux)]
;; (enforce left right output)
(setup
;; (enforce left right output)
(
(enforce
(scalar::one x)