Changeset 15378

Timestamp:

May 24, 2012, 10:14:26 AM (13 years ago)

Author:

Gary Byers

Message:

(Thought I'd checked this in a few weeks ago.)
If SETF is used on a structure accessor, error at macroexpand time
if the accessor is called with other than 1 arg. (If we don't
check here, the error that happens later is even more obscure and
has even less to do with user code.)

File:

• trunk/source/lib/macros.lisp (modified) (3 diffs)

trunk/source/lib/macros.lisp

@@ -573 +573 @@
                       (if local-p
                         (if (eq ftype :function)
-                                        ;Local function, so don't use global setf definitions.
+                          ;;Local function, so don't use global setf
+                          ;;definitions.
                           (default-setf form value env)
                           `(setf ,(macroexpand-1 form env) ,value))
@@ -596 +597 @@
                                 (accessor-structref-info-p temp)
                                 (not (refinfo-r/o (structref-info-refinfo temp))))
+                           (let* ((nargs (length (%cdar args))))
+                             (unless (eql nargs 1)
+                               (signal-simple-program-error
+                                "In ~s, structure accessor ~s requires exactly 1 argument but is being called with ~d arguments." `(setf ,@args) accessor nargs)))
                            (let ((form (defstruct-ref-transform temp (%cdar args) env t))
                                  (type (defstruct-type-for-typecheck (structref-info-type temp) env)))
@@ -602 +607 @@
                                ;; strip off type, but add in a typecheck
                                `(the ,type (setf ,form (typecheck ,value ,type))))))
+
                           (t
                            (multiple-value-bind (res win)