jonas/lispers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(eval): early eval of arguments to functions

Browse Source
This commit is contained in:
Jonas Röger 2024-11-06 11:24:02 +01:00
parent 8f1b1840ad
commit 9abe404925
Signed by: jonas
GPG Key ID: 4000EB35E1AE0F07
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lisp/eval.rs
View File

@ -85,7 +85,7 @@ fn dispatch_anonymous_function(
} }
for (arg, symbol) in args.iter_mut().zip(argument_symbols.iter()) { for (arg, symbol) in args.iter_mut().zip(argument_symbols.iter()) {
overlay.set(symbol.to_owned(), arg.to_owned()); overlay.set(symbol.to_owned(), eval(env, arg.to_owned())?);
} }
eval(&env.overlay(overlay), body) eval(&env.overlay(overlay), body)

7
src/lisp/prelude.rs
View File

@ -161,10 +161,11 @@ pub fn prelude_gt(env: &Environment, expr: Expression) -> Result<Expression, Eva
pub fn prelude_set(env: &Environment, expr: Expression) -> Result<Expression, EvalError> { pub fn prelude_set(env: &Environment, expr: Expression) -> Result<Expression, EvalError> {
let [s, e] = expr.try_into()?; let [s, e] = expr.try_into()?;
match s { match eval(env, s)? {
Expression::Symbol(s) => { Expression::Symbol(s) => {
env.shared_set(s, e); let e = eval(env, e)?;
Ok(Expression::Nil) env.shared_set(s, e.clone());
Ok(e)
} }
x => Err(EvalError::NotASymbol(x)), x => Err(EvalError::NotASymbol(x)),
} }

4
src/main.rs
View File

@ -6,8 +6,8 @@ use crate::lisp::{eval, Environment};
fn main() { fn main() {
let program1 = "((lambda (x y) (+ (if (< x 10) (* x 11) x) y)) 2 20)"; let program1 = "((lambda (x y) (+ (if (< x 10) (* x 11) x) y)) 2 20)";
let program2 = "(set myvar \"hello world!\")"; let program2 = "(set 'myvar \"hello world!\")";
let program3 = "(print myvar)"; let program3 = "(print myvar) (print 'myvar)";
let environment = Environment::default(); let environment = Environment::default();