miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix vapply bug, write vmap, add debug

Browse Source
This commit is contained in:
Nathan Braswell
2023-02-10 23:05:08 -05:00
parent 606972a38b
commit 1b813e39fb
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kr/src/main.rs
View File

@@ -94,10 +94,11 @@ fn parse_test() {
{} {}
!(let1 vapply (vau de p !(let1 vapply (vau de p
!(let1 f (eval (car p) de)) !(let1 f (eval (car p) de))
!(let1 p (eval (car (cdr p)) de)) !(let1 ip (eval (car (cdr p)) de))
!(let1 nde (eval (car (cdr (cdr p))) de)) !(let1 nde (eval (car (cdr (cdr p))) de))
(eval (cons f p) nde) (eval (cons f ip) nde)
))", LET); ))", LET);
let BADID = format!(" let BADID = format!("
{} {}
!(let1 badid (vau de p !(let1 badid (vau de p
@@ -115,6 +116,20 @@ fn parse_test() {
// and the Rc::drop will overflow the stack lol // and the Rc::drop will overflow the stack lol
eval_test(&g, &e, &format!("{} (badid 1000)", BADID), 1000); eval_test(&g, &e, &format!("{} (badid 1000)", BADID), 1000);
let VMAP = format!("
{}
!(let1 vmap (vau de p
!(let1 vmap_inner (vau ide ip
!(let1 self (car ip))
!(let1 f (car (cdr ip)))
!(let1 l (car (cdr (cdr ip))))
!(if (= nil l) l)
(cons (vapply f (cons (car l) nil) de) (vapply self (cons self (cons f (cons (cdr l) nil))) de))
))
(vapply vmap_inner (cons vmap_inner (cons (eval (car p) de) (cons (eval (car (cdr p)) de) nil))) de)
))", VAPPLY);
eval_test(&g, &e, &format!("{} (vmap (vau de p (+ 1 (car p))) '(1 2 3))", VMAP), (2, (3, (4, Form::Nil))));
// TODO, finish lambda // TODO, finish lambda
let LAMBDA = " let LAMBDA = "
((vau root_env _ (eval '((lambda x 2)) ((vau root_env _ (eval '((lambda x 2))
@@ -238,6 +253,11 @@ fn root_env() -> Rc<Form> {
PossibleTailCall::Result(p.car().unwrap()) PossibleTailCall::Result(p.car().unwrap())
}))), }))),
("debug", Rc::new(Form::PrimComb("debug".to_owned(), |e, p| {
println!("Debug: {:?}", eval(Rc::clone(&e), p.car().unwrap()));
PossibleTailCall::TailCall(e, p.cdr().unwrap().car().unwrap())
}))),
("+", Rc::new(Form::PrimComb("+".to_owned(), |e, p| { ("+", Rc::new(Form::PrimComb("+".to_owned(), |e, p| {
let a = eval(Rc::clone(&e), p.car().unwrap()).int().unwrap(); let a = eval(Rc::clone(&e), p.car().unwrap()).int().unwrap();
let b = eval(e, p.cdr().unwrap().car().unwrap()).int().unwrap(); let b = eval(e, p.cdr().unwrap().car().unwrap()).int().unwrap();