0.8.14.10: quoth the FORMAT, LOOP for on!

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

diff --git a/src/code/sharpm.lisp b/src/code/sharpm.lisp
index 6615bb9..3f898b0 100644 (file)
--- a/src/code/sharpm.lisp
+++ b/src/code/sharpm.lisp
@@ -130,7 +130,40 @@
          (%reader-error
           stream "The ~S structure does not have a default constructor."
           (car body)))
-       (apply (fdefinition def-con) (rest body))))))
+       (when (and (atom (rest body))
+                  (not (null (rest body))))
+         (%reader-error
+          stream "improper list for #S: ~S." body))
+       (apply (fdefinition def-con)
+              (loop for tail on (rest body) by #'cddr
+                    with slot-name = (and (consp tail) (car tail))
+                    do (progn
+                         (when (null (cdr tail))
+                           (%reader-error
+                            stream
+                            "the arglist for the ~S constructor in #S ~
+                              has an odd length: ~S."
+                            (car body) (rest body)))
+                         (when (or (atom (cdr tail))
+                                   (and (atom (cddr tail))
+                                        (not (null (cddr tail)))))
+                           (%reader-error
+                            stream
+                            "the arglist for the ~S constructor in #S ~
+                              is improper: ~S."
+                            (car body) (rest body)))
+                         (when (not (typep (car tail) 'string-designator))
+                           (%reader-error
+                            stream
+                            "a slot name in #S is not a string ~
+                              designator: ~S."
+                            slot-name))
+                         (when (not (keywordp slot-name))
+                           (style-warn "in #S ~S, the use of non-keywords ~
+                                         as slot specifiers is deprecated: ~S."
+                                       (car body) slot-name)))
+                    collect (intern (string (car tail)) *keyword-package*)
+                    collect (cadr tail)))))))
 \f
 ;;;; reading numbers: the #B, #C, #O, #R, and #X readmacros
 
@@ -184,7 +217,8 @@
 ;; substitutes in arrays and structures as well as lists. The first arg is an
 ;; alist of the things to be replaced assoc'd with the things to replace them.
 (defun circle-subst (old-new-alist tree)
-  (cond ((not (typep tree '(or cons (array t) structure-object standard-object)))
+  (cond ((not (typep tree
+                    '(or cons (array t) structure-object standard-object)))
         (let ((entry (find tree old-new-alist :key #'second)))
           (if entry (third entry) tree)))
        ((null (gethash tree *sharp-equal-circle-table*))