1 files changed, 33 insertions, 19 deletions
diff --git a/src/lisp/eval.rs b/src/lisp/eval.rs
index 3a3a61e..44540c0 100644
--- a/src/lisp/eval.rs
+++ b/src/lisp/eval.rs
@@ -6,6 +6,7 @@ use crate::{
        number::LispNumber,
        Environment,
    },
+    type_match,
 };
 use std::convert::TryInto;
@@ -20,7 +21,14 @@ pub fn eval(expr: &LispExpr, app: &mut AppState) -> Result<LispExpr, LispError>
        LispExpr::Number(_) => Ok(expr.clone()),
        LispExpr::BoolLit(_) => Ok(expr.clone()),
        LispExpr::Ident(ref id) => lookup_extended(&app.lisp_env, id),
-        LispExpr::Quote(_, _) => Ok(expr.clone()),
+        LispExpr::Quote(item, _) => match item.as_ref() {
+            i @ LispExpr::Unit
+            | i @ LispExpr::StringLit(_)
+            | i @ LispExpr::Char(_)
+            | i @ LispExpr::Number(_)
+            | i @ LispExpr::BoolLit(_) => Ok(i.clone()),
+            _ => Ok(*item.clone()),
+        },
        LispExpr::List(li) => {
            let func_expr = &li[0];
            match func_expr {
@@ -29,6 +37,7 @@ pub fn eval(expr: &LispExpr, app: &mut AppState) -> Result<LispExpr, LispError>
                    "set!" => set_var(&li[1..], app),
                    "lambda" => create_lambda(&li[1..]),
                    "if" => eval_if(&li[1..], app),
+                    "quote" => eval_quote(&li[1..]),
                    _ => {
                        let mut new_ls = vec![eval(&func_expr, app)?];
                        new_ls.extend(li[1..].to_vec());
@@ -99,7 +108,7 @@ pub fn define_var(args: &[LispExpr], app: &mut AppState) -> Result<LispExpr, Lis
        [LispExpr::List(shorthand), LispExpr::List(body)] => {
            // (define (func arg) <body>) shorthand
-            let id = unwrap_ident(shorthand[0].clone());
+            let id = shorthand[0].unwrap_ident();
            let params = if shorthand.len() > 1 {
                &shorthand[1..]
            } else {
@@ -163,13 +172,12 @@ pub fn create_lambda(cdr: &[LispExpr]) -> Result<LispExpr, LispError> {
    }
    info!("creating lambda");
    match cdr {
-        [LispExpr::List(params), LispExpr::List(body)]
+        [LispExpr::List(params), LispExpr::List(body)] if type_match!(params, (..) => LispExpr::Ident(_)) =>
-            if params.iter().all(|p| matches!(p, LispExpr::Ident(_))) =>
        {
            return Ok(LispExpr::Function(LispFunction {
                params: params
                    .into_iter()
-                    .map(|p| unwrap_ident(p.clone()))
+                    .map(|p| p.unwrap_ident())
                    .collect::<Vec<_>>(),
                body: body.clone(),
            }));
@@ -202,6 +210,26 @@ pub fn eval_if(args: &[LispExpr], app: &mut AppState) -> Result<LispExpr, LispEr
    }
 }
+pub fn eval_quote(args: &[LispExpr]) -> Result<LispExpr, LispError> {
+    let arity = Arity::Exact(1);
+    if !arity.is_valid(args) {
+        return Err(arity.to_error());
+    } else {
+        match &args[0] {
+            LispExpr::Quote(item, depth) => Ok(LispExpr::Quote(item.clone(), depth + 1)),
+            i @ LispExpr::Unit
+            | i @ LispExpr::StringLit(_)
+            | i @ LispExpr::Char(_)
+            | i @ LispExpr::Number(_)
+            | i @ LispExpr::BoolLit(_) => Ok(i.clone()),
+            _ => {
+                let quoted_expr = Box::new(args[0].clone());
+                Ok(LispExpr::Quote(quoted_expr, 1))
+            }
+        }
+    }
+}
 pub fn lookup_extended(env_list: &[Environment], key: &str) -> Result<LispExpr, LispError> {
    if env_list.is_empty() {
        return Err(EvalError::UnboundVariable(key.into()).into());
@@ -215,20 +243,6 @@ pub fn lookup_extended(env_list: &[Environment], key: &str) -> Result<LispExpr,
    }
 }
-pub fn unwrap_number(n: &LispExpr) -> &LispNumber {
-    match n {
-        LispExpr::Number(i) => i,
-        _ => panic!("unwrap_number expected number"),
-    }
-}
-pub fn unwrap_ident(i: LispExpr) -> String {
-    match i {
-        LispExpr::Ident(i) => i,
-        _ => panic!("unwrap_ident expected string"),
-    }
-}
 #[cfg(test)]
 mod tests {
    use super::*;