1.0.32.33: GENCGC tuning parameters

[sbcl.git] / src / code / backq.lisp

diff --git a/src/code/backq.lisp b/src/code/backq.lisp
index cd418aa..6aa1a70 100644 (file)
--- a/src/code/backq.lisp
+++ b/src/code/backq.lisp
@@ -56,9 +56,9 @@
     (multiple-value-bind (flag thing)
         (backquotify stream (read stream t nil t))
       (when (eq flag *bq-at-flag*)
-        (%reader-error stream ",@ after backquote in ~S" thing))
+        (simple-reader-error stream ",@ after backquote in ~S" thing))
       (when (eq flag *bq-dot-flag*)
-        (%reader-error stream ",. after backquote in ~S" thing))
+        (simple-reader-error stream ",. after backquote in ~S" thing))
       (backquotify-1 flag thing))))
 
 (/show0 "backq.lisp 64")
@@ -68,7 +68,7 @@
   (unless (> *backquote-count* 0)
     (when *read-suppress*
       (return-from comma-macro nil))
-    (%reader-error stream "comma not inside a backquote"))
+    (simple-reader-error stream "comma not inside a backquote"))
   (let ((c (read-char stream))
         (*backquote-count* (1- *backquote-count*)))
     (cond ((char= c #\@)
@@ -108,9 +108,9 @@
              (multiple-value-bind (dflag d) (backquotify stream (cdr code))
                (when (eq dflag *bq-at-flag*)
                  ;; Get the errors later.
-                 (%reader-error stream ",@ after dot in ~S" code))
+                 (simple-reader-error stream ",@ after dot in ~S" code))
                (when (eq dflag *bq-dot-flag*)
-                 (%reader-error stream ",. after dot in ~S" code))
+                 (simple-reader-error stream ",. after dot in ~S" code))
                (cond
                 ((eq aflag *bq-at-flag*)
                  (if (null dflag)
@@ -175,6 +175,7 @@
          (list  'quote thing))
         ((eq flag 'list*)
          (cond ((and (null (cddr thing))
+                     (not (expandable-backq-expression-p (car thing)))
                      (not (expandable-backq-expression-p (cadr thing))))
                 (cons 'backq-cons thing))
                ((expandable-backq-expression-p (car (last thing)))
@@ -200,15 +201,14 @@
 ;;; them, the backquoted material will be recognizable to the
 ;;; pretty-printer.
 (macrolet ((def (b-name name)
-             (let ((args (gensym "ARGS")))
                ;; FIXME: This function should be INLINE so that the lists
                ;; aren't consed twice, but I ran into an optimizer bug the
                ;; first time I tried to make this work for BACKQ-LIST. See
                ;; whether there's still an optimizer bug, and fix it if so, and
                ;; then make these INLINE.
-               `(defun ,b-name (&rest ,args)
-                  (declare (dynamic-extent ,args))
-                  (apply #',name ,args)))))
+               `(defun ,b-name (&rest rest)
+                  (declare (truly-dynamic-extent rest))
+                  (apply #',name rest))))
   (def backq-list list)
   (def backq-list* list*)
   (def backq-append append)
@@ -250,9 +250,9 @@
 ;;; Since our backquote is installed on the host lisp, and since
 ;;; developers make mistakes with backquotes and commas too, let's
 ;;; ensure that we can report errors rather than get an undefined
-;;; function condition on %READER-ERROR.
+;;; function condition on SIMPLE-READER-ERROR.
 #+sb-xc-host ; proper definition happens for the target
-(defun %reader-error (stream format-string &rest format-args)
+(defun simple-reader-error (stream format-string &rest format-args)
   (bug "READER-ERROR on stream ~S: ~?" stream format-string format-args))
 
 (/show0 "done with backq.lisp")