greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This has broken sexp parsing

Browse Source
This commit is contained in:
greg 2017-12-04 04:56:29 -08:00
parent 844cef36c7
commit 9273773bf4
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rukka_lang/mod.rs
View File

@ -49,16 +49,25 @@ impl EvaluatorState {
fn new() -> EvaluatorState { EvaluatorState { } }
fn eval(&mut self, expr: Sexp) -> Result<Sexp, String> {
use self::Sexp::*;
println!("Eval'd sexp: {:?}", expr);
Ok(match expr {
SymbolAtom(sym) => unimplemented!(),
expr @ StringAtom(_) => expr,
expr @ NumberAtom(_) => expr,
Cons(car, cdr) => {
match *car {
Cons(box car, box cdr) => {
match car {
SymbolAtom(ref sym) => match &sym[..] {
"quote" => *cdr,
"quote" => cdr,
"eq?" => unimplemented!(),
"cons" => unimplemented!(),
"cons" => match cdr {
Cons(box cadr, box Cons(box caddr, box Nil)) => {
println!("NEWL {:?}|| NEWR {:?}", cadr, caddr);
let newl = self.eval(cadr)?;
let newr = self.eval(caddr)?;
Cons(Box::new(newl), Box::new(newr))
},
_ => return Err(format!("Bad arguments for cons")),
},
"car" => unimplemented!(),
"cdr" => unimplemented!(),
"atom?" => unimplemented!(),
@ -67,7 +76,7 @@ impl EvaluatorState {
"cond" => unimplemented!(),
x => unimplemented!(),
},
_ => unimplemented!()
other => {println!("OTHER? {:?}", other); unimplemented!() }
}
},
Nil => Nil,
@ -185,7 +194,7 @@ fn parse_sexp(tokens: &mut Peekable<IntoIter<Token>>) -> Result<Sexp, String> {
None => return Err(format!("Unexpected end of input")),
Some(&RParen) => { tokens.next(); break},
_ => {
cell = Cons(Box::new(parse(tokens)?), Box::new(cell));
cell = Cons(Box::new(cell), Box::new(parse(tokens)?));
}
}
}