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

undid eval tweaks, made tests for weird def cases

Browse source
This commit is contained in:
Ava Apples Affine 2023-03-17 12:21:42 -07:00
parent 2dfe73de6b
commit a01df6b7b2
Signed by: affine
GPG key ID: 3A4645B8CF806069
2 changed files with 60 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/stl/decl.rs
View file

@ -39,19 +39,25 @@ pub fn eval_callback(ast: &Seg, syms: &mut SymTable) -> Result<Ctr, String> {
if ast.len() > 1 {
Err("do not eval more than one thing at a time".to_string())
} else {
let arguments: Ctr;
match *ast.car {
Ctr::Seg(ref s) => arguments = *eval(s, syms)?.clone(),
Ctr::Seg(ref s) => Ok(*eval(s, syms)?.clone()),
Ctr::Symbol(ref sym) => {
let intermediate = syms.call_symbol(sym, &Seg::new(), true)?;
if let Ctr::Seg(ref s) = *intermediate {
arguments = *eval(s, syms)?.clone()
Ok(*eval(s, syms)?.clone())
} else {
arguments = *intermediate
Ok(*intermediate)
}
},
_ => arguments = *ast.car.clone()
_ => Ok(*ast.car.clone())
}
/* this bit removed because it was determined eval shouldnt do things twice
* kept here for reference purposes since I have gone back and forth on this
* a bit
*
* thanks you for your patience (ava)
match arguments {
Ctr::Seg(ref s) => Ok(*eval(s, syms)?.clone()),
Ctr::Symbol(ref sym) => {
@ -63,7 +69,7 @@ pub fn eval_callback(ast: &Seg, syms: &mut SymTable) -> Result<Ctr, String> {
}
},
_ => Ok(arguments)
}
}*/
}
}
@ -267,9 +273,12 @@ pub fn store_callback(ast: &Seg, syms: &mut SymTable, env_cfg: bool) -> Result<C
Ctr::Seg(ref s) => match *eval(s, syms)? {
Ctr::String(ref s) => name = s.clone(),
Ctr::Symbol(ref s) => name = s.clone(),
_ => return Err("new symbol name doesnt make sense".to_string()),
_ => {
println!("{}", *eval(s, syms)?);
return Err("evaluated symbol name doesnt make sense".to_string());
},
},
_ => return Err("new symbol name doesnt make sense".to_string()),
_ => return Err("symbol name doesnt make sense".to_string()),
}
// remove var case
@ -348,8 +357,6 @@ pub fn store_callback(ast: &Seg, syms: &mut SymTable, env_cfg: bool) -> Result<C
return Ok(Ctr::None)
}
println!("{}", args);
let mut arg_list = vec![];
if !args.circuit(&mut |c: &Ctr| -> bool {
if let Ctr::Symbol(s) = c {