Changeset 12926

Timestamp:

09/27/10 20:31:43 (13 years ago)

Author:

vvoutilainen

Message:

This patch fixes these two issues in ABCL 0.22.0:

1) Keyword evaluation in the repl is broken. The repl assumes all
keywords are, in fact, repl commands.

2) Repl commands are case sensitive: :help :HELP mean two different things.

Patch by Mahmud Mohamed. On behalf of abcl developers, welcome aboard!

File:

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

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

@@ -349 +349 @@
             len (1- len)))
     (dolist (entry *command-table*)
-      (when (or (string= string (entry-abbreviation entry))
-                (string= string (entry-name entry)))
+      (when (or (string-equal string (entry-abbreviation entry))
+                (string-equal string (entry-name entry)))
         (return (entry-command entry))))))
 
@@ -377 +377 @@
 (defun read-cmd (stream)
   (let ((c (peek-char-non-whitespace stream)))
-    (cond ((eql c *command-char*)
-           (read-line stream))
-          ((eql c #\newline)
-           (read-line stream)
-           *null-cmd*)
-          (t
-           (read stream nil)))))
+    (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)))))))
 
 (defun repl-read-form-fun (in out)