Added 'sqrt' and 'integer'

Author: andybest

Sources/SLispCore/builtins/Core.swift

@@ -246,7 +246,9 @@ class Core: Builtins {
                 throw LispError.runtime(msg: "'doc' requires the argument to be a function")
             }
 
-            print(docstring ?? "")
+            if docstring != nil {
+                return .string(docstring!)
+            }
 
             return .nil
         }
@@ -653,5 +655,26 @@ class Core: Builtins {
                 return !x
             }
         }
+        
+        // MARK: integer
+        addBuiltin("integer", docstring: "") { args, parser, env throws in
+            if args.count != 1 {
+                throw LispError.runtime(msg: "'integer' expects 1 argument.")
+            }
+            
+            switch args[0] {
+            case .number(let num):
+                return .number(.integer(num.intValue()))
+            case .string(let str):
+                let v = Int(str)
+                if v != nil {
+                    return .number(.integer(v!))
+                } else {
+                    return .nil
+                }
+            default:
+                throw LispError.runtime(msg: "'integer' expects a number or string argument.")
+            }
+        }
     }
 }

Sources/SLispCore/builtins/Math.swift

@@ -74,6 +74,19 @@ class MathBuiltins : Builtins {
             return .number(.integer(n))
         }
 
+        
+        addBuiltin("sqrt", docstring: "") { args, parser, env throws in
+            if args.count != 1 {
+                throw LispError.runtime(msg: "'sqrt' requires 1 argument")
+            }
+            
+            guard case let .number(n) = args[0] else {
+                throw LispError.runtime(msg: "'sqrt' requires a number argument")
+            }
+            
+            return .number(.float(sqrt(n.floatValue())))
+        }
+        
         return builtins
     }
 }

stdlib/test.sl

@@ -55,11 +55,16 @@
     (if (! x)
         (if (|| (empty? description) (nil? description))
             (throw :testAssertionError)
-            (throw :testAssertionError (first description)))))
+            (do
+                (print (first description))
+                (throw :testAssertionError (first description))))))
 
 (defn assertEqual
     (x y & description)
-    (apply assert (concat (== x y) description)))
+    (let (desc (if (|| (nil? description) (empty? description))
+                    (str "Assertion failure: " x " is not equal to " y)
+                    description))
+        (apply assert (concat (== x y) desc))))
 
 (defn assertNotEqual
     (x y & description)