Changeset 12975

Timestamp:

10/16/10 19:03:40 (11 years ago)

Author:

vvoutilainen

Message:

Fix breakage of repl. Commands with parameters work again now.
Keywords are not interpreted as commands, as per the previous
patch for that.

File:

• trunk/abcl/src/org/armedbear/lisp/top-level.lisp (modified) (3 diffs)

trunk/abcl/src/org/armedbear/lisp/top-level.lisp

@@ -45 +45 @@
 
 (defvar *null-cmd* (gensym))
+(defvar *handled-cmd* (gensym))
 
 (defvar *command-char* #\:)
@@ -377 +378 @@
 (defun read-cmd (stream)
   (let ((c (peek-char-non-whitespace stream)))
-    (if (eql c #\Newline)
-  (progn
-    (read-line stream)
-    *null-cmd*)
-  (let ((input (read stream nil)))
-    (if (not (keywordp input))
-        input
-        (let ((name (string-downcase (symbol-name input))))
-    (if (find-command name)
-        (concatenate 'string ":" name)
-        input)))))))
+    (cond ((eql c *command-char*)
+           (let* ((input (read-line stream))
+      (name (symbol-name (read-from-string input))))
+       (if (find-command name)
+     (progn (process-cmd input) *handled-cmd*)
+         (read-from-string (concatenate 'string ":" name)))))
+          ((eql c #\newline)
+           (read-line stream)
+           *null-cmd*)
+          (t
+           (read stream nil)))))
 
 (defun repl-read-form-fun (in out)
@@ -397 +398 @@
       (unless (eq form *null-cmd*)
         (incf *cmd-number*))
-      (cond ((process-cmd form))
+      (cond ((or (eq form *null-cmd*)
+     (eq form *handled-cmd*)))
             ((and (> *debug-level* 0)
                   (fixnump form))