merge with devel

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.18.1
+### Bug fixes
+* fix auto indent and add version number to executable
+
 ## 0.18.0
 ### Features
 * add copyright notes to binary and improve the calling it

README.md

@@ -1,8 +1,8 @@
 ## LIPS is Pretty Simple
 
-[![npm](https://img.shields.io/badge/npm-0.18.0-blue.svg)](https://www.npmjs.com/package/@jcubic/lips)
-[![travis](https://travis-ci.org/jcubic/lips.svg?branch=master&b848341a07ac319aef17fb6e2a0064ecbcda5779)](https://travis-ci.org/jcubic/lips)
-[![Coverage Status](https://coveralls.io/repos/github/jcubic/lips/badge.svg?branch=master&8710db161df0ca3500520bda08815b5e)](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/lips.svg?branch=devel&295cc9f5bef20eb4c29daa78beca8264a9710aee)](https://travis-ci.org/jcubic/lips)
+[![Coverage Status](https://coveralls.io/repos/github/jcubic/lips/badge.svg?branch=devel&8710db161df0ca3500520bda08815b5e)](https://coveralls.io/github/jcubic/lips?branch=devel)
 
 
 LIPS is very simple Lisp, similar to Scheme written in JavaScript.

bin/lips.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const {exec, Formatter, balanced_parenthesis, tokenize, env} = require('../src/lips');
+const {exec, Formatter, balanced_parenthesis, tokenize, env, version} = require('../dist/lips');
 const fs = require('fs');
 const {format} = require('util');
 const readline = require('readline');
@@ -89,7 +89,7 @@ function indent(code, indent, offset) {
     });
 }
 
-var intro = 'LIPS Interpreter (Simple Scheme like Lisp)\n' +
+var intro = 'LIPS Interpreter (ver. ' + version + ')\n' +
     'Copyright (c) 2018-2019 Jakub T. Jankiewicz <https://jcubic.pl/me>\n';
 
 if (options.c) {
@@ -133,7 +133,7 @@ if (options.c) {
         }
     });
     rl.on('line', function(line) {
-        code += line;
+        code += line + '\n';
         if (balanced_parenthesis(code)) {
             rl.pause();
             run(code, e).then(function(result) {

dist/lips.js

@@ -1,5 +1,5 @@
 /**@license
- * LIPS is Pretty Simple - simple scheme like lisp in JavaScript - v. 0.18.0
+ * 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
@@ -24,7 +24,7 @@
  * Copyright (c) 2014-present, Facebook, Inc.
  * released under MIT license
  *
- * build: Tue, 17 Dec 2019 21:42:20 +0000
+ * build: Thu, 26 Dec 2019 21:53:44 +0000
  */
 (function () {
 	'use strict';
@@ -5871,7 +5871,7 @@
 	  Environment.__className = 'Environment'; // -------------------------------------------------------------------------
 
 	  var lips = {
-	    version: '0.18.0',
+	    version: 'DEV',
 	    exec: exec,
 	    parse: parse,
 	    tokenize: tokenize,

examples/terminal.js

@@ -77,6 +77,7 @@ function terminal({selector, lips, dynamic = false, name = 'terminal'}) {
                         indent: 2,
                         offset: prompt.length
                     });
+                    console.log({i, x: prompt.length});
                     this.insert('\n' + (new Array(i + 1).join(' ')));
                 }
             }