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

Still buggy, but implemented a more tail-recursive PE with non-recursive drop_redundent_veval, special forms SuspendedEval and SuspendedIf, simplification of how primitives work, and more

Browse Source
This commit is contained in:
Nathan Braswell
2023-02-22 01:22:57 -05:00
parent 45a869b09b
commit bde04e94df
2 changed files with 836 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1629
kr/src/ast.rs
View File

File diff suppressed because it is too large Load Diff

9
kr/src/main.rs
View File

@@ -4,7 +4,7 @@ lalrpop_mod!(pub grammar);
use std::rc::Rc; use std::rc::Rc;
mod ast; mod ast;
use crate::ast::{partial_eval,new_base_ctxs,eval,root_env,MarkedForm,Form,PossibleTailCall}; use crate::ast::{mark,partial_eval,new_base_ctxs,eval,root_env,MarkedForm,Form,PossibleTailCall};
fn main() { fn main() {
@@ -12,7 +12,7 @@ fn main() {
let parsed_input = Rc::new(grammar::TermParser::new().parse(input).unwrap()); let parsed_input = Rc::new(grammar::TermParser::new().parse(input).unwrap());
println!("Parsed input is {} - {:?}", parsed_input, parsed_input); println!("Parsed input is {} - {:?}", parsed_input, parsed_input);
let (bctx, dctx) = new_base_ctxs(); let (bctx, dctx) = new_base_ctxs();
let (bctx, marked) = parsed_input.marked(bctx); let (bctx, marked) = mark(Rc::clone(&parsed_input),bctx);
let unvaled = marked.unval().unwrap(); let unvaled = marked.unval().unwrap();
println!("Parsed unvaled that is {}", unvaled); println!("Parsed unvaled that is {}", unvaled);
match partial_eval(bctx, dctx, unvaled) { match partial_eval(bctx, dctx, unvaled) {
@@ -45,11 +45,12 @@ fn eval_test<T: Into<Form>>(also_pe: bool, gram: &grammar::TermParser, e: &Rc<Fo
assert_eq!(*basic_result, expected.into()); assert_eq!(*basic_result, expected.into());
if also_pe { if also_pe {
let (bctx, dctx) = new_base_ctxs(); let (bctx, dctx) = new_base_ctxs();
let (bctx, marked) = parsed.marked(bctx); let (bctx, marked) = mark(parsed,bctx);
let unvaled = marked.unval().unwrap(); let unvaled = marked.unval().unwrap();
let (bctx, ped) = partial_eval(bctx, dctx, unvaled).unwrap(); let (bctx, ped) = partial_eval(bctx, dctx, unvaled).unwrap();
let (bctx, marked_basic_result) = basic_result.marked(bctx); let (bctx, marked_basic_result) = mark(basic_result,bctx);
println!("Final PE {}", ped); println!("Final PE {}", ped);
println!("wanted {}", marked_basic_result);
assert_eq!(*ped, *marked_basic_result); assert_eq!(*ped, *marked_basic_result);
} }
} }