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

Add fn literal variant

Browse Source
This commit is contained in:
greg 2017-12-11 01:53:27 -08:00
parent d11500c643
commit 85375bb9df
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rukka_lang/mod.rs
View File

@ -70,6 +70,7 @@ impl ProgrammingLanguageInterface for Rukka {
impl EvaluatorState { impl EvaluatorState {
fn eval(&mut self, expr: Sexp) -> Result<Sexp, String> { fn eval(&mut self, expr: Sexp) -> Result<Sexp, String> {
use self::Sexp::*; use self::Sexp::*;
println!("Evaling {:?}", expr);
Ok(match expr { Ok(match expr {
SymbolAtom(ref sym) => match self.get_var(sym) { SymbolAtom(ref sym) => match self.get_var(sym) {
Some(ref sexp) => { Some(ref sexp) => {
@ -78,6 +79,7 @@ impl EvaluatorState {
}, },
None => return Err(format!("Variable {} not bound", sym)), None => return Err(format!("Variable {} not bound", sym)),
}, },
expr @ FnLiteral { .. } => expr,
expr @ StringAtom(_) => expr, expr @ StringAtom(_) => expr,
expr @ NumberAtom(_) => expr, expr @ NumberAtom(_) => expr,
True => True, True => True,
@ -97,7 +99,7 @@ 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, "quote" => operands, //TODO Broken
"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 {
@ -190,7 +192,11 @@ enum Sexp {
True, True,
False, False,
Cons(Box<Sexp>, Box<Sexp>), Cons(Box<Sexp>, Box<Sexp>),
Nil Nil,
FnLiteral {
formal_params: Vec<String>,
body: Box<Sexp>
}
} }
impl Sexp { impl Sexp {
@ -204,6 +210,7 @@ impl Sexp {
&NumberAtom(ref n) => format!("{}", n), &NumberAtom(ref n) => format!("{}", n),
&Cons(ref car, ref cdr) => format!("({} . {})", car.print(), cdr.print()), &Cons(ref car, ref cdr) => format!("({} . {})", car.print(), cdr.print()),
&Nil => format!("()"), &Nil => format!("()"),
&FnLiteral { ref formal_params, .. } => format!("<lambda {:?}>", formal_params),
} }
} }