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

fix evaluation behavior mismatch between functions and lambdas

Browse source 
Signed-off-by: Ava Hahn <ava@sunnypup.io>
This commit is contained in:
Ava Apples Affine 2023-06-08 12:48:34 -07:00
parent e0b837cb21
commit 398726568a
4 changed files with 41 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/sym.rs
View file

@ -143,15 +143,29 @@ impl SymTable {
if let ValueType::VarForm(ref val) = symbol.value {
match **val {
Ctr::Lambda(ref l) if call_func => {
call_lambda(
return call_lambda(
l,
&Box::new(Ctr::Seg(args.clone())),
self
)
},
_ => Ok(val.clone()),
Ctr::Symbol(ref s) if self.is_function_type(s).is_some()
&& self.is_function_type(s).unwrap() => {
symbol = match self.remove(s) {
Some(sym) => sym,
None => return Err(
Traceback::new().with_trace(
(name, format!("(references undefined symbol {})", s))
.into())),
};
symbol.__generation -= 1;
self.insert(symbol.name.clone(), symbol.clone());
},
_ => return Ok(val.clone()),
}
} else if call_func {
}
if call_func {
symbol.call(args, self)
} else {
// its a function but call_func is off
@ -161,10 +175,10 @@ impl SymTable {
pub fn is_function_type(&self, name: &String) -> Option<bool> {
if let ValueType::VarForm(ref val) = self.get(name)?.value {
if let Ctr::Lambda(_) = **val {
Some(true)
} else {
Some(false)
match **val {
Ctr::Lambda(_) => Some(true),
Ctr::Symbol(ref n) => self.is_function_type(n),
_ => Some(false),
}
} else {
Some(true)