In my previous rewrite, I was checking a bit of the error text to try and limit it further than all type errors. After some more thought, I doubt that different implementations actually share error text verbiage, so I took out that check (which was probably ill-advised anyway).
I attached the wrong file. Sorry again
*face-palm*,
Russ Tyndall Acceleration.net Software Developer
commit a6758aed8083654c9e77523062f6a6ca26526856 Author: Russ Tyndall russ@acceleration.net Date: Mon Jan 11 12:04:16 2010 -0500
Made swank-fancy-inspector NOT error when attempting to inspect network streams (due to their pathname being unbound)
diff --git a/contrib/swank-fancy-inspector.lisp b/contrib/swank-fancy-inspector.lisp index f68c6b0..b38df7f 100644 --- a/contrib/swank-fancy-inspector.lisp +++ b/contrib/swank-fancy-inspector.lisp @@ -802,35 +802,44 @@ SPECIAL-OPERATOR groups." (lambda () (ed-in-emacs `(,pathname :charpos ,position)))))
+(defun %safe-stream-pathname (stream) + (handler-case (pathname stream) + (type-error (c) + (declare (ignore c))))) + (defmethod emacs-inspect ((stream file-stream)) (multiple-value-bind (content) (call-next-method) - (append - `("Pathname: " - (:value ,(pathname stream)) - (:newline) " " - ,@(when (open-stream-p stream) - `((:action "[visit file and show current position]" - ,(make-visit-file-thunk stream) - :refreshp nil) - (:newline)))) - content))) + (let ((pathname (%safe-stream-pathname stream))) + (if pathname + (append + `("Pathname: " + (:value ,pathname) + (:newline) " " + ,@(when (open-stream-p stream) + `((:action "[visit file and show current position]" + ,(make-visit-file-thunk stream) + :refreshp nil) + (:newline)))) + content) + content))))
(defmethod emacs-inspect ((condition stream-error)) (multiple-value-bind (content) (call-next-method) - (let ((stream (stream-error-stream condition))) - (if (typep stream 'file-stream) - (append - `("Pathname: " - (:value ,(pathname stream)) - (:newline) " " - ,@(when (open-stream-p stream) - `((:action "[visit file and show current position]" - ,(make-visit-file-thunk stream) - :refreshp nil) - (:newline)))) - content) + (let* ((stream (stream-error-stream condition)) + (pathname (%safe-stream-pathname stream))) + (if (and (typep stream 'file-stream) pathname) + (append + `("Pathname: " + (:value ,pathname) + (:newline) " " + ,@(when (open-stream-p stream) + `((:action "[visit file and show current position]" + ,(make-visit-file-thunk stream) + :refreshp nil) + (:newline)))) + content) content))))
(defun common-seperated-spec (list &optional (callback (lambda (v)