1 files changed, 9 insertions, 7 deletions

diff --git a/src/Evaluator.hs b/src/Evaluator.hs
index c8d8d34..10e5e58 100644
--- a/src/Evaluator.hs
+++ b/src/Evaluator.hs
@@ -10,10 +10,10 @@ import           Parser
 import           Text.ParserCombinators.Parsec
 
 apply :: String -> [Expr] -> LispResult Expr
-apply fn args =
-    case lookup fn primitives of
-      Just f -> f args
-      _      -> throwError $ UnknownFunction fn
+apply fn args = maybe
+    (throwError $ UnknownFunction fn)
+    ($ args)
+    (lookup fn primitives)
 
 eval :: Expr -> LispResult Expr
 eval v@(StringLiteral s)     = return v
@@ -21,9 +21,11 @@ eval v@(IntLiteral i)        = return v
 eval v@(BoolLiteral b)       = return v
 eval v@(FloatLiteral f)      = return v
 -- handle quotes as literals
-eval (List[Id "quote", val]) = return val
-eval (List (Id fn : args))   = mapM eval args >>= apply fn
+eval (List[Id "quote", val])      = return val
+eval (List[Id "quasiquote", val]) = undefined
+eval (List[Id "unquote", val])    = undefined
+eval (List (Id fn : args))        = mapM eval args >>= apply fn
 
 -- handle bad forms
-eval idk = throwError $ BadForm "lisk can't recognize this form" idk
+eval invalidForm = throwError $ BadForm "lisk can't recognize this form" invalidForm