affine/flesh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add more unit tests for function calls

Browse source
This commit is contained in:
Aidan 2021-06-06 10:24:19 -07:00
parent a6abc993a5
commit 9b981921b4
No known key found for this signature in database
GPG key ID: 327711E983899316
4 changed files with 339 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/eval.rs
View file

@ -51,6 +51,8 @@ fn eval_inner(
* 5. return new ast
*/
let ret = new_ast(Ctr::None, Ctr::None);
let res_car;
let res_cdr;
match process_ctr(
ast.borrow().clone().car,
@ -59,10 +61,10 @@ fn eval_inner(
sym_loose,
first_item,
true,
ret.borrow().clone().cdr
ast.borrow().clone().cdr
) {
Ok(ctr) => {
ret.borrow_mut().car = ctr;
res_car = ctr;
},
Err(err) => {
return Err(err)
@ -79,13 +81,16 @@ fn eval_inner(
Ctr::None
) {
Ok(ctr) => {
ret.borrow_mut().cdr = ctr;
res_cdr = ctr;
},
Err(err) => {
return Err(err)
}
}
ret.borrow_mut().car = res_car;
ret.borrow_mut().cdr = res_cdr;
return Ok(ret)
}
@ -112,16 +117,18 @@ fn process_ctr(
if let Some(s) = vars.borrow().get(&tok) {
// is function, or variable alias?
let mut pass = false;
if first_item {
if let Ctr::Symbol(t) = &*(s.clone()) {
if let Some(_f) = funcs.borrow().get(t) {
// leave this set for the function call case below
tok = t.clone();
pass = true;
}
}
}
// is a basic value.
} else {
if !pass {
return Ok((*s.clone()).clone())
}
@ -139,6 +146,7 @@ fn process_ctr(
Err(s) => return Err(s)
}
} else {
println!("AC::: {:?}\n", rest);
return Err("evaluation: args to function not a list".to_string())
}
} else {
@ -152,7 +160,7 @@ fn process_ctr(
},
Ctr::Seg(tree) => {
// if list is_car then we need to set first_item to true
match eval_inner(tree, vars, funcs, sym_loose, is_car) {
match eval_inner(tree, vars, funcs, sym_loose, is_car && first_item) {
Ok(ast) => {
Ok(Ctr::Seg(ast))
},