throw exception if you don't pass boolean to if + lips code in error …

…message

CHANGELOG.md

@@ -1,9 +1,12 @@
 ## 0.8.0
 ### Features
 * new nth and reverse functions
-* new type checking functions null? regex? pair? string? number? symbol? array? object?
+* new type checking functions null? regex? pair? string? number? symbol? array? object? boolean?
+* add lips source code that throwed exception in JavaScript error message
 ### Bugfix
 * fix lambda with rest parameter
+### Breaking
+* `if` now check if argument is boolean
 
 ## 0.7.1
 ### Bugfix

dist/lips.js

@@ -6,7 +6,7 @@
  *
  * includes unfetch by Jason Miller (@developit) MIT License
  *
- * build: Tue, 08 Jan 2019 21:00:23 +0000
+ * build: Tue, 08 Jan 2019 21:41:41 +0000
  */
 (function () {
 'use strict';
@@ -2625,7 +2625,11 @@ function _typeof(obj) {
       var env = this;
 
       var resolve = function resolve(cond) {
-        if (cond && !is_null(cond) && !isEmptyList(cond)) {
+        if (typeof cond !== 'boolean') {
+          throw new Error('if: value need to be boolean');
+        }
+
+        if (cond) {
           var true_value = evaluate(code.cdr.car, {
             env: env,
             dynamic_scope: dynamic_scope,
@@ -3286,6 +3290,10 @@ function _typeof(obj) {
       return is_null(obj) || obj instanceof Pair && obj.isEmptyList();
     },
     // ------------------------------------------------------------------
+    'boolean?': function boolean(obj) {
+      return typeof obj === 'boolean';
+    },
+    // ------------------------------------------------------------------
     'symbol?': function symbol(obj) {
       return obj instanceof _Symbol;
     },
@@ -4271,7 +4279,7 @@ function _typeof(obj) {
         return code;
       }
     } catch (e) {
-      error && error(e);
+      error && error(e, code);
     }
   } // ----------------------------------------------------------------------
 
@@ -4317,7 +4325,8 @@ function _typeof(obj) {
               return evaluate(code, {
                 env: env,
                 dynamic_scope: dynamic_scope,
-                error: function error(e) {
+                error: function error(e, code) {
+                  e.message += '\nin code: ' + code.toString();
                   throw e;
                 }
               });

src/lips.js

@@ -1340,7 +1340,10 @@
             }
             var env = this;
             var resolve = (cond) => {
-                if (cond && !is_null(cond) && !isEmptyList(cond)) {
+                if (typeof cond !== 'boolean') {
+                    throw new Error('if: value need to be boolean');
+                }
+                if (cond) {
                     var true_value = evaluate(code.cdr.car, {
                         env,
                         dynamic_scope,
@@ -1852,6 +1855,10 @@
             return is_null(obj) || (obj instanceof Pair && obj.isEmptyList());
         },
         // ------------------------------------------------------------------
+        'boolean?': function(obj) {
+            return typeof obj === 'boolean';
+        },
+        // ------------------------------------------------------------------
         'symbol?': function(obj) {
             return obj instanceof Symbol;
         },
@@ -2477,7 +2484,7 @@
                 return code;
             }
         } catch (e) {
-            error && error(e);
+            error && error(e, code);
         }
     }
 
@@ -2500,7 +2507,8 @@
                 var result = await evaluate(code, {
                     env,
                     dynamic_scope,
-                    error: (e) => {
+                    error: (e, code) => {
+                        e.message += '\nin code: ' + code.toString();
                         throw e;
                     }
                 });

todo.lips

@@ -57,8 +57,8 @@
 (define (on-todo fn element)
   "Invoke function for each todo"
   (let* ((todo (find-todo element)))
-    (if todo
-      (fn todo))))
+    (if (not (null? todo))
+        (fn todo))))
 
 
 (define (get-todos)
@@ -93,21 +93,20 @@
 
 (define (store namespace . data)
   "set or get value from localStorage"
-  (if data
-    (--> localStorage (setItem namespace (-> (car data) toString)))
-    (let ((store (-> localStorage getItem namespace)))
-      (if store
-        (read store)
-        '()))))
+  (if (not (null? data))
+      (--> localStorage (setItem namespace (-> (car data) toString)))
+      (let ((store (--> localStorage (getItem namespace))))
+        (if (null? store)
+            '()
+            (read store)))))
 
 ;; ref: https://www.programming-idioms.org/idiom/12/check-if-list-contains-a-value/154/scheme
 (define (contains x list)
   (if (not list)
-    false
-    (if (eq? (car list) x)
-      true
-      (contains x (cdr list)))))
-
+      false
+      (if (eq? (car list) x)
+          true
+          (contains x (cdr list)))))
 
 
 (define log (. console "log"))