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

Fixing quote

Browse Source
This commit is contained in:
greg 2017-12-21 01:11:16 -08:00
parent ffcc0ef379
commit 47cad3712c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/rukka_lang/mod.rs
View File

@ -100,7 +100,10 @@ impl EvaluatorState {
fn eval_special_form(&mut self, form: &str, operands: Sexp) -> Result<Sexp, String> { fn eval_special_form(&mut self, form: &str, operands: Sexp) -> Result<Sexp, String> {
use self::Sexp::*; use self::Sexp::*;
Ok(match form { Ok(match form {
"quote" => operands, //TODO Broken "quote" => match operands {
Cons(box quoted, box Nil) => quoted,
_ => return Err(format!("Bad syntax in quote")),
},
"eq?" => match operands { "eq?" => match operands {
Cons(box lhs, box Cons(box rhs, _)) => { Cons(box lhs, box Cons(box rhs, _)) => {
match lhs == rhs { match lhs == rhs {
@ -307,7 +310,7 @@ fn parse(tokens: &mut Peekable<IntoIter<Token>>) -> Result<Sexp, String> {
Some(RParen) => Err(format!("Unexpected ')'")), Some(RParen) => Err(format!("Unexpected ')'")),
Some(Quote) => { Some(Quote) => {
let quoted = parse(tokens)?; let quoted = parse(tokens)?;
Ok(Cons(Box::new(SymbolAtom(format!("quote"))), Box::new(quoted))) Ok(Cons(Box::new(SymbolAtom(format!("quote"))), Box::new(Cons(Box::new(quoted), Box::new(Nil)))))
}, },
Some(NumLiteral(n)) => Ok(NumberAtom(n)), Some(NumLiteral(n)) => Ok(NumberAtom(n)),
None => Err(format!("Unexpected end of input")), None => Err(format!("Unexpected end of input")),