X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpp-backq.lisp;h=dc5d6ae62be6334329fbdfc206f4295338e034c3;hb=15d6e7c9a2c3234f95dfe278046fa2fee1b0c007;hp=9b2ff78bc72b2f8c81650ce04b4baa773efd73f2;hpb=7f029da277c068fd346c5d95303f7e4eeafbdcfc;p=sbcl.git

diff --git a/src/code/pp-backq.lisp b/src/code/pp-backq.lisp
index 9b2ff78..dc5d6ae 100644
--- a/src/code/pp-backq.lisp
+++ b/src/code/pp-backq.lisp
@@ -35,8 +35,8 @@
    ((atom form)
     (backq-unparse-expr form splicing))
    ((not (null (cdr (last form))))
-    ;; FIXME: Shouldn't this be an ERROR?
-    "### illegal dotted backquote form ###")
+    ;; FIXME: this probably throws a recursive error
+    (bug "found illegal dotted backquote form: ~S" form))
    (t
     (case (car form)
       (backq-list
@@ -49,18 +49,26 @@
 		   (backq-unparse (car tail) t)))
 	 (push (backq-unparse (car tail)) accum)))
       (backq-append
-       (mapcan (lambda (el) (backq-unparse el t))
-	       (cdr form)))
+       (apply #'append
+	      (mapcar (lambda (el) (backq-unparse el t))
+		      (cdr form))))
       (backq-nconc
-       (mapcan (lambda (el) (backq-unparse el :nconc))
-	       (cdr form)))
+       (apply #'append
+	      (mapcar (lambda (el) (backq-unparse el :nconc))
+		      (cdr form))))
       (backq-cons
        (cons (backq-unparse (cadr form) nil)
 	     (backq-unparse (caddr form) t)))
       (backq-vector
        (coerce (backq-unparse (cadr form)) 'vector))
       (quote
-       (cadr form))
+       (cond
+	 ((atom (cadr form)) (cadr form))
+	 ((and (consp (cadr form))
+	       (member (caadr form) *backq-tokens*))
+	  (backq-unparse-expr form splicing))
+	 (t (cons (backq-unparse `(quote ,(caadr form)))
+		  (backq-unparse `(quote ,(cdadr form)))))))
       (t
        (backq-unparse-expr form splicing))))))
 
@@ -82,6 +90,12 @@
   ;; attributes rather than per-stream actually makes life easier.
   ;; Since all of the attributes are shared in the dynamic state, we
   ;; can do... -- CSR, 2003-09-30
+  ;;
+  ;; [...] above referred to the trick of printing to a string stream,
+  ;; and then simply printing the resulting sequence to the pretty
+  ;; stream, possibly with a space prepended.  However, this doesn't
+  ;; work for pretty streams which need to do margin calculations.  Oh
+  ;; well.  It was good while it lasted.  -- CSR, 2003-12-15
   (let ((output (with-output-to-string (s)
 		  (write (cadr form) :stream s))))
     (unless (= (length output) 0)
@@ -89,7 +103,7 @@
 		 (or (char= (char output 0) #\.)
 		     (char= (char output 0) #\@)))
 	(write-char #\Space stream))
-      (write-sequence output stream))))
+      (write (cadr form) :stream stream))))
 
 ;;; This is called by !PPRINT-COLD-INIT, fairly late, because
 ;;; SET-PPRINT-DISPATCH doesn't work until the compiler works.