projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8alpha.0.9:
[sbcl.git]
/
contrib
/
sb-aclrepl
/
inspect.lisp
diff --git
a/contrib/sb-aclrepl/inspect.lisp
b/contrib/sb-aclrepl/inspect.lisp
index
22a4131
..
c48984c
100644
(file)
--- a/
contrib/sb-aclrepl/inspect.lisp
+++ b/
contrib/sb-aclrepl/inspect.lisp
@@
-56,8
+56,7
@@
The commands are:
(eval-when (:compile-toplevel :load-toplevel :execute)
(defvar *inspect-unbound-object-marker* (gensym "INSPECT-UNBOUND-OBJECT-")))
(eval-when (:compile-toplevel :load-toplevel :execute)
(defvar *inspect-unbound-object-marker* (gensym "INSPECT-UNBOUND-OBJECT-")))
-
-(defun inspector (object input-stream output-stream)
+(defun inspector-fun (object input-stream output-stream)
(declare (ignore input-stream))
(let ((*current-inspect* nil)
(*inspect-raw* nil)
(declare (ignore input-stream))
(let ((*current-inspect* nil)
(*inspect-raw* nil)
@@
-69,11
+68,10
@@
The commands are:
(redisplay output-stream)
(let ((*input* input-stream)
(*output* output-stream))
(redisplay output-stream)
(let ((*input* input-stream)
(*output* output-stream))
- (catch 'inspect-quit
- (sb-impl::repl :inspect t)))
- (values)))
+ (repl :inspect t)))
+ (values))
-(setq sb-impl::*inspect-fun* #'inspector)
+(setq sb-impl::*inspect-fun* #'inspector-fun)
(defun istep (args stream)
(unless *current-inspect*
(defun istep (args stream)
(unless *current-inspect*
@@
-161,11
+159,11
@@
The commands are:
(no-object-msg stream))))
(defun istep-cmd-inspect-* (stream)
(no-object-msg stream))))
(defun istep-cmd-inspect-* (stream)
- (reset-stack * "(inspect *")
+ (reset-stack * "(inspect *)")
(redisplay stream))
(defun istep-cmd-inspect-new-form (form stream)
(redisplay stream))
(defun istep-cmd-inspect-new-form (form stream)
- (inspector (eval form) nil stream))
+ (inspector-fun (eval form) nil stream))
(defun istep-cmd-select-parent-component (option stream)
(if (stack)
(defun istep-cmd-select-parent-component (option stream)
(if (stack)
@@
-203,7
+201,7
@@
The commands are:
(defun istep-cmd-reset ()
(reset-stack)
(defun istep-cmd-reset ()
(reset-stack)
- (throw 'inspect-quit nil))
+ (throw 'repl-catcher (values :inspect nil)))
(defun istep-cmd-help (stream)
(format stream *inspect-help*))
(defun istep-cmd-help (stream)
(format stream *inspect-help*))