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

trying with allocations as global env

Browse Source
This commit is contained in:
ada
2020-12-31 03:05:22 +01:00
parent d88ffd49db
commit 9140d5ef04
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lisp/lisp.rs
View File

@@ -35,7 +35,7 @@ extern crate regex;
mod types;
use crate::types::MalErr::{ErrMalVal, ErrString};
use crate::types::MalVal::{Bool, Func, Hash, List, MalFunc, Nil, Str, Sym, Vector, Allocations};
use crate::types::{error, format_error, MalArgs, MalErr, MalRet, MalVal};
use crate::types::{error, format_error, MalArgs, MalErr, MalRet, MalVal, Allocation};
mod env;
mod printer;
mod reader;
@@ -315,14 +315,15 @@ fn eval(mut ast: MalVal, mut env: Env) -> MalRet {
let value = eval(l[2].clone(), env.clone())?;
let result = eval(value.clone(), env.clone())?;
let symbol = MalVal::Sym(a1.pr_str(false));
let alloc_symbol = &Sym("Allocations".to_string());
let allocations = match env_get(&env.clone(), alloc_symbol) {
Ok(Allocations(v)) => { v },
_ => Rc::new(vec![])
};
// vec![Allocation { symbol : symbol, value: value }]
env_set(&env, symbol, result)
let alloc_symbol = Sym("Allocations".to_string());
if let MalVal::Allocations(mut valalloc) = env_get(&env.clone(), &alloc_symbol)? {
if let MalVal::ZKScalar(val) = result {
valalloc.push(Allocation { symbol : symbol.pr_str(false), value: val });
env_set(&env, alloc_symbol, MalVal::Allocations(valalloc));
};
};
Ok(Nil)
}
//Sym(ref a0sym) if a0sym == "verify" => {
Sym(ref a0sym) if a0sym == "enforce" => {

2
lisp/types.rs
View File

@@ -69,7 +69,7 @@ pub enum MalVal {
},
Atom(Rc<RefCell<MalVal>>),
Zk(Rc<LispCircuit>), // TODO remote it
Allocations(Rc<Vec<Allocation>>),
Allocations(Vec<Allocation>),
Enforce(Rc<Vec<MalVal>>),
ZKScalar(bls12_381::Scalar)
}