Add support for repl variables: * ** *** / // /// + ++ +++ -

diff --git a/ecmalisp.html b/ecmalisp.html
index cafc7d4..ee15a2a 100644 (file)
--- a/ecmalisp.html
+++ b/ecmalisp.html
@@ -82,7 +82,7 @@
             // Output input with the class jqconsole-return.
             if (input[0] != ','){
                 try {
-                    var vs = lisp.evalString(mv, input);
+                    var vs = lisp.evalInput(mv, input);
                     for (var i=0; i<vs.length; i++){
                        jqconsole.Write(lisp.print(pv, vs[i]) + '\n', 'jqconsole-return');
                     }

diff --git a/ecmalisp.lisp b/ecmalisp.lisp
index fab1811..3b8f2ee 100644 (file)
--- a/ecmalisp.lisp
+++ b/ecmalisp.lisp
@@ -2912,6 +2912,31 @@
   (defun eval (x)
     (js-eval (ls-compile-toplevel x t)))
 
+  (defvar * nil)
+  (defvar ** nil)
+  (defvar *** nil)
+  (defvar / nil)
+  (defvar // nil)
+  (defvar /// nil)
+  (defvar + nil)
+  (defvar ++ nil)
+  (defvar +++ nil)
+  (defvar - nil)
+
+  (defun eval-interactive (x)
+    (setf - x)
+    (let ((results (multiple-value-list (eval x))))
+      (setf /// //
+            // /
+            / results
+            *** **
+            ** *
+            * (car results)))
+    (setf +++ ++
+          ++ +
+          + -)
+    (values-list /))
+
   (export '(&body &key &optional &rest * *gensym-counter* *package* + - / 1+ 1- <
             <= = = > >= and append apply aref arrayp assoc atom block
             boundp boundp butlast caar cadddr caddr cadr car car case
@@ -2938,7 +2963,7 @@
             symbol-function symbol-name symbol-package symbol-plist
             symbol-value symbolp t tagbody third throw truncate unless
             unwind-protect values values-list variable warn when
-            write-line write-string zerop))
+            write-line write-string zerop ** *** // /// ++ +++))
 
   (setq *package* *user-package*)
 
@@ -2949,6 +2974,7 @@
   (%js-vset "lisp.eval" #'eval)
   (%js-vset "lisp.compile" (lambda (s) (ls-compile-toplevel s t)))
   (%js-vset "lisp.evalString" (lambda (str) (eval (ls-read-from-string str))))
+  (%js-vset "lisp.evalInput" (lambda (str) (eval-interactive (ls-read-from-string str))))
   (%js-vset "lisp.compileString" (lambda (str) (ls-compile-toplevel (ls-read-from-string str) t)))
 
   ;; Set the initial global environment to be equal to the host global