X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=jscl.html;h=47b4efb6468c14991b9a8639cb794d8ef71a054a;hb=4a3e1529c48e1ea732e3b76c75072364d63f2a26;hp=1dfe7fc072374e4375e9fb60f18508371d24b923;hpb=d15ff6cf9e47d39ec9949ebafa1dcd2be6ac8be7;p=jscl.git

diff --git a/jscl.html b/jscl.html
index 1dfe7fc..47b4efb 100644
--- a/jscl.html
+++ b/jscl.html
@@ -71,32 +71,34 @@
         jqconsole.RegisterMatching('(', ')', 'parents');
 
         lisp.write = function(str){
-           jqconsole.Write(str, 'jqconsole-output', false);
+           jqconsole.Write(xstring(str), 'jqconsole-output', false);
            return str;
         }
 
         var startPrompt = function () {
           // Start the prompt with history enabled.
-          jqconsole.Write(lisp.evalString(pv, 1, make_lisp_string('(CL:PACKAGE-NAME CL:*PACKAGE*)')) + '> ', 'jqconsole-prompt');
+          jqconsole.Write(lisp.evalString('(CL:PACKAGE-NAME CL:*PACKAGE*)') + '> ', 'jqconsole-prompt');
           jqconsole.Prompt(true, function (input) {
             // Output input with the class jqconsole-return.
             if (input[0] != ','){
                 try {
-                    var vs = lisp.evalInput(mv, 1, make_lisp_string(input));
-                    for (var i=0; i<vs.length; i++){
-                       jqconsole.Write(lisp.print(pv, 1, vs[i]) + '\n', 'jqconsole-return');
-                    }
+                    var vs = lisp.evalInput(input);
+                    // for (var i=0; i<vs.length; i++){
+                       jqconsole.Write(lisp.print(vs) + '\n', 'jqconsole-return');
+                    // }
                 } catch(error) {
-                    jqconsole.Write('ERROR: ' + (error.message || error) + '\n', 'jqconsole-error');
+                    var msg = error.message || error || 'Unknown error';
+                    if (typeof(msg) != 'string') msg = xstring(msg);
+                    jqconsole.Write('ERROR: ' + msg + '\n', 'jqconsole-error');
                 }
-            } else {
-                jqconsole.Write(lisp.compileString(pv, 1, make_lisp_string(input.slice(1))) + '\n', 'jqconsole-return');
-            }
+            } else
+                jqconsole.Write(lisp.compileString(input.slice(1)) + '\n', 'jqconsole-return');
+
             // Restart the prompt.
             startPrompt();
           }, function(input){
             try {
-                lisp.read(pv, 1, make_lisp_string(input[0]==','? input.slice(1): input));
+                lisp.read(input[0]==','? input.slice(1): input);
             } catch(error) {
                 return 0;
             }