Changeset 14505

Timestamp:

Dec 22, 2010, 12:32:10 PM (14 years ago)

Author:

R. Matthew Emerson

Message:

In REMOVE-STRUCTURE-DEFS, don't remove inherited accessors.

Closes ticket:750.

File:

• trunk/source/lib/defstruct.lisp (modified) (1 diff)

trunk/source/lib/defstruct.lisp

@@ -312 +312 @@
     (when sd
       (dolist (refname (sd-refnames sd))
-        (let ((def (assq refname *nx-globally-inline*)))
-          (when def (set-function-info refname nil)))
-        (let ((info (structref-info refname)))
-          (when (accessor-structref-info-p info)
-            (unless (refinfo-r/o (structref-info-refinfo info))
-              (fmakunbound (setf-function-name refname)))
-            (fmakunbound refname))))
+        (unless (sd-refname-in-included-struct-p sd refname)
+          (let ((def (assq refname *nx-globally-inline*)))
+            (when def (set-function-info refname nil)))
+          (let ((info (structref-info refname)))
+            (when (accessor-structref-info-p info)
+              (unless (refinfo-r/o (structref-info-refinfo info))
+                (fmakunbound (setf-function-name refname)))
+              (fmakunbound refname)))))
       #|
       ;; The print-function may indeed have become obsolete,