X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Finspect.lisp;h=f143295fd155b0e257bb32141a4eb6af19689401;hb=bcbbce86c47a1c530d488c7876a453100fcd933e;hp=4c278b88e66c977fb58b1666cf570ae2f784120f;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git diff --git a/src/code/inspect.lisp b/src/code/inspect.lisp index 4c278b8..f143295 100644 --- a/src/code/inspect.lisp +++ b/src/code/inspect.lisp @@ -41,7 +41,7 @@ evaluated expressions. ") (defun %inspect (*inspected* s) - (named-let redisplay () ; "lambda, the ultimate GOTO":-| + (named-let redisplay () ; "LAMBDA, the ultimate GOTO":-| (multiple-value-bind (description named-p elements) (inspected-parts *inspected*) (tty-display-inspected-parts description named-p elements s) @@ -57,6 +57,7 @@ evaluated expressions. ;; thing to do (as opposed to e.g. handling it as U), we ;; could document it. Meanwhile, it seems more Unix-y to ;; do this than to signal an error. + (/show0 "THROWing QUIT-INSPECT for EOF") (throw 'quit-inspect nil)) (integer (let ((elements-length (length elements))) @@ -75,12 +76,13 @@ evaluated expressions. (format s "~%The object contains nothing to inspect.~%") (return-from %inspect (reread))) (t - (format s "~%Enter a valid index (~:[0-~D~;0~]).~%" + (format s "~%Enter a valid index (~:[0-~W~;0~]).~%" (= elements-length 1) (1- elements-length)) (return-from %inspect (reread)))))) (symbol (case (find-symbol (symbol-name command) *keyword-package*) ((:q :e) + (/show0 "THROWing QUIT-INSPECT for :Q or :E") (throw 'quit-inspect nil)) (:u (return-from %inspect)) @@ -209,7 +211,7 @@ evaluated expressions. (defmethod inspected-parts ((object vector)) (values (format nil - "The object is a ~:[~;displaced ~]VECTOR of length ~D.~%" + "The object is a ~:[~;displaced ~]VECTOR of length ~W.~%" (and (array-header-p object) (%array-displaced-p object)) (length object)) @@ -226,7 +228,7 @@ evaluated expressions. (multiple-value-bind (q r) (floor index dim) (setq index q) (push r list))) - (format nil "[~D~{,~D~}]" (car list) (cdr list))))) + (format nil "[~W~{,~W~}]" (car list) (cdr list))))) (defmethod inspected-parts ((object array)) (let* ((length (min (array-total-size object) *inspect-length*))