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

Implemented Display for Form, then first sketch of MarkedForm, NeededIds, and unval, and Display for MarkedForm

Browse Source
This commit is contained in:
Nathan Braswell
2023-02-14 00:50:05 -05:00
parent ad3c251ba9
commit 66fc1db606
3 changed files with 148 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kr/src/main.rs
View File

@@ -4,7 +4,7 @@ lalrpop_mod!(pub grammar);
use std::rc::Rc;
mod ast;
use crate::ast::{Form,PossibleTailCall};
use crate::ast::{MarkedForm,Form,PossibleTailCall};
fn eval(e: Rc<Form>, f: Rc<Form>) -> Rc<Form> {
let mut e = e;
@@ -37,9 +37,7 @@ fn eval(e: Rc<Form>, f: Rc<Form>) -> Rc<Form> {
if let Some(de) = de {
new_e = assoc(de, Rc::clone(&e), new_e);
}
if let Some(params) = params.sym() {
new_e = assoc(params, Rc::clone(p), new_e);
}
new_e = assoc(params, Rc::clone(p), new_e);
// always a tail call
e = new_e;
x = Some(Rc::clone(body));
@@ -82,7 +80,7 @@ fn root_env() -> Rc<Form> {
// (vau de params body)
("vau", Rc::new(Form::PrimComb("vau".to_owned(), |e, p| {
let de = p.car().unwrap().sym().map(|s| s.to_owned());
let params = p.cdr().unwrap().car().unwrap();
let params = p.cdr().unwrap().car().unwrap().sym().unwrap().to_owned();
let body = p.cdr().unwrap().cdr().unwrap().car().unwrap();
PossibleTailCall::Result(Rc::new(Form::DeriComb { se: e, de, params, body }))
@@ -219,10 +217,11 @@ fn root_env() -> Rc<Form> {
fn main() {
let input = "(= 17 ((vau d p (+ (eval (car p) d) 13)) (+ 1 3)))";
let parsed_input = grammar::TermParser::new().parse(input).unwrap();
println!("Parsed input is {:?}", parsed_input);
let result = eval(root_env(), Rc::new(parsed_input));
println!("Result is {:?}", result);
let parsed_input = Rc::new(grammar::TermParser::new().parse(input).unwrap());
println!("Parsed input is {} - {:?}", parsed_input, parsed_input);
println!("Parsed unvaled that is {}", Rc::new(MarkedForm::Value(Rc::clone(&parsed_input))).unval().unwrap());
let result = eval(root_env(), parsed_input);
println!("Result is {} - {:?}", result, result);
}
#[test]