Merge pull request #377 from asarhaddon/fix-runtests-pre-eval

[jackhill/mal.git] / elm / Core.elm

diff --git a/elm/Core.elm b/elm/Core.elm
index 1b31ae9..07e6ece 100644 (file)
--- a/elm/Core.elm
+++ b/elm/Core.elm
@@ -543,6 +543,16 @@ ns =
                         _ ->
                             False
 
+        isNumber args =
+            Eval.succeed <|
+                MalBool <|
+                    case args of
+                        (MalInt _) :: _ ->
+                            True
+
+                        _ ->
+                            False
+
         isSymbol args =
             Eval.succeed <|
                 MalBool <|
@@ -606,6 +616,34 @@ ns =
                         _ ->
                             False
 
+        isFn args =
+            Eval.succeed <|
+                MalBool <|
+                    case args of
+                        (MalFunction (CoreFunc _)) :: _ ->
+                            True
+                        (MalFunction (UserFunc fn)) :: _ ->
+                            if fn.isMacro then
+                                False
+                            else
+                                True
+
+                        _ ->
+                            False
+
+        isMacro args =
+            Eval.succeed <|
+                MalBool <|
+                    case args of
+                        (MalFunction (UserFunc fn)) :: _ ->
+                            if fn.isMacro then
+                                True
+                            else
+                                False
+
+                        _ ->
+                            False
+
         symbol args =
             case args of
                 [ MalString str ] ->
@@ -892,12 +930,15 @@ ns =
             |> Env.set "nil?" (makeFn isNil)
             |> Env.set "true?" (makeFn isTrue)
             |> Env.set "false?" (makeFn isFalse)
+            |> Env.set "number?" (makeFn isNumber)
             |> Env.set "symbol?" (makeFn isSymbol)
             |> Env.set "keyword?" (makeFn isKeyword)
             |> Env.set "vector?" (makeFn isVector)
             |> Env.set "map?" (makeFn isMap)
             |> Env.set "string?" (makeFn isString)
             |> Env.set "sequential?" (makeFn isSequential)
+            |> Env.set "fn?" (makeFn isFn)
+            |> Env.set "macro?" (makeFn isMacro)
             |> Env.set "symbol" (makeFn symbol)
             |> Env.set "keyword" (makeFn keyword)
             |> Env.set "vector" (makeFn vector)