Changeset 4561

Timestamp:

10/28/03 23:25:12 (20 years ago)

Author:

piso

Message:

SETF: resolve autoload of FOO (if any) before trying to expand (SETF (FOO ...) ...).

File:

• trunk/j/src/org/armedbear/lisp/setf.lisp (modified) (3 diffs)

trunk/j/src/org/armedbear/lisp/setf.lisp

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: setf.lisp,v 1.35 2003-10-17 19:10:19 piso Exp $
+;;; $Id: setf.lisp,v 1.36 2003-10-28 23:25:12 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -83 +83 @@
       (setq access-forms (cons access-form access-forms)))))
 
-
 (defmacro setf (&rest args)
   (let ((count (length args)))
@@ -92 +91 @@
         (if (atom place)
             `(setq ,place ,value-form)
-            (multiple-value-bind (dummies vals newval setter getter)
-              (get-setf-expansion place nil)
-              (let ((inverse (get (car place) 'setf-inverse)))
-                (if (and inverse (eq inverse (car setter)))
-                    (if (functionp inverse)
-                        `(funcall ,inverse ,@(cdr place) ,value-form)
-                        `(,inverse ,@(cdr place) ,value-form))
-                    `(let* (,@(mapcar #'list dummies vals))
-                       (multiple-value-bind ,newval ,value-form
-                         ,setter))))))))
+            (progn
+              (when (symbolp (car place))
+                (resolve (car place)))
+              (multiple-value-bind (dummies vals newval setter getter)
+                (get-setf-expansion place)
+                (let ((inverse (get (car place) 'setf-inverse)))
+                  (if (and inverse (eq inverse (car setter)))
+                      (if (functionp inverse)
+                          `(funcall ,inverse ,@(cdr place) ,value-form)
+                          `(,inverse ,@(cdr place) ,value-form))
+                      `(let* (,@(mapcar #'list dummies vals))
+                         (multiple-value-bind ,newval ,value-form
+                           ,setter)))))))))
      ((oddp count)
       (error "odd number of args to SETF"))