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

export vars fixed. tests pass

Browse source
This commit is contained in:
Aidan Hahn 2021-11-08 00:45:09 -08:00
parent 307101327c
commit 1b1ac3cd2b
No known key found for this signature in database
GPG key ID: 327711E983899316
3 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/eval.rs
View file

@ -46,19 +46,19 @@ pub fn eval(
// another check to detect if we may have a function call
if let Ctr::Symbol(ref tok) = car {
match cdr {
match cdr.clone() {
Ctr::Seg(ast) => {
if let Some(func) = funcs.borrow().get(tok) {
return func_call(func.clone(), ast.clone(), vars.clone(), funcs.clone())
} else {
return Err(format!("Couldnt find function: {}.", tok))
} else if !sym_loose {
return Err(format!("Couldnt find definition of {}.", tok))
}
},
Ctr::None => {
if let Some(func) = funcs.borrow().get(tok) {
return func_call(func.clone(), new_ast(Ctr::None, Ctr::None), vars.clone(), funcs.clone())
} else {
return Err(format!("Couldnt find function: {}.", tok))
} else if !sym_loose {
return Err(format!("Couldnt find definition of {}.", tok))
}
},
_ => return Err(format!("Arguments to function not a list!"))

11
src/vars.rs
View file

@ -49,7 +49,16 @@ pub fn get_export(env_cfg: bool) -> Function {
let inner = a.borrow_mut();
match &inner.car {
Ctr::Symbol(identifier) => {
define(b, identifier.to_string(), Rc::new(inner.cdr.clone()));
match inner.cdr.clone() {
Ctr::Seg(val) => {
let val_tmp = val.borrow().clone();
define(b, identifier.to_string(), Rc::new(val_tmp.car));
},
_ => {
eprintln!("impossible args to export");
}
}
return Ctr::None;
},
_ => {