0.8.0.24:

[sbcl.git] / src / code / inspect.lisp

diff --git a/src/code/inspect.lisp b/src/code/inspect.lisp
index ed2b175..5625d64 100644 (file)
--- a/src/code/inspect.lisp
+++ b/src/code/inspect.lisp
@@ -55,10 +55,11 @@ evaluated expressions.
       (named-let reread ()
        (format s "~&> ")
        (force-output)
-       (let (;; KMP idiom, using stream itself as EOF value
-             (command (read *standard-input* nil *standard-input*)))
-         (typecase command
-           (stream ; i.e. EOF
+       (let* (;; newly-consed object for hermetic protection against
+              ;; mischievous input like #.*EOF-OBJECT*:
+              (eof (cons *eof-object* nil))
+               (command (read *standard-input* nil eof)))
+          (when (eq command eof)
             ;; currently-undocumented feature: EOF is handled as Q.
             ;; If there's ever consensus that this is *the* right
             ;; thing to do (as opposed to e.g. handling it as U), we
@@ -66,6 +67,7 @@ evaluated expressions.
             ;; do this than to signal an error.
             (/show0 "THROWing QUIT-INSPECT for EOF")
             (throw 'quit-inspect nil))
+         (typecase command
            (integer
             (let ((elements-length (length elements)))
               (cond ((< -1 command elements-length)
@@ -170,7 +172,7 @@ evaluated expressions.
         (info (layout-info (sb-kernel:layout-of object))))
     (when (sb-kernel::defstruct-description-p info)
       (dolist (dd-slot (dd-slots info) (nreverse parts-list))
-        (push (cons (dsd-%name dd-slot)
+        (push (cons (dsd-name dd-slot)
                     (funcall (dsd-accessor-name dd-slot) object))
               parts-list)))))