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

Some more code

Browse Source
This commit is contained in:
greg 2017-12-04 01:57:24 -08:00
parent 559eaf54de
commit 8749ed984d
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/rukka_lang/mod.rs
View File

@ -44,7 +44,6 @@ impl ProgrammingLanguageInterface for Rukka {
} }
} }
impl EvaluatorState { impl EvaluatorState {
fn new() -> EvaluatorState { EvaluatorState { } } fn new() -> EvaluatorState { EvaluatorState { } }
fn eval(&mut self, expr: Sexp) -> Result<Sexp, String> { fn eval(&mut self, expr: Sexp) -> Result<Sexp, String> {
@ -53,7 +52,19 @@ impl EvaluatorState {
SymbolAtom(sym) => unimplemented!(), SymbolAtom(sym) => unimplemented!(),
expr @ StringAtom(_) => expr, expr @ StringAtom(_) => expr,
expr @ NumberAtom(_) => expr, expr @ NumberAtom(_) => expr,
List(items) => unimplemented!(), List(items) => {
if items.len() == 0 {
return Err(format!("Empty list"))
}
let ref first = items[0];
match first {
&SymbolAtom(ref sym) => match &sym[..] {
"quote" => unimplemented!(),
_ => unimplemented!(),
},
_ => unimplemented!()
}
}
}) })
} }
} }
@ -152,8 +163,8 @@ fn parse(tokens: &mut Peekable<IntoIter<Token>>) -> Result<Sexp, String> {
Some(LParen) => parse_sexp(tokens), Some(LParen) => parse_sexp(tokens),
Some(RParen) => Err(format!("Unexpected ')'")), Some(RParen) => Err(format!("Unexpected ')'")),
Some(Quote) => { Some(Quote) => {
let quoted = parse(tokens)?; let quoted = parse(tokens)?;
Ok(List(vec![SymbolAtom(format!("quote")), quoted])) Ok(List(vec![SymbolAtom(format!("quote")), quoted]))
}, },
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")),
@ -162,6 +173,7 @@ fn parse(tokens: &mut Peekable<IntoIter<Token>>) -> Result<Sexp, String> {
fn parse_sexp(tokens: &mut Peekable<IntoIter<Token>>) -> Result<Sexp, String> { fn parse_sexp(tokens: &mut Peekable<IntoIter<Token>>) -> Result<Sexp, String> {
use self::Token::*; use self::Token::*;
use self::Sexp::*;
let mut vec = Vec::new(); let mut vec = Vec::new();
loop { loop {
match tokens.peek() { match tokens.peek() {
@ -170,6 +182,6 @@ fn parse_sexp(tokens: &mut Peekable<IntoIter<Token>>) -> Result<Sexp, String> {
_ => vec.push(parse(tokens)?), _ => vec.push(parse(tokens)?),
} }
} }
Ok(Sexp::List(vec)) Ok(List(vec))
} }