more untested code
This commit is contained in:
parent
f83872d8b5
commit
33f2e1eb16
1 changed files with 33 additions and 3 deletions
36
src/eval.rs
36
src/eval.rs
|
|
@ -52,6 +52,34 @@ fn eval_inner(
|
||||||
* (and set new.cdr to result)
|
* (and set new.cdr to result)
|
||||||
* 5. return new ast
|
* 5. return new ast
|
||||||
*/
|
*/
|
||||||
|
let ret: Ast;
|
||||||
|
let mret = ret.clone().borrow_mut();
|
||||||
|
let ret_inner = ast.clone().borrow_mut();
|
||||||
|
mret.car = process_ctr(
|
||||||
|
ret_inner.car,
|
||||||
|
vars.clone(),
|
||||||
|
funcs.clone(),
|
||||||
|
sym_loose,
|
||||||
|
first_item
|
||||||
|
);
|
||||||
|
|
||||||
|
if let Ctr::Seg(s) = ret_inner.cdr {
|
||||||
|
mret.cdr = process_ctr(
|
||||||
|
ret_inner.cdr,
|
||||||
|
vars.clone(),
|
||||||
|
funcs.clone(),
|
||||||
|
sym_loose,
|
||||||
|
false
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
mret.cdr = process_ctr(
|
||||||
|
ret_inner.cdr,
|
||||||
|
vars.clone(),
|
||||||
|
funcs.clone(),
|
||||||
|
sym_loose,
|
||||||
|
first_item
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn process_ctr(
|
fn process_ctr(
|
||||||
|
|
@ -73,13 +101,15 @@ fn process_ctr(
|
||||||
Symbol(token) => {
|
Symbol(token) => {
|
||||||
let mut tok = token;
|
let mut tok = token;
|
||||||
if let Some(s) = vt.borrow().get(token) {
|
if let Some(s) = vt.borrow().get(token) {
|
||||||
if first_item {
|
// perhaps allow variable expansion here
|
||||||
if let String(t) = s {
|
// as a primitive stand in for function aliasing
|
||||||
|
if first_item && let String(t) = s {
|
||||||
tok = t;
|
tok = t;
|
||||||
} // else improper var type so ignore
|
|
||||||
} else {
|
} else {
|
||||||
// TODO: DEEP COPY. return
|
// TODO: DEEP COPY. return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// else call function
|
||||||
} else if !first_item && !sym_loose {
|
} else if !first_item && !sym_loose {
|
||||||
return Err("variable not found")
|
return Err("variable not found")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue