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

change default + to i+ and let + to be scalar add_assign

Browse Source
This commit is contained in:
ada
2020-11-09 19:57:06 +01:00
parent 958f85d06a
commit 63c1aee112
3 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lisp/core.rs
View File

@@ -256,20 +256,36 @@ fn sub(a: MalArgs) -> MalRet {
Ok(Sub(Rc::new(a[0].clone()), Rc::new(a[1].clone())))
}
fn add_scalar(a: MalArgs) -> MalRet {
println!("{:?}", a);
fn sub_scalar(a: MalArgs) -> MalRet {
match (a[0].clone(), a[1].clone()) {
(Sym(a0), Sym(a1)) => {
println!("{:?}", a0);
//let (mut s0, mut s1) = (Scalar::from_string(&a0), Scalar::from_string(&a1));
//let result = s0.add_assign(&s1);
//println!("{:?}", result);
Ok(Str(std::string::ToString::to_string(&Scalar::one())[2..].to_string()))
(Str(a0), Str(a1)) => {
let (mut s0, mut s1) = (Scalar::from_string(&a0), Scalar::from_string(&a1));
s0.sub_assign(s1);
Ok(Str(std::string::ToString::to_string(&s0)[2..].to_string()))
}
_ => error("expected (scalar, scalar"),
};
}
}
Ok(Str(std::string::ToString::to_string(&Scalar::one())[2..].to_string()))
fn mul_scalar(a: MalArgs) -> MalRet {
match (a[0].clone(), a[1].clone()) {
(Str(a0), Str(a1)) => {
let (mut s0, mut s1) = (Scalar::from_string(&a0), Scalar::from_string(&a1));
s0.mul_assign(s1);
Ok(Str(std::string::ToString::to_string(&s0)[2..].to_string()))
}
_ => error("expected (scalar, scalar"),
}
}
fn add_scalar(a: MalArgs) -> MalRet {
match (a[0].clone(), a[1].clone()) {
(Str(a0), Str(a1)) => {
let (mut s0, mut s1) = (Scalar::from_string(&a0), Scalar::from_string(&a1));
s0.add_assign(s1);
Ok(Str(std::string::ToString::to_string(&s0)[2..].to_string()))
}
_ => error("expected (scalar, scalar"),
}
}
fn add(a: MalArgs) -> MalRet {
@@ -340,14 +356,18 @@ pub fn ns() -> Vec<(&'static str, MalVal)> {
(">", func(fn_t_int_int!(Bool, |i, j| { i > j }))),
(">=", func(fn_t_int_int!(Bool, |i, j| { i >= j }))),
("+", func(add_scalar)),
("-", func(fn_t_int_int!(Int, |i, j| { i - j }))),
// ("*", func(mul_scalar)),
("-", func(sub_scalar)),
("*", func(mul_scalar)),
("/", func(fn_t_int_int!(Int, |i, j| { i / j }))),
("time-ms", func(time_ms)),
("i+", func(fn_t_int_int!(Int, |i, j| { i + j }))),
("i-", func(fn_t_int_int!(Int, |i, j| { i - j }))),
("i*", func(fn_t_int_int!(Int, |i, j| { i * j }))),
("i/", func(fn_t_int_int!(Int, |i, j| { i / j }))),
("i<", func(fn_t_int_int!(Bool, |i, j| { i < j }))),
("i<=", func(fn_t_int_int!(Bool, |i, j| { i <= j }))),
("i>", func(fn_t_int_int!(Bool, |i, j| { i > j }))),
("i>=", func(fn_t_int_int!(Bool, |i, j| { i >= j }))),
("time-ms", func(time_ms)),
("sequential?", func(fn_is_type!(List(_, _), Vector(_, _)))),
("list", func(|a| Ok(list!(a)))),

2
lisp/jubjub.lisp
View File

@@ -16,4 +16,4 @@
enforce
))))
(println (jubjub-add a_u a_v b_u b_v))
(println circuit)
(println (U a_u a_v b_u b_v))

2
lisp/lisp.rs
View File

@@ -400,7 +400,7 @@ fn zkcons_eval(elements: Vec<MalVal>, a1: &MalVal, env: &Env) -> MalRet {
Enforce => {
zk.constraints.push(ConstraintInstruction::Enforce);
}
val => println!("not mapped"),
_ => println!("not mapped"),
}
}
env_set(&env, a1.clone(), types::MalVal::Zk(zk.clone()));