merge with devel

LIPS-scheme · Apr 22, 2019 · dbc5022 · dbc5022
2 parents bb86533 + 0281565
commit dbc5022
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 0.10.1
-### Breaking
+### Bug fixes
 * fix for babel when using for-each (weakBind was not working because babel was using `apply(void 0, ...`)
+* add missing `error` function used in example macros
 
 ## 0.10.0
 ### Breaking
@@ -14,7 +15,7 @@
 * new function `unbind` to help write function that work with functions as objects (LIPS wrap them)
 * add alias for `.` as `get` so you can pass it to curry, with `.` LIPS will try to create pair
 * lambda function introspection
-* hypeapp example
+* hyperapp example
 * better loading of code
 * make `map`, `filter`, `find`, `for-each` and `reduce` sync when possible
 * basic type checking

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 ## LIPS is Pretty Simple
 
-[![npm](https://img.shields.io/badge/npm-0.10.1-blue.svg)](https://www.npmjs.com/package/@jcubic/lips)
-[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=master&4ee1c4b05dbbe6348e31a443d0435b30d0341ebb)](https://travis-ci.org/jcubic/jquery.terminal)
-[![Coverage Status](https://coveralls.io/repos/github/jcubic/lips/badge.svg?branch=master&4b1fff165354dc9dcd90095d14379037)](https://coveralls.io/github/jcubic/lips?branch=master)
+[![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/@jcubic/lips)
+[![travis](https://travis-ci.org/jcubic/jquery.terminal.svg?branch=devel&bb86533782eba9e434e2f5a34b0009d3a5efe6ab)](https://travis-ci.org/jcubic/jquery.terminal)
+[![Coverage Status](https://coveralls.io/repos/github/jcubic/lips/badge.svg?branch=devel&4b1fff165354dc9dcd90095d14379037)](https://coveralls.io/github/jcubic/lips?branch=devel)
 
 
 LIPS is very simple Lisp, similar to Scheme written in JavaScript.

diff --git a/dist/lips.js b/dist/lips.js
@@ -1,5 +1,5 @@
 /**@license
- * LIPS is Pretty Simple - simple scheme like lisp in JavaScript - v. 0.10.1
+ * LIPS is Pretty Simple - simple scheme like lisp in JavaScript - v. DEV
  *
  * Copyright (c) 2018-2019 Jakub T. Jankiewicz <https://jcubic.pl/me>
  * Released under the MIT license
@@ -21,7 +21,7 @@
  * http://javascript.nwbox.com/ContentLoaded/
  * http://javascript.nwbox.com/ContentLoaded/MIT-LICENSE
  *
- * build: Mon, 22 Apr 2019 20:00:11 +0000
+ * build: Mon, 22 Apr 2019 20:33:17 +0000
  */
 (function () {
 'use strict';
@@ -3902,6 +3902,20 @@ function _typeof(obj) {
       })));
     }, "(print . args)\n\n            Function convert each argument to string and print the result to\n            standard output (by default it's console but it can be defined\n            it user code)"),
     // ------------------------------------------------------------------
+    error: doc(function () {
+      if (root.console) {
+        if (root.console.error) {
+          var _root$console;
+
+          (_root$console = root.console).error.apply(_root$console, arguments);
+        } else if (root.console.log) {
+          var _root$console2;
+
+          (_root$console2 = root.console).log.apply(_root$console2, arguments);
+        }
+      }
+    }, "(error . args)\n\n            Display error message."),
+    // ------------------------------------------------------------------
     flatten: doc(function (list) {
       return list.flatten();
     }, "(flatten list)\n\n            Return shallow list from tree structure (pairs)."),
@@ -4841,7 +4855,7 @@ function _typeof(obj) {
 
 
   return {
-    version: '0.10.1',
+    version: 'DEV',
     exec: exec,
     parse: parse,
     tokenize: tokenize,

diff --git a/dist/lips.min.js b/dist/lips.min.js
diff --git a/examples/terminal.js b/examples/terminal.js
@@ -26,6 +26,9 @@ function terminal({selector, lips, dynamic = false, name = 'terminal'}) {
         },
         help: function(fn) {
             term.echo(help(fn));
+        },
+        error: function(message) {
+            term.error(message);
         }
     });
     var term = jQuery(selector).terminal(function(code, term) {

diff --git a/src/lips.js b/src/lips.js
@@ -2637,6 +2637,18 @@
             standard output (by default it's console but it can be defined
             it user code)`),
         // ------------------------------------------------------------------
+        error: doc(function(...args) {
+            if (root.console) {
+                if (root.console.error) {
+                    root.console.error(...args);
+                } else if (root.console.log) {
+                    root.console.log(...args);
+                }
+            }
+        }, `(error . args)
+
+            Display error message.`),
+        // ------------------------------------------------------------------
         flatten: doc(function(list) {
             return list.flatten();
         }, `(flatten list)