1 files changed, 19 insertions, 1 deletions

diff --git a/src/lisp/eval.rs b/src/lisp/eval.rs
index 75cb5c9..677fa23 100644
--- a/src/lisp/eval.rs
+++ b/src/lisp/eval.rs
@@ -1,5 +1,6 @@
 use crate::{
     app::AppState,
+    keybind::Keybind,
     lisp::{
         error::{EvalError, LispError},
         expr::{Arity, Ident, LispExpr, LispFunction},
@@ -8,7 +9,7 @@ use crate::{
     type_match,
 };
 
-use std::convert::TryInto;
+use std::{convert::TryInto, str::FromStr};
 
 use log::{error, info};
 
@@ -44,6 +45,7 @@ where
                         "for" => self.eval_for(&li[1..]),
                         "quote" => Ok(apply_quote(&li[1])),
                         "let" => self.eval_let(&li[1..]),
+                        "bind-key" => self.eval_bind_key(&li[1..]),
                         _ => {
                             let mut new_ls = vec![self.eval(&func_expr)?];
                             new_ls.extend(li[1..].to_vec());
@@ -302,6 +304,22 @@ where
             }
         }
     }
+
+    pub fn eval_bind_key(&mut self, args: &[LispExpr]) -> Result<LispExpr, LispError> {
+        let arity = Arity::Exact(2);
+        if !arity.check(args) {
+            Err(arity.to_error())
+        } else {
+            match args {
+                [LispExpr::StringLit(s), body] => {
+                    let bind = Keybind::from_str(&s).map_err(EvalError::KeybindError)?;
+                    self.app.keybinds.insert(bind, body.clone());
+                    Ok(LispExpr::Unit)
+                }
+                _ => Err(EvalError::BadForm.into()),
+            }
+        }
+    }
 }
 
 pub fn apply_quote(arg: &LispExpr) -> LispExpr {