[slime-cvs] CVS slime

[CVS User heller]

Update of /project/slime/cvsroot/slime
In directory tiger.common-lisp.net:/tmp/cvs-serv16855

Modified Files:
	ChangeLog swank.lisp 
Log Message:
* swank.lisp (*sldb-printer-bindings*): Removed.  Rather useless
since the change from 2009-02-26.  It could at best have some
influence on the way conditions are printed.  *sldb-string-length*
and *sldb-bitvector-length* where both nil so
*sldb-pprint-dispatch-table* was also not used by default.  In
summary, spending 3 pages for something that's not used by default
was pretty silly.  One variable less where we can get the defaults
wrong.

--- /project/slime/cvsroot/slime/ChangeLog	2011/11/21 16:34:12	1.2244
+++ /project/slime/cvsroot/slime/ChangeLog	2011/11/21 19:46:11	1.2245
@@ -1,7 +1,13 @@
-2011-11-19  Nikodemus Siivola  <nikodemus at random-state.net>
+2011-11-21  Helmut Eller  <heller at common-lisp.net>
 
-	* swank-sbcl.lisp (restart-frame): Make it possible to restart
-	frames of anonymous functions -- at least some of the time.
+	* swank.lisp (*sldb-printer-bindings*): Removed.  Rather useless
+	since the change from 2009-02-26.  It could at best have some
+	influence on the way conditions are printed.  *sldb-string-length*
+	and *sldb-bitvector-length* where both nil so
+	*sldb-pprint-dispatch-table* was also not used by default.  In
+	summary, spending 3 pages for something that's not used by default
+	was pretty silly.  One variable less where we can get the defaults
+	wrong.
 
 2011-11-21  Helmut Eller  <heller at common-lisp.net>
 
@@ -17,6 +23,11 @@
 	(eval-string-in-frame, pprint-eval-string-in-frame): Use package
 	argument.
 
+2011-11-19  Nikodemus Siivola  <nikodemus at random-state.net>
+
+	* swank-sbcl.lisp (restart-frame): Make it possible to restart
+	frames of anonymous functions -- at least some of the time.
+
 2011-11-16  Stas Boukarev  <stassats at gmail.com>
 
 	* swank.lisp (open-dedicated-output-stream): Open a stream with
--- /project/slime/cvsroot/slime/swank.lisp	2011/11/21 16:34:12	1.760
+++ /project/slime/cvsroot/slime/swank.lisp	2011/11/21 19:46:11	1.761
@@ -42,7 +42,6 @@
            #:*backtrace-printer-bindings*
            #:*default-worker-thread-bindings*
            #:*macroexpand-printer-bindings*
-           #:*sldb-printer-bindings*
            #:*swank-pprint-bindings*
            #:*record-repl-results*
            #:*inspector-verbose*
@@ -92,62 +91,6 @@
 (defvar *swank-debug-p* t
   "When true, print extra debugging information.")
 
-;;;;; SLDB customized pprint dispatch table
-;;;
-;;; CLHS 22.1.3.4, and CLHS 22.1.3.6 do not specify *PRINT-LENGTH* to
-;;; affect the printing of strings and bit-vectors.
-;;;
-;;; We use a customized pprint dispatch table to do it for us.
-
-(defvar *sldb-string-length* nil)
-(defvar *sldb-bitvector-length* nil)
-
-(defvar *sldb-pprint-dispatch-table*
-  (let ((initial-table (copy-pprint-dispatch nil))
-        (result-table  (copy-pprint-dispatch nil)))
-    (flet ((sldb-bitvector-pprint (stream bitvector)
-             ;;; Truncate bit-vectors according to *SLDB-BITVECTOR-LENGTH*.
-             (if (not *sldb-bitvector-length*)
-                 (write bitvector :stream stream :circle nil
-                        :pprint-dispatch initial-table)
-                 (loop initially (write-string "#*" stream)
-                       for i from 0 and bit across bitvector do
-                       (when (= i *sldb-bitvector-length*)
-                         (write-string "..." stream)
-                         (loop-finish))
-                       (write-char (if (= bit 0) #\0 #\1) stream))))
-           (sldb-string-pprint (stream string)
-             ;;; Truncate strings according to *SLDB-STRING-LENGTH*.
-             (cond ((not *print-escape*)
-                    (write-string string stream))
-                   ((not *sldb-string-length*)
-                    (write string :stream stream :circle nil
-                           :pprint-dispatch initial-table))
-                   (t
-                    (escape-string string stream
-                                   :length *sldb-string-length*)))))
-      (set-pprint-dispatch 'bit-vector #'sldb-bitvector-pprint 0 result-table)
-      (set-pprint-dispatch 'string #'sldb-string-pprint 0 result-table)
-      result-table)))
-
-(defvar *sldb-printer-bindings*
-  `((*print-pretty*           . t)
-    (*print-level*            . 4)
-    (*print-length*           . 10)
-    (*print-circle*           . t)
-    (*print-readably*         . nil)
-    (*print-pprint-dispatch*  . ,*sldb-pprint-dispatch-table*)
-    (*print-gensym*           . t)
-    (*print-base*             . 10)
-    (*print-radix*            . nil)
-    (*print-array*            . t)
-    (*print-lines*            . nil)
-    (*print-escape*           . t)
-    (*print-right-margin*     . 65)
-    (*sldb-bitvector-length*  . 25)
-    (*sldb-string-length*     . 50))
-  "A set of printer variables used in the debugger.")
-
 (defvar *backtrace-pprint-dispatch-table*
   (let ((table (copy-pprint-dispatch nil)))
     (flet ((print-string (stream string)
@@ -2545,18 +2488,15 @@
     (force-user-output)
     (call-with-debugging-environment
      (lambda ()
-       ;; We used to have (WITH-BINDING *SLDB-PRINTER-BINDINGS* ...)
-       ;; here, but that truncated the result of an eval-in-frame.
        (sldb-loop *sldb-level*)))))
 
 (defun sldb-loop (level)
   (unwind-protect
        (loop
         (with-simple-restart (abort "Return to sldb level ~D." level)
-          (send-to-emacs 
+          (send-to-emacs
            (list* :debug (current-thread-id) level
-                  (with-bindings *sldb-printer-bindings*
-                    (debugger-info-for-emacs 0 *sldb-initial-frames*))))
+                  (debugger-info-for-emacs 0 *sldb-initial-frames*)))
           (send-to-emacs 
            (list :debug-activate (current-thread-id) level nil))
           (loop